' . 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.' . '
'); + $output = '' + . 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.") + . '
'; foreach (array_keys($options) as $type) { if (!empty($options[$type])) { $items = array(); @@ -61,7 +79,7 @@ class views_handler_area_text extends views_handler_area { $output .= theme('item_list', array( 'items' => $items, - 'type' => $type + 'type' => $type, )); } } @@ -82,13 +100,19 @@ class views_handler_area_text extends views_handler_area { } } - function options_submit(&$form, &$form_state) { + /** + * {@inheritdoc} + */ + public function options_submit(&$form, &$form_state) { $form_state['values']['options']['format'] = $form_state['values']['options']['content']['format']; $form_state['values']['options']['content'] = $form_state['values']['options']['content']['value']; parent::options_submit($form, $form_state); } - function render($empty = FALSE) { + /** + * {@inheritdoc} + */ + public function render($empty = FALSE) { $format = isset($this->options['format']) ? $this->options['format'] : filter_default_format(); if (!$empty || !empty($this->options['empty'])) { return $this->render_textarea($this->options['content'], $format); @@ -99,7 +123,7 @@ class views_handler_area_text extends views_handler_area { /** * Render a text area, using the proper format. */ - function render_textarea($value, $format) { + public function render_textarea($value, $format) { if ($value) { if ($this->options['tokenize']) { $value = $this->view->style_plugin->tokenize_value($value, 0); @@ -107,4 +131,5 @@ class views_handler_area_text extends views_handler_area { return check_markup($value, $format, '', FALSE); } } + } diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_area_text_custom.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_area_text_custom.inc index 3627f0c..89577bc 100644 --- a/sites/all/modules/contrib/views/views/handlers/views_handler_area_text_custom.inc +++ b/sites/all/modules/contrib/views/views/handlers/views_handler_area_text_custom.inc @@ -12,13 +12,19 @@ */ class views_handler_area_text_custom extends views_handler_area_text { - function option_definition() { + /** + * {@inheritdoc} + */ + public function option_definition() { $options = parent::option_definition(); unset($options['format']); return $options; } - function options_form(&$form, &$form_state) { + /** + * {@inheritdoc} + */ + public function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); // Alter the form element, to be a regular text area. @@ -26,14 +32,20 @@ class views_handler_area_text_custom extends views_handler_area_text { unset($form['content']['#format']); unset($form['content']['#wysiwyg']); - // @TODO: Use the token refactored base class. + // @todo Use the token refactored base class. } - // Empty, so we don't inherit options_submit from the parent. - function options_submit(&$form, &$form_state) { + /** + * {@inheritdoc} + */ + public function options_submit(&$form, &$form_state) { + // Empty, so we don't inherit options_submit from the parent. } - function render($empty = FALSE) { + /** + * {@inheritdoc} + */ + public function render($empty = FALSE) { if (!$empty || !empty($this->options['empty'])) { return $this->render_textarea_custom($this->options['content']); } @@ -43,8 +55,14 @@ class views_handler_area_text_custom extends views_handler_area_text { /** * Render a text area with filter_xss_admin. + * + * @param string $value + * The text area string to process. + * + * @return string + * The string after it has been sanitized, optionally tokenized too. */ - function render_textarea_custom($value) { + public function render_textarea_custom($value) { if ($value) { if ($this->options['tokenize']) { $value = $this->view->style_plugin->tokenize_value($value, 0); diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_area_view.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_area_view.inc index 45ea499..2e93135 100644 --- a/sites/all/modules/contrib/views/views/handlers/views_handler_area_view.inc +++ b/sites/all/modules/contrib/views/views/handlers/views_handler_area_view.inc @@ -12,7 +12,10 @@ */ class views_handler_area_view extends views_handler_area { - function option_definition() { + /** + * {@inheritdoc} + */ + public function option_definition() { $options = parent::option_definition(); $options['view_to_insert'] = array('default' => ''); @@ -21,10 +24,9 @@ class views_handler_area_view extends views_handler_area { } /** - * Default options form that provides the label widget that all fields - * should have. + * Default options form; provides the label widget all fields should have. */ - function options_form(&$form, &$form_state) { + public function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); $view_display = $this->view->name . ':' . $this->view->current_display; @@ -48,36 +50,51 @@ class views_handler_area_view extends views_handler_area { } /** - * Render the area + * Render the area. */ - function render($empty = FALSE) { - if (!empty($this->options['view_to_insert'])) { - list($view_name, $display_id) = explode(':', $this->options['view_to_insert']); - - $view = views_get_view($view_name); - if (empty($view) || !$view->access($display_id)) { - return; - } - $view->set_display($display_id); - - // Avoid recursion - $view->parent_views += $this->view->parent_views; - $view->parent_views[] = "$view_name:$display_id"; - - // Check if the view is part of the parent views of this view - $search = "$view_name:$display_id"; - if (in_array($search, $this->view->parent_views)) { - drupal_set_message(t("Recursion detected in view @view display @display.", array('@view' => $view_name, '@display' => $display_id)), 'error'); + public function render($empty = FALSE) { + if ($view = $this->loadView()) { + if (!empty($this->options['inherit_arguments']) && !empty($this->view->args)) { + return $view->preview(NULL, $this->view->args); } else { - if (!empty($this->options['inherit_arguments']) && !empty($this->view->args)) { - return $view->preview($display_id, $this->view->args); - } - else { - return $view->preview($display_id); - } + return $view->preview(NULL); } } return ''; } + + /** + * Loads the used view for rendering. + * + * @return \view|NULL + * The loaded view or NULL, in case the view was not loadable / recursion + * got detected / access got denied. + */ + protected function loadView() { + if (empty($this->options['view_to_insert'])) { + return NULL; + } + list($view_name, $display_id) = explode(':', $this->options['view_to_insert']); + + $view = views_get_view($view_name); + if (empty($view) || !$view->access($display_id)) { + return NULL; + } + $view->set_display($display_id); + + // Avoid recursion. + $view->parent_views += $this->view->parent_views; + $view->parent_views[] = "$view_name:$display_id"; + + // Check if the view is part of the parent views of this view. + $search = "$view_name:$display_id"; + if (in_array($search, $this->view->parent_views)) { + drupal_set_message(t("Recursion detected in view @view display @display.", array('@view' => $view_name, '@display' => $display_id)), 'error'); + return NULL; + } + + return $view; + } + } diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_argument.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_argument.inc index 5a5ec00..309091e 100644 --- a/sites/all/modules/contrib/views/views/handlers/views_handler_argument.inc +++ b/sites/all/modules/contrib/views/views/handlers/views_handler_argument.inc @@ -2,7 +2,7 @@ /** * @file - * @todo. + * Definition of views_handler_argument. */ /** @@ -18,46 +18,59 @@ * * Definition terms for this handler: * - name field: The field to use for the name to use in the summary, which is - * the displayed output. For example, for the node: nid argument, - * the argument itself is the nid, but node.title is displayed. + * the displayed output. For example, for the node: nid argument, the argument + * itself is the nid, but node.title is displayed. * - name table: The table to use for the name, should it not be in the same - * table as the argument. + * table as the argument. * - empty field name: For arguments that can have no value, such as taxonomy - * which can have "no term", this is the string which - * will be displayed for this lack of value. Be sure to use - * t(). + * which can have "no term", this is the string which will be displayed for + * this lack of value. Be sure to use t(). * - validate type: A little used string to allow an argument to restrict - * which validator is available to just one. Use the - * validator ID. This probably should not be used at all, - * and may disappear or change. + * which validator is available to just one. Use the validator ID. This + * probably should not be used at all, and may disappear or change. * - numeric: If set to TRUE this field is numeric and will use %d instead of - * %s in queries. + * %s in queries. * * @ingroup views_argument_handlers */ class views_handler_argument extends views_handler { - var $validator = NULL; - var $argument = NULL; - var $value = NULL; /** - * The table to use for the name, should it not be in the same table as the argument. + * @var object + */ + public $validator = NULL; + + /** + * @var mixed + */ + public $argument = NULL; + + /** + * @var mixed + */ + public $value = NULL; + + /** + * The table to use for the name, if not the same table as the argument. + * * @var string */ - var $name_table; + public $name_table; /** - * The field to use for the name to use in the summary, which is - * the displayed output. For example, for the node: nid argument, - * the argument itself is the nid, but node.title is displayed. + * The field to use for the name to use in the summary. + * + * Used as the displayed output. For example, for the node: nid argument, the + * argument itself is the nid, but node.title is displayed. + * * @var string */ - var $name_field; + public $name_field; /** - * Constructor + * {@inheritdoc} */ - function construct() { + public function construct() { parent::construct(); if (!empty($this->definition['name field'])) { @@ -68,7 +81,10 @@ class views_handler_argument extends views_handler { } } - function init(&$view, &$options) { + /** + * {@inheritdoc} + */ + public function init(&$view, &$options) { parent::init($view, $options); // Compatibility: The new UI changed several settings. @@ -132,31 +148,42 @@ class views_handler_argument extends views_handler { /** * Give an argument the opportunity to modify the breadcrumb, if it wants. - * This only gets called on displays where a breadcrumb is actually used. + * + * Only gets called on displays where a breadcrumb is actually used. * * The breadcrumb will be in the form of an array, with the keys being * the path and the value being the already sanitized title of the path. */ - function set_breadcrumb(&$breadcrumb) { } + public function set_breadcrumb(&$breadcrumb) { + } /** * Determine if the argument can generate a breadcrumb * - * @return TRUE/FALSE + * @return bool */ - function uses_breadcrumb() { + public function uses_breadcrumb() { $info = $this->default_actions($this->options['default_action']); return !empty($info['breadcrumb']); } - function is_exception($arg = NULL) { + /** + * {@inheritdoc} + */ + public function is_exception($arg = NULL) { if (!isset($arg)) { $arg = isset($this->argument) ? $this->argument : NULL; } - return !empty($this->options['exception']['value']) && $this->options['exception']['value'] === $arg; + return !empty($this->options['exception']['value']) && ($this->options['exception']['value'] === $arg); } - function exception_title() { + /** + * Work out which title to use. + * + * @return string + * The title string to use. + */ + public function exception_title() { // If title overriding is off for the exception, return the normal title. if (empty($this->options['exception']['title_enable'])) { return $this->get_title(); @@ -167,15 +194,18 @@ class views_handler_argument extends views_handler { /** * Determine if the argument needs a style plugin. * - * @return TRUE/FALSE + * @return bool */ - function needs_style_plugin() { + public function needs_style_plugin() { $info = $this->default_actions($this->options['default_action']); $validate_info = $this->default_actions($this->options['validate']['fail']); return !empty($info['style plugin']) || !empty($validate_info['style plugin']); } - function option_definition() { + /** + * {@inheritdoc} + */ + public function option_definition() { $options = parent::option_definition(); $options['default_action'] = array('default' => 'ignore'); @@ -213,7 +243,10 @@ class views_handler_argument extends views_handler { return $options; } - function options_form(&$form, &$form_state) { + /** + * {@inheritdoc} + */ + public function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); $argument_text = $this->view->display_handler->get_argument_text(); @@ -380,8 +413,9 @@ class views_handler_argument extends views_handler { '#prefix' => '
<?php
-if (empty($form_state['view']->exposed_input[$identifier])) .
- { $form_state['input'][$identifier] = $default_value; }
+if (empty($form_state['view']->exposed_input[$identifier])) {
+ $form_state['input'][$identifier] = $default_value;
+}
?>
@@ -18,10 +19,10 @@ To do this, I used the following function, where geoip_redirect_get_tid() loads
<?php
function MODULENAME_form_views_exposed_form_alter(&$form, $form_state) {
- if(strpos($form['#id'], 'volunteer-directory') !== FALSE) {
+ if (strpos($form['#id'], 'volunteer-directory') !== FALSE) {
$city_tid = geoip_redirect_get_tid();
- if(is_numeric($city_tid) && $city_tid != 7660) {
- if (empty($form_state['view']->exposed_input['tid'])) {
+ if (is_numeric($city_tid) && $city_tid != 7660) {
+ if (empty($form_state['view']->exposed_input['tid'])) {
$form_state['input']['tid'] = $city_tid;
}
}
diff --git a/sites/all/modules/contrib/views/views/help/api-example.html b/sites/all/modules/contrib/views/views/help/api-example.html
index 682fe87..819d65f 100644
--- a/sites/all/modules/contrib/views/views/help/api-example.html
+++ b/sites/all/modules/contrib/views/views/help/api-example.html
@@ -40,7 +40,7 @@ Below is the contents of a simple node_example.views.inc file that allows you to
* @endcode
*/
-function node_example_views_data() {
+function node_example_views_data() {
// Basic table information.
// ----------------------------------------------------------------
diff --git a/sites/all/modules/contrib/views/views/help/api-handler-area.html b/sites/all/modules/contrib/views/views/help/api-handler-area.html
index ad8ec56..16c5e5c 100644
--- a/sites/all/modules/contrib/views/views/help/api-handler-area.html
+++ b/sites/all/modules/contrib/views/views/help/api-handler-area.html
@@ -18,6 +18,7 @@ function yourmodule_views_data() {
'handler' => 'yourmodule_handler_collapsible_area_text',
),
);
+ return $data;
}
diff --git a/sites/all/modules/contrib/views/views/help/api-tables.html b/sites/all/modules/contrib/views/views/help/api-tables.html
index cafbbab..c80d29a 100644
--- a/sites/all/modules/contrib/views/views/help/api-tables.html
+++ b/sites/all/modules/contrib/views/views/help/api-tables.html
@@ -169,8 +169,10 @@ Each field is described in the view data with an array, keyed to the database na
$data['node']['nid'] = array(
+ // The item it appears as on the UI,
'title' => t('Nid'),
- 'help' => t('The node ID of the node.'), // The help that appears on the UI,
+ // The help that appears on the UI,
+ 'help' => t('The node ID of the node.'),
// Information for displaying the nid
'field' => array(
'handler' => 'views_handler_field_node',
@@ -179,7 +181,8 @@ $data['node']['nid'] = array(
// Information for accepting a nid as an argument
'argument' => array(
'handler' => 'views_handler_argument_node_nid',
- 'name field' => 'title', // the field to display in the summary.
+ // The field to display in the summary.
+ 'name field' => 'title',
'numeric' => TRUE,
'validate type' => 'nid',
),
diff --git a/sites/all/modules/contrib/views/views/help/api-upgrading.html b/sites/all/modules/contrib/views/views/help/api-upgrading.html
index 158f809..2ff6bb4 100644
--- a/sites/all/modules/contrib/views/views/help/api-upgrading.html
+++ b/sites/all/modules/contrib/views/views/help/api-upgrading.html
@@ -113,9 +113,9 @@ The views_handler class got two new functions:
/**
* Get the value that's supposed to be rendered.
*
- * @param $values
+ * @param object $values
* An object containing all retrieved values.
- * @param $field
+ * @param string $field
* Optional name of the field where the value is stored.
*/
function get_value($values, $field = NULL) {
@@ -128,9 +128,9 @@ function get_value($values, $field = NULL) {
/**
* Sanitize the value for output.
*
- * @param $value
+ * @param string $value
* The value being rendered.
- * @param $type
+ * @param string $type
* The type of sanitization needed. If not provided, check_plain() is used.
*/
function sanitize_value($value, $type = NULL) {
@@ -138,9 +138,11 @@ function sanitize_value($value, $type = NULL) {
case 'xss':
$value = filter_xss($value);
break;
+
case 'url':
$value = check_url($value);
break;
+
default:
$value = check_plain($value);
break;
diff --git a/sites/all/modules/contrib/views/views/help/embed.html b/sites/all/modules/contrib/views/views/help/embed.html
index e39fbf5..156b1dc 100644
--- a/sites/all/modules/contrib/views/views/help/embed.html
+++ b/sites/all/modules/contrib/views/views/help/embed.html
@@ -10,9 +10,9 @@ easiest way is to use the function views_embed_view():
* solution and doesn't really offer a lot of options, but breaking the function
* apart is pretty easy, and this provides a worthwhile guide to doing so.
*
- * @param $name
+ * @param string $name
* The name of the view to embed.
- * @param $display_id
+ * @param string $display_id
* The display id to embed. If unsure, use 'default', as it will always be
* valid. But things like 'page' or 'block' should work here.
* @param ...
diff --git a/sites/all/modules/contrib/views/views/help/ui-crashes.html b/sites/all/modules/contrib/views/views/help/ui-crashes.html
index 4e8a389..da0ca4f 100644
--- a/sites/all/modules/contrib/views/views/help/ui-crashes.html
+++ b/sites/all/modules/contrib/views/views/help/ui-crashes.html
@@ -13,7 +13,7 @@ This section originally stems from this
Some modules may add PHP improperly, disrupting normal jQuery operation. Errors may look like
-{ "default": "default" }
+{ "default": "default" }
This can also be a server configuration issue. In one case, this was solved by commenting out
diff --git a/sites/all/modules/contrib/views/views/includes/admin.inc b/sites/all/modules/contrib/views/views/includes/admin.inc
index 1643b34..a8211b0 100644
--- a/sites/all/modules/contrib/views/views/includes/admin.inc
+++ b/sites/all/modules/contrib/views/views/includes/admin.inc
@@ -8,10 +8,11 @@
/**
* Create an array of Views admin CSS for adding or attaching.
*
- * This returns an array of arrays. Each array represents a single
- * file. The array format is:
- * - file: The fully qualified name of the file to send to drupal_add_css
- * - options: An array of options to pass to drupal_add_css.
+ * @return array
+ * An array of arrays. Each array represents a single file. The array format
+ * is:
+ * - file: The fully qualified name of the file to send to drupal_add_css
+ * - options: An array of options to pass to drupal_add_css.
*/
function views_ui_get_admin_css() {
$module_path = drupal_get_path('module', 'views_ui');
@@ -21,27 +22,28 @@ function views_ui_get_admin_css() {
$list[$module_path . '/css/ie/views-admin.ie7.css'] = array(
'browsers' => array(
'IE' => 'lte IE 7',
- '!IE' => FALSE
+ '!IE' => FALSE,
),
'preprocess' => FALSE,
);
$list[$module_path . '/css/views-admin.theme.css'] = array();
- // Add in any theme specific CSS files we have
+ // Add in any theme specific CSS files we have.
$themes = list_themes();
$theme_key = $GLOBALS['theme'];
while ($theme_key) {
// Try to find the admin css file for non-core themes.
if (!in_array($theme_key, array('garland', 'seven', 'bartik'))) {
$theme_path = drupal_get_path('theme', $theme_key);
- // First search in the css directory, then in the root folder of the theme.
+ // First search in the css directory, then in the root folder of the
+ // theme.
if (file_exists($theme_path . "/css/views-admin.$theme_key.css")) {
$list[$theme_path . "/css/views-admin.$theme_key.css"] = array(
'group' => CSS_THEME,
);
}
- else if (file_exists($theme_path . "/views-admin.$theme_key.css")) {
+ elseif (file_exists($theme_path . "/views-admin.$theme_key.css")) {
$list[$theme_path . "/views-admin.$theme_key.css"] = array(
'group' => CSS_THEME,
);
@@ -54,7 +56,7 @@ function views_ui_get_admin_css() {
}
$theme_key = isset($themes[$theme_key]->base_theme) ? $themes[$theme_key]->base_theme : '';
}
- // Views contains style overrides for the following modules
+ // Views contains style overrides for the following modules.
$module_list = array('contextual', 'advanced_help', 'ctools');
foreach ($module_list as $module) {
if (module_exists($module)) {
@@ -62,7 +64,6 @@ function views_ui_get_admin_css() {
}
}
-
return $list;
}
@@ -76,11 +77,12 @@ function views_ui_add_admin_css() {
}
/**
- * Check to see if the advanced help module is installed, and if not put up
- * a message.
+ * Check to see if the advanced help module is installed.
*
- * Only call this function if the user is already in a position for this to
- * be useful.
+ * If not display a message.
+ *
+ * Only call this function if the user is already in a position for this to be
+ * useful.
*/
function views_ui_check_advanced_help() {
if (!variable_get('views_ui_show_advanced_help_warning', TRUE)) {
@@ -91,10 +93,18 @@ function views_ui_check_advanced_help() {
$filename = db_query_range("SELECT filename FROM {system} WHERE type = 'module' AND name = 'advanced_help'", 0, 1)
->fetchField();
if ($filename && file_exists($filename)) {
- drupal_set_message(t('If you enable the advanced help module, Views will provide more and better help. You can disable this message at the Views settings page.', array('@modules' => url('admin/modules'),'@hide' => url('admin/structure/views/settings'))));
+ drupal_set_message(t('If you enable the advanced help module, Views will provide more and better help. You can disable this message at the Views settings page.',
+ array(
+ '@modules' => url('admin/modules'),
+ '@hide' => url('admin/structure/views/settings'),
+ )));
}
else {
- drupal_set_message(t('If you install the advanced help module from !href, Views will provide more and better help. You can disable this message at the Views settings page.', array('!href' => l('http://drupal.org/project/advanced_help', 'http://drupal.org/project/advanced_help'), '@hide' => url('admin/structure/views/settings'))));
+ drupal_set_message(t('If you install the advanced help module from !href, Views will provide more and better help. You can disable this message at the Views settings page.',
+ array(
+ '!href' => l('http://drupal.org/project/advanced_help', 'http://drupal.org/project/advanced_help'),
+ '@hide' => url('admin/structure/views/settings'),
+ )));
}
}
}
@@ -133,10 +143,10 @@ function views_ui_preview($view, $display_id, $args = array()) {
$view->live_preview = TRUE;
$view->views_ui_context = TRUE;
- // AJAX happens via $_POST but everything expects exposed data to
- // be in GET. Copy stuff but remove ajax-framework specific keys.
- // If we're clicking on links in a preview, though, we could actually
- // still have some in $_GET, so we use $_REQUEST to ensure we get it all.
+ // AJAX happens via $_POST but everything expects exposed data to be in
+ // GET. Copy stuff but remove ajax-framework specific keys. If we're
+ // clicking on links in a preview, though, we could actually still have
+ // some in $_GET, so we use $_REQUEST to ensure we get it all.
$exposed_input = $_REQUEST;
foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', 'ajax_html_ids', 'ajax_page_state', 'form_id', 'form_build_id', 'form_token') as $key) {
if (isset($exposed_input[$key])) {
@@ -146,14 +156,13 @@ function views_ui_preview($view, $display_id, $args = array()) {
$view->set_exposed_input($exposed_input);
-
if (!$view->set_display($display_id)) {
return t('Invalid display id @display', array('@display' => $display_id));
}
$view->set_arguments($args);
- // Store the current view URL for later use:
+ // Store the current view URL for later use.
if ($view->display_handler->get_option('path')) {
$path = $view->get_url();
}
@@ -187,7 +196,7 @@ function views_ui_preview($view, $display_id, $args = array()) {
if (!empty($view->build_info['query'])) {
if ($show_query) {
$query = $view->build_info['query'];
- // Only the sql default class has a method getArguments.
+ // Only the SQL default class has a method getArguments.
$quoted = array();
if (get_class($view->query) == 'views_plugin_query_default') {
@@ -401,8 +410,8 @@ function views_ui_add_form($form, &$form_state) {
* Helper form element validator: integer.
*
* The problem with this is that the function is private so it's not guaranteed
- * that it might not be renamed/changed. In the future field.module or something else
- * should provide a public validate function.
+ * that it might not be renamed/changed. In the future field.module or something
+ * else should provide a public validate function.
*
* @see _element_validate_integer_positive()
*/
@@ -414,7 +423,7 @@ function views_element_validate_integer($element, &$form_state) {
}
/**
- * Gets the current value of a #select element, from within a form constructor function.
+ * Gets the current value of a #select element, from within a form constructor.
*
* This function is intended for use in highly dynamic forms (in particular the
* add view wizard) which are rebuilt in different ways depending on which
@@ -434,9 +443,9 @@ function views_element_validate_integer($element, &$form_state) {
* the results of this function for any other purpose besides deciding how to
* build the next version of the form.
*
- * @param $form_state
- * The standard associative array containing the current state of the form.
- * @param $parents
+ * @param array $form_state
+ * The standard associative array containing the current state of the form.
+ * @param array $parents
* An array of parent keys that point to the part of the submitted form
* values that are expected to contain the element's value (in the case where
* this form element was actually submitted). In a simple case (assuming
@@ -444,14 +453,14 @@ function views_element_validate_integer($element, &$form_state) {
* $form['wrapper']['select'], so that the submitted form values would
* normally be found in $form_state['values']['wrapper']['select'], you would
* pass array('wrapper', 'select') for this parameter.
- * @param $default_value
+ * @param mixed $default_value
* The default value to return if the #select element does not currently have
* a proper value set based on the submitted input.
- * @param $element
+ * @param array $element
* An array representing the current version of the #select element within
* the form.
*
- * @return
+ * @return array
* The current value of the #select element. A common use for this is to feed
* it back into $element['#default_value'] so that the form will be rendered
* with the correct value selected.
@@ -508,16 +517,16 @@ function views_ui_get_selected($form_state, $parents, $default_value, $element)
* mean that the non-JavaScript fallback button does not appear in the correct
* place in the form.
*
- * @param $wrapping_element
+ * @param array $wrapping_element
* The element whose child will server as the AJAX trigger. For example, if
* $form['some_wrapper']['triggering_element'] represents the element which
* will trigger the AJAX behavior, you would pass $form['some_wrapper'] for
* this parameter.
- * @param $trigger_key
+ * @param string $trigger_key
* The key within the wrapping element that identifies which of its children
* serves as the AJAX trigger. In the above example, you would pass
* 'triggering_element' for this parameter.
- * @param $refresh_parents
+ * @param array $refresh_parents
* An array of parent keys that point to the part of the form that will be
* refreshed by AJAX. For example, if triggering the AJAX behavior should
* cause $form['dynamic_content']['section'] to be refreshed, you would pass
@@ -581,7 +590,7 @@ function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_pa
$wrapping_element[$button_key]['#value'] = t('Update "@title" choice (@number)', array(
'@title' => $button_title,
'@number' => ++$seen_buttons[$button_title],
- ));
+ ));
}
// Attach custom data to the triggering element and submit button, so we can
@@ -600,7 +609,7 @@ function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_pa
}
/**
- * Processes a non-JavaScript fallback submit button to limit its validation errors.
+ * Processes a non-JS fallback submit button to limit its validation errors.
*/
function views_ui_add_limited_validation($element, &$form_state) {
// Retrieve the AJAX triggering element so we can determine its parents. (We
@@ -634,11 +643,11 @@ function views_ui_add_limited_validation($element, &$form_state) {
}
/**
- * After-build function that adds a wrapper to a form region (for AJAX refreshes).
+ * After-build function that adds a wrapper to a form region (AJAX refreshes).
*
* This function inserts a wrapper around the region of the form that needs to
- * be refreshed by AJAX, based on information stored in the corresponding
- * submit button form element.
+ * be refreshed by AJAX, based on information stored in the corresponding submit
+ * button form element.
*/
function views_ui_add_ajax_wrapper($element, &$form_state) {
// Don't add the wrapper if the same one was already inserted on this
@@ -721,7 +730,8 @@ function views_ui_add_form_save_submit($form, &$form_state) {
if ($display->handler->has_path()) {
$one_path = $display->handler->get_option('path');
if (strpos($one_path, '%') === FALSE) {
- $form_state['redirect'] = $one_path; // PATH TO THE VIEW IF IT HAS ONE
+ $form_state['redirect'] = $one_path;
+ // PATH TO THE VIEW IF IT HAS ONE.
return;
}
}
@@ -811,7 +821,7 @@ function views_ui_taxonomy_autocomplete_validate($element, &$form_state) {
/**
* Theme function; returns basic administrative information about a view.
*
- * TODO: template + preprocess
+ * TODO: template + preprocess.
*/
function theme_views_ui_view_info($variables) {
$view = $variables['view'];
@@ -832,13 +842,14 @@ function theme_views_ui_view_info($variables) {
case t('Overridden'):
$type = t('Database overriding code');
+ break;
}
$output = '';
$output .= '' . check_plain($title) . "\n";
$output .= '' . $displays . "\n";
$output .= '' . $type . "\n";
- $output .= '' . t('Type') . ': ' . check_plain($variables['base']). "\n";
+ $output .= '' . t('Type') . ': ' . check_plain($variables['base']) . "\n";
return $output;
}
@@ -876,7 +887,7 @@ function views_ui_break_lock_confirm_submit(&$form, &$form_state) {
}
/**
- * Helper function to return the used display_id for the edit page
+ * Helper function to return the used display_id for the edit page.
*
* This function handles access to the display.
*/
@@ -927,6 +938,9 @@ function views_ui_edit_page($view, $display_id = NULL) {
return $build;
}
+/**
+ *
+ */
function views_ui_build_preview($view, $display_id, $render = TRUE) {
if (isset($_POST['ajax_html_ids'])) {
unset($_POST['ajax_html_ids']);
@@ -994,13 +1008,13 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
// @todo When more functionality is added to this form, cloning here may be
// too soon. But some of what we do with $view later in this function
// results in making it unserializable due to PDO limitations.
- $form_state['view'] = clone($view);
+ $form_state['view'] = clone $view;
$form['#attached']['library'][] = array('system', 'ui.tabs');
$form['#attached']['library'][] = array('system', 'ui.dialog');
$form['#attached']['library'][] = array('system', 'drupal.ajax');
$form['#attached']['library'][] = array('system', 'jquery.form');
- // TODO: This should be getting added to the page when an ajax popup calls
+ // @todo This should be getting added to the page when an ajax popup calls
// for it, instead of having to add it manually here.
$form['#attached']['js'][] = 'misc/tabledrag.js';
@@ -1009,12 +1023,16 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
$form['#attached']['js'][] = $module_path . '/js/views-admin.js';
$form['#attached']['js'][] = array(
- 'data' => array('views' => array('ajax' => array(
- 'id' => '#views-ajax-body',
- 'title' => '#views-ajax-title',
- 'popup' => '#views-ajax-popup',
- 'defaultForm' => views_ui_get_default_ajax_message(),
- ))),
+ 'data' => array(
+ 'views' => array(
+ 'ajax' => array(
+ 'id' => '#views-ajax-body',
+ 'title' => '#views-ajax-title',
+ 'popup' => '#views-ajax-popup',
+ 'defaultForm' => views_ui_get_default_ajax_message(),
+ ),
+ ),
+ ),
'type' => 'setting',
);
@@ -1030,7 +1048,9 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
if (isset($view->locked) && is_object($view->locked)) {
$form['locked'] = array(
'#theme_wrappers' => array('container'),
- '#attributes' => array('class' => array('view-locked', 'messages', 'warning')),
+ '#attributes' => array(
+ 'class' => array('view-locked', 'messages', 'warning'),
+ ),
'#markup' => t('This view is being edited by user !user, and is therefore locked from editing by others. This lock is !age old. Click here to break this lock.', array('!user' => theme('username', array('account' => user_load($view->locked->uid))), '!age' => format_interval(REQUEST_TIME - $view->locked->updated), '!break' => url('admin/structure/views/view/' . $view->name . '/break-lock'))),
);
}
@@ -1043,7 +1063,9 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
$form['changed'] = array(
'#theme_wrappers' => array('container'),
- '#attributes' => array('class' => array('view-changed', 'messages', 'warning')),
+ '#attributes' => array(
+ 'class' => array('view-changed', 'messages', 'warning'),
+ ),
'#markup' => $message,
);
if (empty($view->changed)) {
@@ -1072,7 +1094,7 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
$form['actions']['save'] = array(
'#type' => 'submit',
'#value' => t('Save'),
- // Taken from the "old" UI. @TODO: Review and rename.
+ // Taken from the "old" UI. @todo: Review and rename.
'#validate' => array('views_ui_edit_view_form_validate'),
'#submit' => array('views_ui_edit_view_form_submit'),
);
@@ -1083,7 +1105,8 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
);
$form['displays'] = array(
- '#prefix' => '' . t('Displays') . '
' . "\n" . '',
+ '#prefix' => '' . t('Displays') . "
\n"
+ . '',
'#suffix' => '',
);
@@ -1093,8 +1116,8 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
if ($display_id) {
$form_state['display_id'] = $display_id;
- // The part of the page where editing will take place.
- // This element is the ctools collapsible-div container for the display edit elements.
+ // The part of the page where editing will take place. This element is the
+ // CTools collapsible-div container for the display edit elements.
$form['displays']['settings'] = array(
'#theme_wrappers' => array('container'),
'#attributes' => array(
@@ -1107,7 +1130,8 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
'#id' => 'edit-display-settings',
);
$display_title = views_ui_get_display_label($view, $display_id, FALSE);
- // Add a handle for the ctools collapsible-div. The handle is the title of the display
+ // Add a handle for the ctools collapsible-div. The handle is the title of
+ // the display.
$form['displays']['settings']['tab_title']['#markup'] = '' . t('@display_title details', array('@display_title' => ucwords($display_title))) . '
';
// Add a text that the display is disabled.
if (!empty($view->display[$display_id]->handler)) {
@@ -1116,8 +1140,8 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
$form['displays']['settings']['disabled']['#markup'] = t('This display is disabled.');
}
}
- // The ctools collapsible-div content
- $form['displays']['settings']['settings_content']= array(
+ // The ctools collapsible-div content.
+ $form['displays']['settings']['settings_content'] = array(
'#theme_wrappers' => array('container'),
'#id' => 'edit-display-settings-content',
'#attributes' => array(
@@ -1126,7 +1150,7 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
),
),
);
- // Add the edit display content
+ // Add the edit display content.
$form['displays']['settings']['settings_content']['tab_content'] = views_ui_get_display_tab($view, $display_id);
$form['displays']['settings']['settings_content']['tab_content']['#theme_wrappers'] = array('container');
$form['displays']['settings']['settings_content']['tab_content']['#attributes'] = array('class' => array('views-display-tab'));
@@ -1172,7 +1196,7 @@ function views_ui_preview_form($form, &$form_state, $view, $display_id = 'defaul
$form_state['no_cache'] = TRUE;
$form_state['view'] = $view;
- $form['#attributes'] = array('class' => array('clearfix',));
+ $form['#attributes'] = array('class' => array('clearfix'));
// Add a checkbox controlling whether or not this display auto-previews.
$form['live_preview'] = array(
@@ -1182,16 +1206,16 @@ function views_ui_preview_form($form, &$form_state, $view, $display_id = 'defaul
'#default_value' => variable_get('views_ui_always_live_preview', TRUE),
);
- // Add the arguments textfield
+ // Add the arguments textfield.
$form['view_args'] = array(
'#type' => 'textfield',
'#title' => t('Preview with contextual filters:'),
'#description' => t('Separate contextual filter values with a "/". For example, %example.', array('%example' => '40/12/10')),
'#id' => 'preview-args',
-// '#attributes' => array('class' => array('ctools-auto-submit')),
+ // '#attributes' => array('class' => array('ctools-auto-submit')),
);
- // Add the preview button
+ // Add the preview button.
$form['button'] = array(
'#type' => 'submit',
'#value' => t('Update preview'),
@@ -1211,10 +1235,10 @@ function views_ui_preview_form($form, &$form_state, $view, $display_id = 'defaul
// Make ENTER in arguments textfield (and other controls) submit the form
// as this button, not the Save button.
// @todo This only works for JS users. To make this work for nojs users,
- // we may need to split Preview into a separate form.
+ // we may need to split Preview into a separate form.
'#process' => array_merge(array('views_ui_default_button'), element_info_property('submit', '#process', array())),
);
- $form['#action'] = url('admin/structure/views/view/' . $view->name .'/preview/' . $display_id);
+ $form['#action'] = url('admin/structure/views/view/' . $view->name . '/preview/' . $display_id);
return $form;
}
@@ -1227,15 +1251,15 @@ function views_ui_render_display_top($view, $display_id) {
$element['#attributes']['class'] = array('views-display-top', 'clearfix');
$element['#attributes']['id'] = array('views-display-top');
- // Extra actions for the display
+ // Extra actions for the display.
$element['extra_actions'] = array(
'#theme' => 'links__ctools_dropbutton',
'#attributes' => array(
- 'id' => 'views-display-extra-actions',
- 'class' => array(
- 'horizontal', 'right', 'links', 'actions',
- ),
+ 'id' => 'views-display-extra-actions',
+ 'class' => array(
+ 'horizontal', 'right', 'links', 'actions',
),
+ ),
'#links' => array(
'edit-details' => array(
'title' => t('edit view name/description'),
@@ -1310,6 +1334,9 @@ function views_ui_render_display_top($view, $display_id) {
return $element;
}
+/**
+ *
+ */
function views_ui_get_default_ajax_message() {
return '';
}
@@ -1372,11 +1399,11 @@ function views_ui_edit_form_submit_delete_display($form, &$form_state) {
* Submit handler to add a restore a removed display to a view.
*/
function views_ui_edit_form_submit_undo_delete_display($form, &$form_state) {
- // Create the new display
+ // Create the new display.
$id = $form_state['display_id'];
$form_state['view']->display[$id]->deleted = FALSE;
- // Store in cache
+ // Store in cache.
views_ui_cache_set($form_state['view']);
// Redirect to the top-level edit page.
@@ -1388,10 +1415,10 @@ function views_ui_edit_form_submit_undo_delete_display($form, &$form_state) {
*/
function views_ui_edit_form_submit_enable_display($form, &$form_state) {
$id = $form_state['display_id'];
- // set_option doesn't work because this would might affect upper displays
+ // set_option doesn't work because this would might affect upper displays.
$form_state['view']->display[$id]->handler->set_option('enabled', TRUE);
- // Store in cache
+ // Store in cache.
views_ui_cache_set($form_state['view']);
// Redirect to the top-level edit page.
@@ -1405,7 +1432,7 @@ function views_ui_edit_form_submit_disable_display($form, &$form_state) {
$id = $form_state['display_id'];
$form_state['view']->display[$id]->handler->set_option('enabled', FALSE);
- // Store in cache
+ // Store in cache.
views_ui_cache_set($form_state['view']);
// Redirect to the top-level edit page.
@@ -1459,10 +1486,10 @@ function views_ui_edit_form_submit_delay_destination($form, &$form_state) {
*
* @param view $view
* The view which will be edited.
- * @param $display_id
+ * @param string $display_id
* The display_id which is edited on the current request.
*/
-function views_ui_edit_page_display_tabs($view, $display_id = NULL) {
+function views_ui_edit_page_display_tabs(view $view, $display_id = NULL) {
$tabs = array();
// Create a tab for each display.
@@ -1483,7 +1510,8 @@ function views_ui_edit_page_display_tabs($view, $display_id = NULL) {
}
}
- // If the default display isn't supposed to be shown, don't display its tab, unless it's the only display.
+ // If the default display isn't supposed to be shown, don't display its tab,
+ // unless it's the only display.
if ((!views_ui_show_default_display($view) && $display_id != 'default') && count($tabs) > 1) {
$tabs['default']['#access'] = FALSE;
}
@@ -1526,7 +1554,7 @@ function views_ui_get_display_tab($view, $display_id) {
// page.
if (empty($display->handler)) {
$title = isset($display->display_title) ? $display->display_title : t('Invalid');
- // @TODO: Improved UX for the case where a plugin is missing.
+ // @todo: Improved UX for the case where a plugin is missing.
$build['#markup'] = t("Error: Display @display refers to a plugin named '@plugin', but that plugin is not available.", array('@display' => $display->id, '@plugin' => $display->display_plugin));
}
// Build the content of the edit page.
@@ -1542,8 +1570,10 @@ function views_ui_get_display_tab($view, $display_id) {
/**
* Helper function to get the display details section of the edit UI.
*
- * @param $view
- * @param $display
+ * @param view $view
+ * The full view object.
+ * @param object $display
+ * The display object to work with.
*
* @return array
* A renderable page build array.
@@ -1552,35 +1582,40 @@ function views_ui_get_display_tab_details($view, $display) {
$display_title = views_ui_get_display_label($view, $display->id, FALSE);
$build = array(
'#theme_wrappers' => array('container'),
- '#attributes' => array('id' => 'edit-display-settings-details',),
+ '#attributes' => array('id' => 'edit-display-settings-details'),
);
$plugin = views_fetch_plugin_data('display', $view->display[$display->id]->display_plugin);
- // The following is for display purposes only. We need to determine if there is more than one button and wrap
- // the buttons in a .ctools-dropbutton class if more than one is present. Otherwise, we'll just wrap the
- // actions in the .ctools-button class.
- $isDisplayDeleted = !empty($display->deleted);
- $isDeletable = empty($plugin['no remove']);
+ // The following is for display purposes only. We need to determine if there
+ // is more than one button and wrap the buttons in a .ctools-dropbutton class
+ // if more than one is present. Otherwise, we'll just wrap the actions in the
+ // .ctools-button class.
+ $is_display_deleted = !empty($display->deleted);
+ $is_deletable = empty($plugin['no remove']);
// The master display cannot be cloned.
- $isDefault = $display->id == 'default';
+ $is_default = $display->id == 'default';
// @todo: Figure out why get_option doesn't work here.
- $isEnabled = $display->handler->get_option('enabled');
+ $is_enabled = $display->handler->get_option('enabled');
- if (!$isDisplayDeleted && $isDeletable && !$isDefault) {
+ if (!$is_display_deleted && $is_deletable && !$is_default) {
$prefix = '';
- $itemElement = 'li';
+ $item_element = 'li';
}
else {
$prefix = '';
- $itemElement = 'li';
+ $item_element = 'li';
}
if ($display->id != 'default') {
$build['top']['#theme_wrappers'] = array('container');
$build['top']['#attributes']['id'] = 'edit-display-settings-top';
- $build['top']['#attributes']['class'] = array('views-ui-display-tab-actions', 'views-ui-display-tab-bucket', 'clearfix');
+ $build['top']['#attributes']['class'] = array(
+ 'views-ui-display-tab-actions',
+ 'views-ui-display-tab-bucket',
+ 'clearfix',
+ );
// The Delete, Duplicate and Undo Delete buttons.
$build['top']['actions'] = array(
@@ -1588,15 +1623,18 @@ function views_ui_get_display_tab_details($view, $display) {
'#suffix' => $suffix,
);
- if (!$isDisplayDeleted) {
- if (!$isEnabled) {
+ if (!$is_display_deleted) {
+ if (!$is_enabled) {
$build['top']['actions']['enable'] = array(
'#type' => 'submit',
'#value' => t('enable @display_title', array('@display_title' => $display_title)),
'#limit_validation_errors' => array(),
- '#submit' => array('views_ui_edit_form_submit_enable_display', 'views_ui_edit_form_submit_delay_destination'),
- '#prefix' => '<' . $itemElement . ' class="enable">',
- "#suffix" => '',
+ '#submit' => array(
+ 'views_ui_edit_form_submit_enable_display',
+ 'views_ui_edit_form_submit_delay_destination',
+ ),
+ '#prefix' => '<' . $item_element . ' class="enable">',
+ "#suffix" => '',
);
}
// Add a link to view the page.
@@ -1606,41 +1644,52 @@ function views_ui_get_display_tab_details($view, $display) {
$build['top']['actions']['path'] = array(
'#type' => 'link',
'#title' => t('view @display', array('@display' => $display->display_title)),
- '#options' => array('alt' => array(t("Go to the real page for this display"))),
+ '#options' => array(
+ 'alt' => array(t('Go to the real page for this display')),
+ ),
'#href' => $path,
- '#prefix' => '<' . $itemElement . ' class="view">',
- "#suffix" => '',
+ '#prefix' => '<' . $item_element . ' class="view">',
+ "#suffix" => '',
);
}
}
- if (!$isDefault) {
+ if (!$is_default) {
$build['top']['actions']['duplicate'] = array(
'#type' => 'submit',
'#value' => t('clone @display_title', array('@display_title' => $display_title)),
'#limit_validation_errors' => array(),
- '#submit' => array('views_ui_edit_form_submit_duplicate_display', 'views_ui_edit_form_submit_delay_destination'),
- '#prefix' => '<' . $itemElement . ' class="duplicate">',
- "#suffix" => '',
+ '#submit' => array(
+ 'views_ui_edit_form_submit_duplicate_display',
+ 'views_ui_edit_form_submit_delay_destination',
+ ),
+ '#prefix' => '<' . $item_element . ' class="duplicate">',
+ "#suffix" => '',
);
}
- if ($isDeletable) {
+ if ($is_deletable) {
$build['top']['actions']['delete'] = array(
'#type' => 'submit',
'#value' => t('delete @display_title', array('@display_title' => $display_title)),
'#limit_validation_errors' => array(),
- '#submit' => array('views_ui_edit_form_submit_delete_display', 'views_ui_edit_form_submit_delay_destination'),
- '#prefix' => '<' . $itemElement . ' class="delete">',
- "#suffix" => '',
+ '#submit' => array(
+ 'views_ui_edit_form_submit_delete_display',
+ 'views_ui_edit_form_submit_delay_destination',
+ ),
+ '#prefix' => '<' . $item_element . ' class="delete">',
+ "#suffix" => '',
);
}
- if ($isEnabled) {
+ if ($is_enabled) {
$build['top']['actions']['disable'] = array(
'#type' => 'submit',
'#value' => t('disable @display_title', array('@display_title' => $display_title)),
'#limit_validation_errors' => array(),
- '#submit' => array('views_ui_edit_form_submit_disable_display', 'views_ui_edit_form_submit_delay_destination'),
- '#prefix' => '<' . $itemElement . ' class="disable">',
- "#suffix" => '',
+ '#submit' => array(
+ 'views_ui_edit_form_submit_disable_display',
+ 'views_ui_edit_form_submit_delay_destination',
+ ),
+ '#prefix' => '<' . $item_element . ' class="disable">',
+ "#suffix" => '',
);
}
}
@@ -1649,9 +1698,12 @@ function views_ui_get_display_tab_details($view, $display) {
'#type' => 'submit',
'#value' => t('undo delete of @display_title', array('@display_title' => $display_title)),
'#limit_validation_errors' => array(),
- '#submit' => array('views_ui_edit_form_submit_undo_delete_display', 'views_ui_edit_form_submit_delay_destination'),
- '#prefix' => '<' . $itemElement . ' class="undo-delete">',
- "#suffix" => '',
+ '#submit' => array(
+ 'views_ui_edit_form_submit_undo_delete_display',
+ 'views_ui_edit_form_submit_delay_destination',
+ ),
+ '#prefix' => '<' . $item_element . ' class="undo-delete">',
+ "#suffix" => '',
);
}
@@ -1665,22 +1717,37 @@ function views_ui_get_display_tab_details($view, $display) {
$build['columns'] = array();
$build['columns']['#theme_wrappers'] = array('container');
- $build['columns']['#attributes'] = array('id' => 'edit-display-settings-main', 'class' => array('clearfix', 'views-display-columns'),);
+ $build['columns']['#attributes'] = array(
+ 'id' => 'edit-display-settings-main',
+ 'class' => array('clearfix', 'views-display-columns'),
+ );
$build['columns']['first']['#theme_wrappers'] = array('container');
- $build['columns']['first']['#attributes'] = array('class' => array('views-display-column', 'first'));
+ $build['columns']['first']['#attributes'] = array(
+ 'class' => array('views-display-column', 'first'),
+ );
$build['columns']['second']['#theme_wrappers'] = array('container');
- $build['columns']['second']['#attributes'] = array('class' => array('views-display-column', 'second'));
+ $build['columns']['second']['#attributes'] = array(
+ 'class' => array('views-display-column', 'second'),
+ );
$build['columns']['second']['settings'] = array();
$build['columns']['second']['header'] = array();
$build['columns']['second']['footer'] = array();
$build['columns']['second']['pager'] = array();
- // The third column buckets are wrapped in a CTools collapsible div
+ // The third column buckets are wrapped in a CTools collapsible div.
$build['columns']['third']['#theme_wrappers'] = array('container');
- $build['columns']['third']['#attributes'] = array('class' => array('views-display-column', 'third', 'ctools-collapsible-container', 'ctools-collapsible-remember'));
+ $build['columns']['third']['#attributes'] = array(
+ 'class' => array(
+ 'views-display-column',
+ 'third',
+ 'ctools-collapsible-container',
+ 'ctools-collapsible-remember',
+ ),
+ );
+
// Specify an id that won't change after AJAX requests, so ctools can keep
// track of the user's preferred collapsible state. Use the same id across
// different displays of the same view, so changing displays doesn't
@@ -1690,9 +1757,11 @@ function views_ui_get_display_tab_details($view, $display) {
if (!variable_get('views_ui_show_advanced_column', FALSE)) {
$build['columns']['third']['#attributes']['class'][] = 'ctools-collapsed';
}
- $build['columns']['third']['advanced'] = array('#markup' => '' . t('Advanced') . '
',);
+ $build['columns']['third']['advanced'] = array('#markup' => '' . t('Advanced') . '
');
$build['columns']['third']['collapse']['#theme_wrappers'] = array('container');
- $build['columns']['third']['collapse']['#attributes'] = array('class' => array('ctools-collapsible-content',),);
+ $build['columns']['third']['collapse']['#attributes'] = array(
+ 'class' => array('ctools-collapsible-content'),
+ );
// Each option (e.g. title, access, display as grid/table/list) fits into one
// of several "buckets," or boxes (Format, Fields, Sort, and so on).
@@ -1721,7 +1790,7 @@ function views_ui_get_display_tab_details($view, $display) {
}
if (isset($bucket['build']) && is_array($bucket['build'])) {
// The third column is a CTools collapsible div, so
- // the structure of the form is a little different for this column
+ // the structure of the form is a little different for this column.
if ($column === 'third') {
$build['columns'][$column]['collapse'][$id] = $bucket['build'];
$build['columns'][$column]['collapse'][$id]['#theme_wrappers'][] = 'views_ui_display_tab_bucket';
@@ -1789,12 +1858,15 @@ function views_ui_edit_form_get_build_from_option($id, $option, $view, $display)
return $option_build;
}
+/**
+ *
+ */
function template_preprocess_views_ui_display_tab_setting(&$variables) {
static $zebra = 0;
$variables['zebra'] = ($zebra % 2 === 0 ? 'odd' : 'even');
$zebra++;
- // Put the main link to the left side
+ // Put the main link to the left side.
array_unshift($variables['settings_links'], $variables['link']);
$variables['settings_links'] = implode(' | ', $variables['settings_links']);
@@ -1815,6 +1887,9 @@ function template_preprocess_views_ui_display_tab_setting(&$variables) {
}
}
+/**
+ *
+ */
function template_preprocess_views_ui_display_tab_bucket(&$variables) {
$element = $variables['element'];
@@ -1835,6 +1910,9 @@ function template_preprocess_views_ui_display_tab_bucket(&$variables) {
$variables['actions'] = !empty($element['#actions']) ? $element['#actions'] : '';
}
+/**
+ *
+ */
function template_preprocess_views_ui_display_tab_column(&$variables) {
$element = $variables['element'];
@@ -2016,7 +2094,8 @@ function views_ui_import_validate($form, &$form_state) {
elseif (version_compare($view->api_version, views_api_version(), '>')) {
form_error($form['view'], t('That view is created for the version @import_version of views, but you only have @api_version', array(
'@import_version' => $view->api_version,
- '@api_version' => views_api_version())));
+ '@api_version' => views_api_version(),
+ )));
}
// View name must be alphanumeric or underscores, no other punctuation.
@@ -2049,23 +2128,30 @@ function views_ui_import_validate($form, &$form_state) {
// Bypass the validation of view pluigns/handlers if option is checked.
if (!$form_state['values']['bypass_validation']) {
- // Make sure that all plugins and handlers needed by this view actually exist.
+ // Make sure that all plugins and handlers needed by this view actually
+ // exist.
foreach ($view->display as $id => $display) {
if (empty($display->handler) || !empty($display->handler->broken)) {
- drupal_set_message(t('Display plugin @plugin is not available.', array('@plugin' => $display->display_plugin)), 'error');
+ drupal_set_message(t('Display plugin @plugin is not available.', array(
+ '@plugin' => $display->display_plugin,
+ )), 'error');
$broken = TRUE;
continue;
}
$plugin = views_get_plugin('style', $display->handler->get_option('style_plugin'));
if (!$plugin) {
- drupal_set_message(t('Style plugin @plugin is not available.', array('@plugin' => $display->handler->get_option('style_plugin'))), 'error');
+ drupal_set_message(t('Style plugin @plugin is not available.', array(
+ '@plugin' => $display->handler->get_option('style_plugin'),
+ )), 'error');
$broken = TRUE;
}
elseif ($plugin->uses_row_plugin()) {
$plugin = views_get_plugin('row', $display->handler->get_option('row_plugin'));
if (!$plugin) {
- drupal_set_message(t('Row plugin @plugin is not available.', array('@plugin' => $display->handler->get_option('row_plugin'))), 'error');
+ drupal_set_message(t('Row plugin @plugin is not available.', array(
+ '@plugin' => $display->handler->get_option('row_plugin'),
+ )), 'error');
$broken = TRUE;
}
}
@@ -2076,10 +2162,10 @@ function views_ui_import_validate($form, &$form_state) {
foreach ($handlers as $id => $handler) {
if ($handler->broken()) {
drupal_set_message(t('@type handler @table.@field is not available.', array(
- '@type' => $info['stitle'],
- '@table' => $handler->table,
- '@field' => $handler->field,
- )), 'error');
+ '@type' => $info['stitle'],
+ '@table' => $handler->table,
+ '@field' => $handler->field,
+ )), 'error');
$broken = TRUE;
}
}
@@ -2135,7 +2221,8 @@ function views_ui_edit_view_form_submit($form, &$form_state) {
foreach ($form_state['view']->display as $id => $display) {
if (!empty($display->new_id)) {
$form_state['view']->display[$id]->id = $display->new_id;
- // Redirect the user to the renamed display to be sure that the page itself exists and doesn't throw errors.
+ // Redirect the user to the renamed display to be sure that the page
+ // itself exists and doesn't throw errors.
$form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->name . '/edit/' . $display->new_id;
}
}
@@ -2143,7 +2230,8 @@ function views_ui_edit_view_form_submit($form, &$form_state) {
// Direct the user to the right url, if the path of the display has changed.
if (!empty($_GET['destination'])) {
$destination = $_GET['destination'];
- // Find out the first display which has a changed path and redirect to this url.
+ // Find out the first display which has a changed path and redirect to this
+ // URL.
$old_view = views_get_view($form_state['view']->name);
foreach ($old_view->display as $id => $display) {
// Only check for displays with a path.
@@ -2179,9 +2267,12 @@ function views_ui_edit_view_form_cancel($form, &$form_state) {
}
}
+/**
+ *
+ */
function views_ui_edit_view_form_delete($form, &$form_state) {
unset($_REQUEST['destination']);
- // Redirect to the delete confirm page
+ // Redirect to the delete confirm page.
$form_state['redirect'] = array('admin/structure/views/view/' . $form_state['view']->name . '/delete', array('query' => drupal_get_destination() + array('cancel' => 'admin/structure/views/view/' . $form_state['view']->name . '/edit')));
}
@@ -2212,9 +2303,10 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
case 'filter':
$rearrange_url = "admin/structure/views/nojs/rearrange-$type/$view->name/$display->id/$type";
$rearrange_text = t('And/Or, Rearrange');
- // TODO: Add another class to have another symbol for filter rearrange.
+ // @todo Add another class to have another symbol for filter rearrange.
$class = 'icon compact rearrange';
break;
+
case 'field':
// Fetch the style plugin info so we know whether to list fields or not.
$style_plugin = $display->handler->get_plugin();
@@ -2240,7 +2332,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
$actions['add'] = array(
'title' => t('Add'),
'href' => "admin/structure/views/nojs/add-item/$view->name/$display->id/$type",
- 'attributes'=> array('class' => array('icon compact add', 'views-ajax-link'), 'title' => t('Add'), 'id' => 'views-add-' . $type),
+ 'attributes' => array('class' => array('icon compact add', 'views-ajax-link'), 'title' => t('Add'), 'id' => 'views-add-' . $type),
'html' => TRUE,
);
if ($count_handlers > 0) {
@@ -2252,12 +2344,12 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
);
}
- // Render the array of links
+ // Render the array of links.
$build['#actions'] = theme('links__ctools_dropbutton',
array(
'links' => $actions,
'attributes' => array(
- 'class' => array('inline', 'links', 'actions', 'horizontal', 'right')
+ 'class' => array('inline', 'links', 'actions', 'horizontal', 'right'),
),
'class' => array('views-ui-settings-bucket-operations'),
)
@@ -2279,7 +2371,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
static $relationships = NULL;
if (!isset($relationships)) {
- // Get relationship labels
+ // Get relationship labels.
$relationships = array();
// @todo: get_handlers()
$handlers = $display->handler->get_option('relationships');
@@ -2291,7 +2383,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
}
}
- // Filters can now be grouped so we do a little bit extra:
+ // Filters can now be grouped so we do a little bit extra.
$groups = array();
$grouping = FALSE;
if ($type == 'filter') {
@@ -2334,16 +2426,16 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
$build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/$view->name/$display->id/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE));
$build['fields'][$id]['#class'][] = drupal_clean_css_identifier($display->id . '-' . $type . '-' . $id);
if (!empty($view->changed_sections[$display->id . '-' . $type . '-' . $id])) {
- // @TODO: #changed is no longer being used?
+ // @todo: #changed is no longer being used?
$build['fields'][$id]['#changed'] = TRUE;
}
if ($display->handler->use_group_by() && $handler->use_group_by()) {
- $build['fields'][$id]['#settings_links'][] = l('' . t('Aggregation settings') . '', "admin/structure/views/nojs/config-item-group/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => true));
+ $build['fields'][$id]['#settings_links'][] = l('' . t('Aggregation settings') . '', "admin/structure/views/nojs/config-item-group/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE));
}
if ($handler->has_extra_options()) {
- $build['fields'][$id]['#settings_links'][] = l('' . t('Settings') . '', "admin/structure/views/nojs/config-item-extra/$view->name/$display->id/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => t('Settings')), 'html' => true));
+ $build['fields'][$id]['#settings_links'][] = l('' . t('Settings') . '', "admin/structure/views/nojs/config-item-extra/$view->name/$display->id/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => t('Settings')), 'html' => TRUE));
}
if ($grouping) {
@@ -2357,7 +2449,8 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
}
}
- // If using grouping, re-order fields so that they show up properly in the list.
+ // If using grouping, re-order fields so that they show up properly in the
+ // list.
if ($type == 'filter' && $grouping) {
$store = $build['fields'];
$build['fields'] = array();
@@ -2405,7 +2498,9 @@ function views_ui_regenerate_tab(&$view, &$output, $display_id) {
}
/**
- * Recursively adds microweights to a render array, similar to what form_builder() does for forms.
+ * Recursively adds microweights to a render array.
+ *
+ * Similar to what form_builder() does for forms.
*
* @todo Submit a core patch to fix drupal_render() to do this, so that all
* render arrays automatically preserve array insertion order, as forms do.
@@ -2414,7 +2509,7 @@ function views_ui_add_microweights(&$build) {
$count = 0;
foreach (element_children($build) as $key) {
if (!isset($build[$key]['#weight'])) {
- $build[$key]['#weight'] = $count/1000;
+ $build[$key]['#weight'] = $count / 1000;
}
views_ui_add_microweights($build[$key]);
$count++;
@@ -2499,8 +2594,8 @@ function views_ui_standard_form_buttons(&$form, &$form_state, $form_id, $name =
);
}
- // Compatibility, to be removed later: // TODO: When is "later"?
- // We used to set these items on the form, but now we want them on the $form_state:
+ // Compatibility, to be removed later: // @todo When is "later"? We used to
+ // set these items on the form, but now we want them on the $form_state.
if (isset($form['#title'])) {
$form_state['title'] = $form['#title'];
}
@@ -2535,11 +2630,10 @@ function views_ui_standard_form_buttons(&$form, &$form_state, $form_id, $name =
function views_ui_standard_submit($form, &$form_state) {
// Determine whether the values the user entered are intended to apply to
// the current display or the default display.
-
list($was_defaulted, $is_defaulted, $revert) = views_ui_standard_override_values($form, $form_state);
// Mark the changed section of the view as changed.
- // TODO: Document why we are doing this, and see if we still need it.
+ // @todo Document why we are doing this, and see if we still need it.
if (!empty($form['#section'])) {
$form_state['view']->changed_sections[$form['#section']] = TRUE;
}
@@ -2551,7 +2645,8 @@ function views_ui_standard_submit($form, &$form_state) {
$display = &$form_state['view']->display[$form_state['display_id']];
$display->handler->options_override($form, $form_state);
- // Don't execute the normal submit handling but still store the changed view into cache.
+ // Don't execute the normal submit handling but still store the changed
+ // view into cache.
views_ui_cache_set($form_state['view']);
return;
}
@@ -2590,8 +2685,9 @@ function views_ui_standard_submit($form, &$form_state) {
function views_ui_standard_override_values($form, $form_state) {
// Make sure the dropdown exists in the first place.
if (isset($form_state['values']['override']['dropdown'])) {
- // #default_value is used to determine whether it was the default value or not.
- // So the available options are: $display, 'default' and 'default_revert', not 'defaults'.
+ // #default_value is used to determine whether it was the default value or
+ // not. So the available options are: $display, 'default' and
+ // 'default_revert', not 'defaults'.
$was_defaulted = ($form['override']['dropdown']['#default_value'] === 'defaults');
$is_defaulted = ($form_state['values']['override']['dropdown'] === 'default');
$revert = ($form_state['values']['override']['dropdown'] === 'default_revert');
@@ -2613,7 +2709,7 @@ function views_ui_standard_override_values($form, $form_state) {
}
/**
- * Submit handler for cancel button
+ * Submit handler for cancel button.
*/
function views_ui_standard_cancel($form, &$form_state) {
if (!empty($form_state['view']->changed) && isset($form_state['view']->form_cache)) {
@@ -2625,9 +2721,10 @@ function views_ui_standard_cancel($form, &$form_state) {
}
/**
- * Add a ';
}
- // Only output the right column markup if there's a left column to begin with
+ // Only output the right column markup if there's a left column to begin with.
if (!empty($form['operator']['#type'])) {
$output .= '';
$output .= drupal_render_children($form);
@@ -3539,7 +3639,7 @@ function theme_views_ui_expose_filter_form($variables) {
return $output;
}
- /**
+/**
* Theme the build group filter form.
*/
function theme_views_ui_build_group_filter_form($variables) {
@@ -3567,7 +3667,6 @@ function theme_views_ui_build_group_filter_form($variables) {
$output .= drupal_render($form['description']);
$output .= '';
-
$header = array(
t('Default'),
t('Weight'),
@@ -3581,7 +3680,8 @@ function theme_views_ui_build_group_filter_form($variables) {
$form['default_group_multiple'] = form_process_checkboxes($form['default_group_multiple']);
$form['default_group']['All']['#title'] = '';
- drupal_render($form['default_group_multiple']['All']); // Don't render
+ drupal_render($form['default_group_multiple']['All']);
+ // Don't render.
$rows[] = array(
drupal_render($form['default_group']['All']),
'',
@@ -3600,7 +3700,7 @@ function theme_views_ui_build_group_filter_form($variables) {
'title' => drupal_render($form['group_items'][$group_id]['title']),
'operator' => drupal_render($form['group_items'][$group_id]['operator']),
'value' => drupal_render($form['group_items'][$group_id]['value']),
- 'remove' => drupal_render($form['group_items'][$group_id]['remove']) . l('' . t('Remove') . '', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $group_id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => true)),
+ 'remove' => drupal_render($form['group_items'][$group_id]['remove']) . l('' . t('Remove') . '', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $group_id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE)),
);
$rows[] = array('data' => $data, 'id' => 'views-row-' . $group_id, 'class' => array('draggable'));
}
@@ -3612,7 +3712,7 @@ function theme_views_ui_build_group_filter_form($variables) {
/**
- * Submit handler for rearranging form
+ * Submit handler for rearranging form.
*/
function views_ui_rearrange_form_submit($form, &$form_state) {
$types = views_object_types();
@@ -3621,7 +3721,7 @@ function views_ui_rearrange_form_submit($form, &$form_state) {
$old_fields = $display->handler->get_option($types[$form_state['type']]['plural']);
$new_fields = $order = array();
- // Make an array with the weights
+ // Make an array with the weights.
foreach ($form_state['values'] as $field => $info) {
// add each value that is a field with a weight to our list, but only if
// it has had its 'removed' checkbox checked.
@@ -3630,7 +3730,7 @@ function views_ui_rearrange_form_submit($form, &$form_state) {
}
}
- // Sort the array
+ // Sort the array.
asort($order);
// Create a new list of fields in the new order.
@@ -3639,7 +3739,7 @@ function views_ui_rearrange_form_submit($form, &$form_state) {
}
$display->handler->set_option($types[$form_state['type']]['plural'], $new_fields);
- // Store in cache
+ // Store in cache.
views_ui_cache_set($form_state['view']);
}
@@ -3675,7 +3775,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
}
$count = 0;
- // Get relationship labels
+ // Get relationship labels.
$relationships = array();
foreach ($display->handler->get_handlers('relationship') as $id => $handler) {
$relationships[$id] = $handler->label();
@@ -3698,7 +3798,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
$form['filter_groups']['#tree'] = TRUE;
$form['filter_groups']['operator'] = array(
'#type' => 'select',
- '#options' => array (
+ '#options' => array(
'AND' => t('And'),
'OR' => t('Or'),
),
@@ -3727,7 +3827,8 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
),
);
- $form['remove_groups'][$id] = array(); // to prevent a notice
+ $form['remove_groups'][$id] = array();
+ // to prevent a notice.
if ($id != 1) {
$form['remove_groups'][$id] = array(
'#type' => 'submit',
@@ -3759,9 +3860,8 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
$field['group'] = 'ungroupable';
}
- // If not grouping and the handler is set ungroupable, move it back to
- // the default group to prevent weird errors from having it be in its
- // own group:
+ // If not grouping and the handler is set ungroupable, move it back to the
+ // default group to prevent weird errors from having it be in its own group.
if (!$grouping && $field['group'] == 'ungroupable') {
$field['group'] = 1;
}
@@ -3821,7 +3921,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
}
/**
- * Turn the rearrange form into a proper table
+ * Turn the rearrange form into a proper table.
*/
function theme_views_ui_rearrange_filter_form(&$vars) {
$form = $vars['form'];
@@ -3867,7 +3967,7 @@ function theme_views_ui_rearrange_filter_form(&$vars) {
$form['filters'][$id]['group']['#attributes']['class'] = array('views-group-select views-group-select-' . $group_id);
$row[] = drupal_render($form['filters'][$id]['group']);
$form['filters'][$id]['removed']['#attributes']['class'][] = 'js-hide';
- $row[] = drupal_render($form['filters'][$id]['removed']) . l('' . t('Remove') . '', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => true));
+ $row[] = drupal_render($form['filters'][$id]['removed']) . l('' . t('Remove') . '', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('views-hidden', 'views-button-remove', 'views-groups-remove-link', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE));
$row = array('data' => $row, 'class' => array('draggable'), 'id' => 'views-row-' . $id);
if ($group_id !== 'ungroupable') {
@@ -3914,7 +4014,7 @@ function theme_views_ui_rearrange_filter_form(&$vars) {
}
/**
- * Submit handler for rearranging form
+ * Submit handler for rearranging form.
*/
function views_ui_rearrange_filter_form_submit($form, &$form_state) {
$types = views_object_types();
@@ -3933,7 +4033,7 @@ function views_ui_rearrange_filter_form_submit($form, &$form_state) {
// Whatever button was clicked, re-calculate field information.
$new_fields = $order = array();
- // Make an array with the weights
+ // Make an array with the weights.
foreach ($form_state['values']['filters'] as $field => $info) {
// add each value that is a field with a weight to our list, but only if
// it has had its 'removed' checkbox checked.
@@ -3949,7 +4049,7 @@ function views_ui_rearrange_filter_form_submit($form, &$form_state) {
}
}
- // Sort the array
+ // Sort the array.
asort($order);
// Create a new list of fields in the new order.
@@ -3961,7 +4061,7 @@ function views_ui_rearrange_filter_form_submit($form, &$form_state) {
// either adding or removing a group, not actually updating the filters.
if (!empty($form_state['clicked_button']['#group'])) {
if ($form_state['clicked_button']['#group'] == 'add') {
- // Add a new group
+ // Add a new group.
$groups['groups'][] = 'AND';
}
else {
@@ -4053,11 +4153,11 @@ function views_ui_add_item_form($form, &$form_state) {
$form['#title'] = t('Add @type', array('@type' => $ltitle));
$form['#section'] = $display_id . 'add-item';
-
// Add the display override dropdown.
views_ui_standard_display_dropdown($form, $form_state, $section);
- // Figure out all the base tables allowed based upon what the relationships provide.
+ // Figure out all the base tables allowed based upon what the relationships
+ // provide.
$base_tables = $view->get_base_tables();
$options = views_fetch_fields(array_keys($base_tables), $type, $display->handler->use_group_by());
@@ -4134,10 +4234,10 @@ function views_ui_add_item_form($form, &$form_state) {
}
else {
$form['options']['markup'] = array(
- '#markup' => '' . t('There are no @types available to add.', array('@types' => $ltitle)) . '',
+ '#markup' => '' . t('There are no @types available to add.', array('@types' => $ltitle)) . '',
);
}
- // Add a div to show the selected items
+ // Add a div to show the selected items.
$form['selected'] = array(
'#type' => 'item',
'#markup' => '',
@@ -4183,7 +4283,8 @@ function views_ui_add_item_form_submit($form, &$form_state) {
}
if (!empty($form_state['values']['name']) && is_array($form_state['values']['name'])) {
- // Loop through each of the items that were checked and add them to the view.
+ // Loop through each of the items that were checked and add them to the
+ // view.
foreach (array_keys(array_filter($form_state['values']['name'])) as $field) {
list($table, $field) = explode('.', $field, 2);
@@ -4192,9 +4293,10 @@ function views_ui_add_item_form_submit($form, &$form_state) {
}
$id = $form_state['view']->add_item($form_state['display_id'], $type, $table, $field);
- // check to see if we have group by settings
+ // Check to see if we have group by settings.
$key = $type;
- // Footer,header and empty text have a different internal handler type(area).
+ // Footer,header and empty text have a different internal handler type
+ // (area).
if (isset($types[$type]['type'])) {
$key = $types[$type]['type'];
}
@@ -4203,11 +4305,12 @@ function views_ui_add_item_form_submit($form, &$form_state) {
views_ui_add_form_to_stack('config-item-group', $form_state['view'], $form_state['display_id'], array($type, $id));
}
- // check to see if this type has settings, if so add the settings form first
+ // Check to see if this type has settings, if so add the settings form
+ // first.
if ($handler && $handler->has_extra_options()) {
views_ui_add_form_to_stack('config-item-extra', $form_state['view'], $form_state['display_id'], array($type, $id));
}
- // Then add the form to the stack
+ // Then add the form to the stack.
views_ui_add_form_to_stack('config-item', $form_state['view'], $form_state['display_id'], array($type, $id));
}
}
@@ -4216,19 +4319,19 @@ function views_ui_add_item_form_submit($form, &$form_state) {
unset($form_state['view']->form_cache);
}
- // Store in cache
+ // Store in cache.
views_ui_cache_set($form_state['view']);
}
/**
- * Override handler for views_ui_edit_display_form
+ * Override handler for views_ui_edit_display_form.
*/
function views_ui_config_item_form_build_group($form, &$form_state) {
$item = &$form_state['handler']->options;
// flip. If the filter was a group, set back to a standard filter.
$item['is_grouped'] = empty($item['is_grouped']);
- // If necessary, set new defaults:
+ // If necessary, set new defaults.
if ($item['is_grouped']) {
$form_state['handler']->build_group_options();
}
@@ -4302,13 +4405,13 @@ function views_ui_config_item_form($form, &$form_state) {
$relationship_options = array();
foreach ($relationships as $relationship) {
- // relationships can't link back to self. But also, due to ordering,
+ // Relationships can't link back to self. But also, due to ordering,
// relationships can only link to prior relationships.
if ($type == 'relationship' && $id == $relationship['id']) {
break;
}
$relationship_handler = views_get_handler($relationship['table'], $relationship['field'], 'relationship');
- // ignore invalid/broken relationships.
+ // Ignore invalid/broken relationships.
if (empty($relationship_handler)) {
continue;
}
@@ -4432,7 +4535,6 @@ function views_ui_config_item_form_submit_temporary($form, &$form_state) {
$handler = views_get_handler($item['table'], $item['field'], $handler_type, $override);
$handler->init($form_state['view'], $item);
-
// Add the incoming options to existing options because items using
// the extra form may not have everything in the form here.
$options = $form_state['values']['options'] + $form_state['handler']->options;
@@ -4441,17 +4543,17 @@ function views_ui_config_item_form_submit_temporary($form, &$form_state) {
// extra stuff on the form is not sent through.
$handler->unpack_options($handler->options, $options, NULL, FALSE);
- // Store the item back on the view
+ // Store the item back on the view.
$form_state['view']->temporary_options[$type][$form_state['id']] = $handler->options;
- // @todo: Figure out whether views_ui_ajax_form is perhaps the better place to fix the issue.
- // views_ui_ajax_form() drops the current form from the stack, even if it's an #ajax.
- // So add the item back to the top of the stack.
+ // @todo: Figure out whether views_ui_ajax_form is perhaps the better place
+ // to fix the issue. views_ui_ajax_form() drops the current form from the
+ // stack, even if it's an #ajax. So add the item back to the top of the stack.
views_ui_add_form_to_stack($form_state['form_key'], $form_state['view'], $form_state['display_id'], array($type, $item['id']), TRUE);
$form_state['rerender'] = TRUE;
$form_state['rebuild'] = TRUE;
- // Write to cache
+ // Write to cache.
views_ui_cache_set($form_state['view']);
}
@@ -4487,7 +4589,6 @@ function views_ui_config_item_form_submit($form, &$form_state) {
$handler = views_get_handler($item['table'], $item['field'], $handler_type, $override);
$handler->init($form_state['view'], $item);
-
// Add the incoming options to existing options because items using
// the extra form may not have everything in the form here.
$options = $form_state['values']['options'] + $form_state['handler']->options;
@@ -4496,7 +4597,7 @@ function views_ui_config_item_form_submit($form, &$form_state) {
// extra stuff on the form is not sent through.
$handler->unpack_options($handler->options, $options, NULL, FALSE);
- // Store the item back on the view
+ // Store the item back on the view.
$form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], $handler->options);
// Ensure any temporary options are removed.
@@ -4504,7 +4605,7 @@ function views_ui_config_item_form_submit($form, &$form_state) {
unset($form_state['view']->temporary_options[$type][$form_state['id']]);
}
- // Write to cache
+ // Write to cache.
views_ui_cache_set($form_state['view']);
}
@@ -4565,18 +4666,18 @@ function views_ui_config_item_group_form_submit($form, &$form_state) {
$handler->groupby_form_submit($form, $form_state);
- // Store the item back on the view
+ // Store the item back on the view.
$form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
- // Write to cache
+ // Write to cache.
views_ui_cache_set($form_state['view']);
}
/**
- * Submit handler for removing an item from a view
+ * Submit handler for removing an item from a view.
*/
function views_ui_config_item_form_remove($form, &$form_state) {
- // Store the item back on the view
+ // Store the item back on the view.
list($was_defaulted, $is_defaulted) = views_ui_standard_override_values($form, $form_state);
// If the display selection was changed toggle the override value.
if ($was_defaulted != $is_defaulted) {
@@ -4585,19 +4686,19 @@ function views_ui_config_item_form_remove($form, &$form_state) {
}
$form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], NULL);
- // Write to cache
+ // Write to cache.
views_ui_cache_set($form_state['view']);
}
/**
- * Override handler for views_ui_edit_display_form
+ * Override handler for views_ui_edit_display_form.
*/
function views_ui_config_item_form_expose($form, &$form_state) {
$item = &$form_state['handler']->options;
- // flip
+ // flip.
$item['exposed'] = empty($item['exposed']);
- // If necessary, set new defaults:
+ // If necessary, set new defaults.
if ($item['exposed']) {
$form_state['handler']->expose_options();
}
@@ -4676,10 +4777,10 @@ function views_ui_config_item_extra_form_submit($form, &$form_state) {
$item[$key] = $value;
}
- // Store the item back on the view
+ // Store the item back on the view.
$form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
- // Write to cache
+ // Write to cache.
views_ui_cache_set($form_state['view']);
}
@@ -4746,10 +4847,10 @@ function views_ui_config_style_form_submit($form, &$form_state) {
// Store the data we're given.
$item['style_options'] = $form_state['values']['style_options'];
- // Store the item back on the view
+ // Store the item back on the view.
$form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
- // Write to cache
+ // Write to cache.
views_ui_cache_set($form_state['view']);
}
@@ -4824,7 +4925,7 @@ function views_ui_admin_settings_basic() {
'#title' => t('Custom admin theme for the Views UI'),
'#options' => array('_default' => t('- Use default -')) + $options,
'#default_value' => variable_get('views_ui_custom_theme', '_default'),
- '#description' => t('In some cases you might want to select a different admin theme for the Views UI.')
+ '#description' => t('In some cases you might want to select a different admin theme for the Views UI.'),
);
$form['basic']['views_exposed_filter_any_label'] = array(
@@ -4845,12 +4946,11 @@ function views_ui_admin_settings_basic() {
'#default_value' => variable_get('views_ui_always_live_preview', TRUE),
);
-// $form['live_preview']['views_ui_always_live_preview_button'] = array(
-// '#type' => 'checkbox',
-// '#title' => t('Always show the preview button, even when the automatically update option is checked'),
-// '#default_value' => variable_get('views_ui_always_live_preview_button', FALSE),
-// );
-
+ // $form['live_preview']['views_ui_always_live_preview_button'] = array(
+ // '#type' => 'checkbox',
+ // '#title' => t('Always show the preview button, even when the automatically update option is checked'),
+ // '#default_value' => variable_get('views_ui_always_live_preview_button', FALSE),
+ // );
$form['live_preview']['views_ui_show_preview_information'] = array(
'#type' => 'checkbox',
'#title' => t('Show information and statistics about the view during live preview'),
@@ -4891,8 +4991,7 @@ function views_ui_admin_settings_basic() {
'#dependency' => array('edit-views-ui-show-preview-information' => array(TRUE)),
);
-// $form['live_preview']['views_ui_show_performance_statistics_where'] = array(
-
+ // $form['live_preview']['views_ui_show_performance_statistics_where'] = array(
return system_settings_form($form);
}
@@ -4953,7 +5052,7 @@ function views_ui_admin_settings_advanced() {
'#title' => t('Localization'),
);
- $form['locale']['views_localization_plugin'] = array(
+ $form['locale']['views_localization_plugin'] = array(
'#type' => 'radios',
'#title' => t('Translation method'),
'#options' => views_fetch_plugin_names('localization', NULL, array()),
@@ -4961,6 +5060,13 @@ function views_ui_admin_settings_advanced() {
'#description' => t('Select a translation method to use for Views data like header, footer, and empty text.'),
);
+ $form['locale']['views_localize_all'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use same translation method for exported views'),
+ '#description' => t('Exported views will use Core translation by default. Enable this to always use the configured translation method.'),
+ '#default_value' => variable_get('views_localize_all', FALSE),
+ );
+
$regions = array();
$regions['watchdog'] = t('Watchdog');
if (module_exists('devel')) {
@@ -4987,7 +5093,7 @@ function views_ui_admin_settings_advanced() {
'#default_value' => views_get_enabled_display_extenders(),
'#options' => $options,
'#type' => 'checkboxes',
- '#description' => t('Select extensions of the views interface.')
+ '#description' => t('Select extensions of the views interface.'),
);
}
@@ -5014,7 +5120,7 @@ function views_ui_config_item_form_rescan($form, &$form_state) {
// function uses an internal cache (which was initialized before we
// called drupal_theme_rebuild()) so it won't reflect the
// current state of our theme registry. The only way to clear that cache
- // is to re-initialize the theme system:
+ // is to re-initialize the theme system.
unset($GLOBALS['theme']);
drupal_theme_initialize();
@@ -5023,7 +5129,7 @@ function views_ui_config_item_form_rescan($form, &$form_state) {
}
/**
- * Override handler for views_ui_edit_display_form
+ * Override handler for views_ui_edit_display_form.
*/
function views_ui_edit_display_form_change_theme($form, &$form_state) {
// This is just a temporary variable.
@@ -5035,11 +5141,11 @@ function views_ui_edit_display_form_change_theme($form, &$form_state) {
}
/**
- * Page callback for views tag autocomplete
+ * Page callback for views tag autocomplete.
*/
function views_ui_autocomplete_tag($string = '') {
$matches = array();
- // get matches from default views:
+ // Get matches from default views.
views_include('view');
$views = views_get_all_views();
foreach ($views as $view) {
@@ -5055,8 +5161,7 @@ function views_ui_autocomplete_tag($string = '') {
}
// ------------------------------------------------------------------
-// Get information from the Views data
-
+// Get information from the Views data.
function _views_weight_sort($a, $b) {
if ($a['weight'] != $b['weight']) {
return $a['weight'] < $b['weight'] ? -1 : 1;
@@ -5069,7 +5174,7 @@ function _views_weight_sort($a, $b) {
}
/**
- * Fetch a list of all base tables available
+ * Fetch a list of all base tables available.
*
* @return
* A keyed array of in the form of 'base_table' => 'Description'.
@@ -5096,6 +5201,9 @@ function views_fetch_base_tables() {
return $base_tables;
}
+/**
+ *
+ */
function _views_sort_types($a, $b) {
$a_group = drupal_strtolower($a['group']);
$b_group = drupal_strtolower($b['group']);
@@ -5129,7 +5237,6 @@ function views_fetch_fields($base, $type, $grouping = FALSE) {
static $fields = array();
if (empty($fields)) {
$data = views_fetch_data();
- $start = microtime(TRUE);
// This constructs this ginormous multi dimensional array to
// collect the important data about fields. In the end,
// the structure looks a bit like this (using nid as an example)
@@ -5139,13 +5246,18 @@ function views_fetch_fields($base, $type, $grouping = FALSE) {
// can appear in different places in the actual data structure so that
// the data doesn't have to be repeated a lot. This essentially lets
// each field have a cheap kind of inheritance.
-
+ $components = array('title', 'group', 'help', 'base', 'aliases');
+ $components_errors = array();
+ // Fixed number of calls to t() to produce error components.
+ foreach ($components as $string) {
+ $components_errors[$string] = t("Error: missing @component", array('@component' => $string));
+ }
foreach ($data as $table => $table_data) {
$bases = array();
$strings = array();
$skip_bases = array();
foreach ($table_data as $field => $info) {
- // Collect table data from this table
+ // Collect table data from this table.
if ($field == 'table') {
// calculate what tables this table can join to.
if (!empty($info['join'])) {
@@ -5174,22 +5286,22 @@ function views_fetch_fields($base, $type, $grouping = FALSE) {
if (isset($info[$key]['moved to'])) {
continue;
}
- foreach (array('title', 'group', 'help', 'base', 'aliases') as $string) {
- // First, try the lowest possible level
+ foreach ($components as $string) {
+ // First, try the lowest possible level.
if (!empty($info[$key][$string])) {
$strings[$field][$key][$string] = $info[$key][$string];
}
- // Then try the field level
+ // Then try the field level.
elseif (!empty($info[$string])) {
$strings[$field][$key][$string] = $info[$string];
}
- // Finally, try the table level
+ // Finally, try the table level.
elseif (!empty($table_data['table'][$string])) {
$strings[$field][$key][$string] = $table_data['table'][$string];
}
else {
- if ($string != 'base' && $string != 'base') {
- $strings[$field][$key][$string] = t("Error: missing @component", array('@component' => $string));
+ if ($string != 'base') {
+ $strings[$field][$key][$string] = $components_errors[$string];
}
}
}
@@ -5206,12 +5318,10 @@ function views_fetch_fields($base, $type, $grouping = FALSE) {
}
}
}
-// vsm('Views UI data build time: ' . (views_microtime() - $start) * 1000 . ' ms');
}
- // If we have an array of base tables available, go through them
- // all and add them together. Duplicate keys will be lost and that's
- // Just Fine.
+ // If we have an array of base tables available, go through them all and add
+ // them together. Duplicate keys will be lost and that's Just Fine.
if (is_array($base)) {
$strings = array();
foreach ($base as $base_table) {
@@ -5232,7 +5342,7 @@ function views_fetch_fields($base, $type, $grouping = FALSE) {
/**
- * Theme the form for the table style plugin
+ * Theme the form for the table style plugin.
*/
function theme_views_ui_style_plugin_table($variables) {
$form = $variables['form'];
@@ -5319,6 +5429,9 @@ function views_ui_get_display_label($view, $display_id, $check_changed = TRUE) {
return $title;
}
+/**
+ *
+ */
function views_ui_add_template_page() {
$templates = views_get_all_templates();
@@ -5346,7 +5459,9 @@ function views_ui_add_template_page() {
}
/**
- * #process callback for a button; determines if a button is the form's triggering element.
+ * #process callback for a button.
+ *
+ * Determines if a button is the form's triggering element.
*
* The Form API has logic to determine the form's triggering element based on
* the data in $_POST. However, it only checks buttons based on a single #value
@@ -5369,7 +5484,9 @@ function views_ui_form_button_was_clicked($element, &$form_state) {
}
/**
- * #process callback for a button; makes implicit form submissions trigger as this button.
+ * #process callback for a button.
+ *
+ * Makes implicit form submissions trigger as this button.
*
* @see Drupal.behaviors.viewsImplicitFormSubmission
*/
diff --git a/sites/all/modules/contrib/views/views/includes/ajax.inc b/sites/all/modules/contrib/views/views/includes/ajax.inc
index cd63360..e7b3789 100644
--- a/sites/all/modules/contrib/views/views/includes/ajax.inc
+++ b/sites/all/modules/contrib/views/views/includes/ajax.inc
@@ -25,7 +25,8 @@ function views_ajax() {
$commands = array();
- // Remove all of this stuff from $_GET so it doesn't end up in pagers and tablesort URLs.
+ // Remove all of this stuff from $_GET so it doesn't end up in pagers and
+ // tablesort URLs.
foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', 'ajax_html_ids', 'ajax_page_state') as $key) {
if (isset($_GET[$key])) {
unset($_GET[$key]);
@@ -40,20 +41,23 @@ function views_ajax() {
// Load the view.
$view = views_get_view($name);
- if ($view && $view->access($display_id)) {
+ if ($view && $view->access($display_id) && $view->set_display($display_id) && $view->display_handler->use_ajax()) {
// Fix 'q' for paging.
if (!empty($path)) {
$_GET['q'] = $path;
}
- // Add all $_POST data, because AJAX is always a post and many things,
- // such as tablesorts, exposed filters and paging assume $_GET.
- $_GET = $_POST + $_GET;
+ // If page parameter is in the $_POST exclude it from $_GET, otherwise
+ // support views_ajax requests using $_GET.
+ $exclude = isset($_POST['page']) ? array('page') : array();
+ // Add all $_POST data to $_GET as many things, such as tablesorts,
+ // exposed filters and paging assume $_GET.
+ $_GET = $_POST + drupal_get_query_parameters($_GET, $exclude);
// Overwrite the destination.
// @see drupal_get_destination()
$origin_destination = $path;
- $query = drupal_http_build_query($_REQUEST);
+ $query = drupal_http_build_query(drupal_get_query_parameters());
if ($query != '') {
$origin_destination .= '?' . $query;
}
@@ -78,14 +82,14 @@ function views_ajax() {
/**
* Creates a Drupal AJAX 'viewsSetForm' command.
*
- * @param $output
+ * @param string $output
* The form to display in the modal.
- * @param $title
+ * @param string $title
* The title.
- * @param $url
+ * @param string $url
* An optional URL.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_set_form($output, $title, $url = NULL) {
@@ -103,7 +107,7 @@ function views_ajax_command_set_form($output, $title, $url = NULL) {
/**
* Creates a Drupal AJAX 'viewsDismissForm' command.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_dismiss_form() {
@@ -116,8 +120,8 @@ function views_ajax_command_dismiss_form() {
/**
* Creates a Drupal AJAX 'viewsHilite' command.
*
- * @param $selector
- * The selector to highlight
+ * @param string $selector
+ * The selector to highlight.
*
* @return
* An array suitable for use with the ajax_render() function.
@@ -132,14 +136,14 @@ function views_ajax_command_hilite($selector) {
/**
* Creates a Drupal AJAX 'addTab' command.
*
- * @param $id
+ * @param string $id
* The DOM ID.
- * @param $title
+ * @param string $title
* The title.
- * @param $body
+ * @param string $body
* The body.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_add_tab($id, $title, $body) {
@@ -155,7 +159,7 @@ function views_ajax_command_add_tab($id, $title, $body) {
/**
* Scroll to top of the current view.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_scroll_top($selector) {
@@ -172,7 +176,7 @@ function views_ajax_command_scroll_top($selector) {
* @param bool $changed
* Whether of not the view has changed.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_show_buttons($changed) {
@@ -186,7 +190,7 @@ function views_ajax_command_show_buttons($changed) {
/**
* Trigger the Views live preview.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_trigger_preview() {
@@ -199,7 +203,7 @@ function views_ajax_command_trigger_preview() {
/**
* Replace the page title.
*
- * @return
+ * @return array
* An array suitable for use with the ajax_render() function.
*/
function views_ajax_command_replace_title($title) {
@@ -213,6 +217,12 @@ function views_ajax_command_replace_title($title) {
/**
* Return an AJAX error.
+ *
+ * @param string $message
+ * The message to display.
+ *
+ * @return array
+ * An array suitable for use with the ajax_render() function.
*/
function views_ajax_error($message) {
$commands = array();
@@ -222,6 +232,7 @@ function views_ajax_error($message) {
/**
* Wrapper around drupal_build_form to handle some AJAX stuff automatically.
+ *
* This makes some assumptions about the client.
*/
function views_ajax_form_wrapper($form_id, &$form_state) {
@@ -240,15 +251,15 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
$form = drupal_build_form($form_id, $form_state);
$output = drupal_render($form);
- // These forms have the title built in, so set the title here:
+ // These forms have the title built in, so set the title here.
if (empty($form_state['ajax']) && !empty($form_state['title'])) {
drupal_set_title($form_state['title']);
drupal_add_css(drupal_get_path('module', 'views_ui') . '/css/views-admin.css');
}
if (!empty($form_state['ajax']) && (empty($form_state['executed']) || !empty($form_state['rerender']))) {
- // If the form didn't execute and we're using ajax, build up a
- // Ajax command list to execute.
+ // If the form didn't execute and we're using ajax, build up a AJAX command
+ // list to execute.
$commands = array();
$display = '';
@@ -276,7 +287,7 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
return $commands;
}
- // These forms have the title built in, so set the title here:
+ // These forms have the title built in, so set the title here.
if (empty($form_state['ajax']) && !empty($form_state['title'])) {
drupal_set_title($form_state['title']);
}
@@ -286,13 +297,14 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
/**
- * Page callback for views user autocomplete
+ * Page callback for views user autocomplete.
*/
function views_ajax_autocomplete_user($string = '') {
- // The user enters a comma-separated list of user name. We only autocomplete the last name.
+ // The user enters a comma-separated list of user name. We only autocomplete
+ // the last name.
$array = drupal_explode_tags($string);
- // Fetch last name
+ // Fetch last name.
$last_string = trim(array_pop($array));
$matches = array();
if ($last_string != '') {
@@ -325,16 +337,16 @@ function views_ajax_autocomplete_user($string = '') {
/**
* Page callback for views taxonomy autocomplete.
*
- * @param $vid
+ * @param int $vid
* The vocabulary id of the tags which should be returned.
- *
- * @param $tags_typed
+ * @param string $tags_typed
* The typed string of the user.
*
* @see taxonomy_autocomplete()
*/
function views_ajax_autocomplete_taxonomy($vid, $tags_typed = '') {
- // 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($tags_typed);
$tag_last = drupal_strtolower(array_pop($tags_typed));
@@ -343,7 +355,7 @@ function views_ajax_autocomplete_taxonomy($vid, $tags_typed = '') {
$query = db_select('taxonomy_term_data', 't');
$query->addTag('translatable');
- $query->addTag('term_access');
+ $query->addTag('taxonomy_term_access');
// Do not select already entered terms.
if (!empty($tags_typed)) {
diff --git a/sites/all/modules/contrib/views/views/includes/analyze.inc b/sites/all/modules/contrib/views/views/includes/analyze.inc
index 68ee334..5dd58de 100644
--- a/sites/all/modules/contrib/views/views/includes/analyze.inc
+++ b/sites/all/modules/contrib/views/views/includes/analyze.inc
@@ -16,8 +16,8 @@
* Analyze a review and return the results.
*
* @return
- * An array of analyze results organized into arrays keyed by 'ok',
- * 'warning' and 'error'.
+ * An array of analyze results organized into arrays keyed by 'ok', 'warning'
+ * and 'error'.
*/
function views_analyze_view(&$view) {
$view->init_display();
@@ -79,12 +79,12 @@ function views_analyze_format_result($view, $messages) {
* that may be broken unless the user knows what he or she is doing,
* and 'error' for items that are definitely broken are much more useful.
*
- * @param $messages
+ * @param string $message
* The message to report.
- * @param $type
+ * @param string $type
* The type of message. This should be "ok", "warning" or "error". Other
- * values can be used but how they are treated by the output routine
- * is undefined.
+ * values can be used but how they are treated by the output routine is
+ * undefined.
*/
function views_ui_analysis($message, $type = 'error') {
return array('message' => $message, 'type' => $type);
@@ -99,7 +99,7 @@ function views_ui_analysis($message, $type = 'error') {
*/
function views_ui_views_analyze($view) {
$ret = array();
- // Check for something other than the default display:
+ // Check for something other than the default display.
if (count($view->display) < 2) {
$ret[] = views_ui_analysis(t('This view has only a default display and therefore will not be placed anywhere on your site; perhaps you want to add a page or a block display.'), 'warning');
}
diff --git a/sites/all/modules/contrib/views/views/includes/base.inc b/sites/all/modules/contrib/views/views/includes/base.inc
index 2d2ceb5..b2c8622 100644
--- a/sites/all/modules/contrib/views/views/includes/base.inc
+++ b/sites/all/modules/contrib/views/views/includes/base.inc
@@ -2,34 +2,36 @@
/**
* @file
- * Provides the basic object definitions used by plugins and handlers.
+ * Definition of views_object.
*/
/**
- * Basic definition for many views objects.
+ * Provides the basic object definitions used by plugins and handlers.
*/
class views_object {
+
/**
* Except for displays, options for the object will be held here.
*/
- var $options = array();
+ public $options = array();
/**
* The top object of a view.
*
* @var view
*/
- var $view = NULL;
+ public $view = NULL;
/**
- * Handler's definition
+ * Handler's definition.
*
* @var array
*/
- var $definition;
+ public $definition;
/**
* Information about options for all kinds of purposes will be held here.
+ *
* @code
* 'option_name' => array(
* - 'default' => default value,
@@ -52,35 +54,69 @@ class views_object {
* @see views_object::export_option_always()
* @see views_object::unpack_translatable()
*/
- function option_definition() { return array(); }
+ public function option_definition() {
+ return array();
+ }
/**
- * Views handlers use a special construct function so that we can more
- * easily construct them with variable arguments.
+ * Collect this handler's option definition and alter them, ready for use.
+ *
+ * @return array
+ * Returns the options of this handler/plugin after allowing for alters.
+ *
+ * @see hook_views_plugin_option_definition_alter()
+ * @see hook_views_handler_option_definition_alter()
*/
- function construct() { $this->set_default_options(); }
+ function altered_option_definition() {
+ $definition = $this->option_definition();
+ if (!empty($this->is_plugin)) {
+ // Trigger hook_views_plugin_option_definition_alter().
+ drupal_alter('views_plugin_option_definition', $definition, $this);
+ }
+ else {
+ // Trigger hook_views_handler_option_definition_alter().
+ drupal_alter('views_handler_option_definition', $definition, $this);
+ }
+ return $definition;
+ }
/**
- * Set default options on this object. Called by the constructor in a
- * complex chain to deal with backward compatibility.
+ * Views handlers use a special construct function.
+ *
+ * Allows it to more easily construct them with variable arguments.
+ */
+ public function construct() {
+ $this->set_default_options();
+ }
+
+ /**
+ * Set default options on this object.
+ *
+ * Called by the constructor in a complex chain to deal with backward
+ * compatibility.
*
* @deprecated since views2
*/
- function options(&$options) { }
+ public function options(&$options) {
+ }
/**
* Set default options.
- * For backward compatibility, it sends the options array; this is a
- * feature that will likely disappear at some point.
+ *
+ * For backward compatibility, it sends the options array; this is a feature
+ * that will likely disappear at some point.
*/
- function set_default_options() {
- $this->_set_option_defaults($this->options, $this->option_definition());
+ public function set_default_options() {
+ $this->_set_option_defaults($this->options, $this->altered_option_definition());
// Retained for complex defaults plus backward compatibility.
$this->options($this->options);
}
- function _set_option_defaults(&$storage, $options, $level = 0) {
+ /**
+ *
+ */
+ public function _set_option_defaults(&$storage, $options, $level = 0) {
foreach ($options as $option => $definition) {
if (isset($definition['contains']) && is_array($definition['contains'])) {
$storage[$option] = array();
@@ -96,28 +132,28 @@ class views_object {
}
/**
- * Unpack options over our existing defaults, drilling down into arrays
- * so that defaults don't get totally blown away.
+ * Unpack options over our existing defaults, drilling down into arrays so
+ * that defaults don't get totally blown away.
*/
- function unpack_options(&$storage, $options, $definition = NULL, $all = TRUE, $check = TRUE, $localization_keys = array()) {
+ public function unpack_options(&$storage, $options, $definition = NULL, $all = TRUE, $check = TRUE, $localization_keys = array()) {
if ($check && !is_array($options)) {
return;
}
if (!isset($definition)) {
- $definition = $this->option_definition();
+ $definition = $this->altered_option_definition();
}
if (!empty($this->view)) {
// Ensure we have a localization plugin.
$this->view->init_localization();
- // Set up default localization keys. Handlers and such set this for us
+ // Set up default localization keys. Handlers and such set this for us.
if (empty($localization_keys) && isset($this->localization_keys)) {
$localization_keys = $this->localization_keys;
}
// but plugins don't because there isn't a common init() these days.
- else if (!empty($this->is_plugin) && empty($localization_keys)) {
+ elseif (!empty($this->is_plugin) && empty($localization_keys)) {
if ($this->plugin_type != 'display') {
$localization_keys = array($this->view->current_display);
$localization_keys[] = $this->plugin_type;
@@ -146,9 +182,9 @@ class views_object {
$this->unpack_options($storage[$key], $value, isset($definition[$key]['contains']) ? $definition[$key]['contains'] : array(), $all, FALSE, array_merge($localization_keys, array($key)));
}
- // Don't localize strings during editing. When editing, we need to work with
- // the original data, not the translated version.
- else if (empty($this->view->editing) && !empty($definition[$key]['translatable']) && !empty($value) || !empty($definition['contains'][$key]['translatable']) && !empty($value)) {
+ // Don't localize strings during editing. When editing, we need to work
+ // with the original data, not the translated version.
+ elseif (empty($this->view->editing) && !empty($definition[$key]['translatable']) && !empty($value) || !empty($definition['contains'][$key]['translatable']) && !empty($value)) {
if (!empty($this->view) && $this->view->is_translatable()) {
// Allow other modules to make changes to the string before it's
// sent for translation.
@@ -170,7 +206,7 @@ class views_object {
$storage[$key] = t($value);
}
}
- else if ($all || !empty($definition[$key])) {
+ elseif ($all || !empty($definition[$key])) {
$storage[$key] = $value;
}
}
@@ -179,14 +215,17 @@ class views_object {
/**
* Let the handler know what its full definition is.
*/
- function set_definition($definition) {
+ public function set_definition($definition) {
$this->definition = $definition;
if (isset($definition['field'])) {
$this->real_field = $definition['field'];
}
}
- function destroy() {
+ /**
+ * Destructor.
+ */
+ public function destroy() {
if (isset($this->view)) {
unset($this->view);
}
@@ -200,16 +239,22 @@ class views_object {
}
}
- function export_options($indent, $prefix) {
+ /**
+ *
+ */
+ public function export_options($indent, $prefix) {
$output = '';
- foreach ($this->option_definition() as $option => $definition) {
+ foreach ($this->altered_option_definition() as $option => $definition) {
$output .= $this->export_option($indent, $prefix, $this->options, $option, $definition, array());
}
return $output;
}
- function export_option($indent, $prefix, $storage, $option, $definition, $parents) {
+ /**
+ *
+ */
+ public function export_option($indent, $prefix, $storage, $option, $definition, $parents) {
// Do not export options for which we have no settings.
if (!isset($storage[$option])) {
return;
@@ -220,7 +265,7 @@ class views_object {
return;
}
- // Special handling for some items
+ // Special handling for some items.
if (method_exists($this, $definition['export'])) {
return $this->{$definition['export']}($indent, $prefix, $storage, $option, $definition, $parents);
}
@@ -262,7 +307,7 @@ class views_object {
/**
* Always exports the option, regardless of the default value.
*/
- function export_option_always($indent, $prefix, $storage, $option, $definition, $parents) {
+ public function export_option_always($indent, $prefix, $storage, $option, $definition, $parents) {
// If there is no default, the option will always be exported.
unset($definition['default']);
// Unset our export method to prevent recursion.
@@ -273,8 +318,8 @@ class views_object {
/**
* Unpacks each handler to store translatable texts.
*/
- function unpack_translatables(&$translatable, $parents = array()) {
- foreach ($this->option_definition() as $option => $definition) {
+ public function unpack_translatables(&$translatable, $parents = array()) {
+ foreach ($this->altered_option_definition() as $option => $definition) {
$this->unpack_translatable($translatable, $this->options, $option, $definition, $parents, array());
}
}
@@ -284,21 +329,21 @@ class views_object {
*
* This function run's through all suboptions recursive.
*
- * @param $translatable
+ * @param array $translatable
* Stores all available translatable items.
- * @param $storage
- * @param $option
- * @param $definition
- * @param $parents
- * @param $keys
+ * @param array $storage
+ * @param string $option
+ * @param string $definition
+ * @param array $parents
+ * @param array $keys
*/
- function unpack_translatable(&$translatable, $storage, $option, $definition, $parents, $keys = array()) {
+ public function unpack_translatable(&$translatable, $storage, $option, $definition, $parents, $keys = array()) {
// Do not export options for which we have no settings.
if (!isset($storage[$option])) {
return;
}
- // Special handling for some items
+ // Special handling for some items.
if (isset($definition['unpack_translatable']) && method_exists($this, $definition['unpack_translatable'])) {
return $this->{$definition['unpack_translatable']}($translatable, $storage, $option, $definition, $parents, $keys);
}
@@ -328,8 +373,8 @@ class views_object {
if (is_array($value)) {
$this->unpack_translatable($translatable, $options, $key, $definition, $parents, $translation_keys);
}
- else if (!empty($definition[$key]['translatable']) && !empty($value)) {
- // Build source data and add to the array
+ elseif (!empty($definition[$key]['translatable']) && !empty($value)) {
+ // Build source data and add to the array.
$format = NULL;
if (isset($definition['format_key']) && isset($options[$definition['format_key']])) {
$format = $options[$definition['format_key']];
@@ -342,9 +387,9 @@ class views_object {
}
}
}
- else if (!empty($definition['translatable']) && !empty($options)) {
+ elseif (!empty($definition['translatable']) && !empty($options)) {
$value = $options;
- // Build source data and add to the array
+ // Build source data and add to the array.
$format = NULL;
if (isset($definition['format_key']) && isset($storage[$definition['format_key']])) {
$format = $storage[$definition['format_key']];
@@ -356,4 +401,5 @@ class views_object {
);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/includes/cache.inc b/sites/all/modules/contrib/views/views/includes/cache.inc
index b74752f..6ef36df 100644
--- a/sites/all/modules/contrib/views/views/includes/cache.inc
+++ b/sites/all/modules/contrib/views/views/includes/cache.inc
@@ -6,11 +6,13 @@
*/
/**
- * Fetch Views' data from the cache
+ * Fetch Views' data from the cache.
*
- * @param $move
- * Under certain circumstances it makes sense to not get the moved table, but the old one.
- * One example is views_get_handler.
+ * @param string $table
+ * @param bool $move
+ * Under certain circumstances it makes sense to not get the moved table, but
+ * the old one. One example is views_get_handler.
+ * @param bool $reset
*/
function _views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
$cache = &drupal_static(__FUNCTION__ . '_cache');
@@ -67,12 +69,11 @@ function _views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
}
else {
if (!$fully_loaded) {
- $data = views_cache_get('views_data', TRUE);
- if (!empty($data->data)) {
+ if ($data = views_cache_get('views_data', TRUE)) {
$cache = $data->data;
}
-
- if (empty($cache)) {
+ else {
+ // No cache entry, rebuild.
$cache = _views_fetch_data_build();
}
$fully_loaded = TRUE;
@@ -101,7 +102,8 @@ function _views_fetch_data_build() {
}
/**
- * Links tables having an 'entity type' specified to the respective generic entity-type tables.
+ * Links tables having an 'entity type' specified to the respective generic
+ * entity-type tables.
*/
function _views_data_process_entity_types(&$data) {
foreach ($data as $table_name => $table_info) {
@@ -127,19 +129,32 @@ function _views_data_process_entity_types(&$data) {
function _views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
static $cache = NULL;
if (!isset($cache) || $reset) {
- $start = microtime(TRUE);
- views_include('plugins');
- views_include_handlers();
-
- $cache = views_discover_plugins();
-
+ // Load necessary code once.
+ if (!isset($cache)) {
+ views_include('plugins');
+ views_include_handlers();
+ }
+ // Because plugin data contains translated strings, and as such can be
+ // expensive to build, the results are cached per language.
+ global $language;
+ $cache_key = 'views:plugin_data:' . $language->language;
+ if (!$reset) {
+ if ($cache = cache_get($cache_key)) {
+ $cache = $cache->data;
+ }
+ }
+ // If not available in the cache, build it and cache it.
+ if (!$cache || $reset) {
+ $cache = views_discover_plugins();
+ cache_set($cache_key, $cache);
+ }
}
if (!$type && !$plugin) {
return $cache;
}
elseif (!$plugin) {
- // Not in the if above so the else below won't run
+ // Not in the if above so the else below won't run.
if (isset($cache[$type])) {
return $cache[$type];
}
@@ -157,12 +172,13 @@ function _views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE)
*
* This is just a convenience wrapper around cache_set().
*
- * @param $cid
+ * @param string $cid
* The cache ID of the data to store.
- * @param $data
- * The data to store in the cache. Complex data types will be automatically serialized before insertion.
- * Strings will be stored as plain text and not serialized.
- * @param $use_language
+ * @param mixed $data
+ * The data to store in the cache. Complex data types will be automatically
+ * serialized before insertion. Strings will be stored as plain text and not
+ * serialized.
+ * @param bool $use_language
* If TRUE, the data will be cached specific to the currently active language.
*/
function views_cache_set($cid, $data, $use_language = FALSE) {
@@ -186,7 +202,8 @@ function views_cache_set($cid, $data, $use_language = FALSE) {
* @param int $cid
* The cache ID of the data to retrieve.
* @param bool $use_language
- * If TRUE, the data will be requested specific to the currently active language.
+ * If TRUE, the data will be requested specific to the currently active
+ * language.
*
* @return stdClass|bool
* The cache or FALSE on failure.
diff --git a/sites/all/modules/contrib/views/views/includes/handlers.inc b/sites/all/modules/contrib/views/views/includes/handlers.inc
index 4346133..d631c05 100644
--- a/sites/all/modules/contrib/views/views/includes/handlers.inc
+++ b/sites/all/modules/contrib/views/views/includes/handlers.inc
@@ -6,13 +6,13 @@
*/
/**
- * Instantiate and construct a new handler
+ * Instantiate and construct a new handler.
*/
function _views_create_handler($definition, $type = 'handler', $handler_type = NULL) {
-// debug('Instantiating handler ' . $definition['handler']);
+ // debug('Instantiating handler ' . $definition['handler']);
if (empty($definition['handler'])) {
vpr('_views_create_handler - type: @type - failed: handler has not been provided.',
- array('@type' => isset($handler_type) ? ( $type . '(handler type: ' . $handler_type . ')' ) : $type)
+ array('@type' => isset($handler_type) ? ($type . '(handler type: ' . $handler_type . ')') : $type)
);
return;
}
@@ -24,8 +24,8 @@ function _views_create_handler($definition, $type = 'handler', $handler_type = N
'_views_create_handler - loading override handler @type failed: class @override_handler could not be loaded. ' .
'Verify the class file has been registered in the corresponding .info-file (files[]).',
array(
- '@type' => isset($handler_type) ? ( $type . '(handler type: ' . $handler_type . ')' ) : $type,
- '@override_handler' => $definition['override handler']
+ '@type' => isset($handler_type) ? ($type . '(handler type: ' . $handler_type . ')') : $type,
+ '@override_handler' => $definition['override handler'],
)
);
return;
@@ -36,19 +36,19 @@ function _views_create_handler($definition, $type = 'handler', $handler_type = N
'_views_create_handler - loading handler @type failed: class @handler could not be loaded. ' .
'Verify the class file has been registered in the corresponding .info-file (files[]).',
array(
- '@type' => isset($handler_type) ? ( $type . '(handler type: ' . $handler_type . ')' ) : $type,
- '@handler' => $definition['handler']
+ '@type' => isset($handler_type) ? ($type . '(handler type: ' . $handler_type . ')') : $type,
+ '@handler' => $definition['handler'],
)
);
return;
}
- if (!empty($definition['override handler'])) {
- $handler = new $definition['override handler'];
- }
- else {
- $handler = new $definition['handler'];
- }
+ if (!empty($definition['override handler'])) {
+ $handler = new $definition['override handler'];
+ }
+ else {
+ $handler = new $definition['handler'];
+ }
$handler->set_definition($definition);
if ($type == 'handler') {
@@ -73,11 +73,11 @@ function _views_create_handler($definition, $type = 'handler', $handler_type = N
function _views_prepare_handler($definition, $data, $field, $type) {
foreach (array('group', 'title', 'title short', 'help', 'real field') as $key) {
if (!isset($definition[$key])) {
- // First check the field level
+ // First check the field level.
if (!empty($data[$field][$key])) {
$definition[$key] = $data[$field][$key];
}
- // Then if that doesn't work, check the table level
+ // Then if that doesn't work, check the table level.
elseif (!empty($data['table'][$key])) {
$definition[$key] = $data['table'][$key];
}
@@ -88,7 +88,7 @@ function _views_prepare_handler($definition, $data, $field, $type) {
}
/**
- * Fetch a handler to join one table to a primary table from the data cache
+ * Fetch a handler to join one table to a primary table from the data cache.
*/
function views_get_table_join($table, $base_table) {
$data = views_fetch_data($table);
@@ -101,7 +101,7 @@ function views_get_table_join($table, $base_table) {
$handler = new views_join();
}
- // Fill in some easy defaults
+ // Fill in some easy defaults.
$handler->definition = $h;
if (empty($handler->definition['table'])) {
$handler->definition['table'] = $table;
@@ -121,7 +121,7 @@ function views_get_table_join($table, $base_table) {
return $handler;
}
- // DEBUG -- identify missing handlers
+ // DEBUG -- identify missing handlers.
vpr("Missing join: @table @base_table", array('@table' => $table, '@base_table' => $base_table));
}
@@ -147,29 +147,30 @@ function views_get_table_join($table, $base_table) {
* field/handler is or does.
* - access callback: If this field should have access control, this could
* be a function to use. 'user_access' is a common
- * function to use here. If not specified, no access
+ * public function to use here. If not specified, no access
* control is provided.
* - access arguments: An array of arguments for the access callback.
*/
class views_handler extends views_object {
+
/**
* The top object of a view.
*
* @var view
*/
- var $view = NULL;
+ public $view = NULL;
/**
- * Where the $query object will reside:
+ * Where the $query object will reside:.
*
* @var views_plugin_query
*/
- var $query = NULL;
+ public $query = NULL;
/**
* The type of the handler, for example filter/footer/field.
*/
- var $handler_type = NULL;
+ public $handler_type = NULL;
/**
* The alias of the table of this handler which is used in the query.
@@ -180,28 +181,28 @@ class views_handler extends views_object {
* The actual field in the database table, maybe different
* on other kind of query plugins/special handlers.
*/
- var $real_field;
+ public $real_field;
/**
* The relationship used for this field.
*/
- var $relationship = NULL;
+ public $relationship = NULL;
/**
- * init the handler with necessary data.
- * @param $view
+ * Init the handler with necessary data.
+ *
+ * @param view $view
* The $view object this handler is attached to.
- * @param $options
+ * @param array $options
* The item from the database; the actual contents of this will vary
* based upon the type of handler.
*/
- function init(&$view, &$options) {
+ public function init(&$view, &$options) {
$this->view = &$view;
$display_id = $this->view->current_display;
// Check to see if this handler type is defaulted. Note that
// we have to do a lookup because the type is singular but the
// option is stored as the plural.
-
// If the 'moved to' keyword moved our handler, let's fix that now.
if (isset($this->actual_table)) {
$options['table'] = $this->actual_table;
@@ -224,7 +225,7 @@ class views_handler extends views_object {
$display_id,
$this->handler_type,
$options['table'],
- $options['id']
+ $options['id'],
);
$this->unpack_options($this->options, $options);
@@ -252,7 +253,10 @@ class views_handler extends views_object {
$this->query = &$view->query;
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['id'] = array('default' => '');
@@ -268,7 +272,7 @@ class views_handler extends views_object {
/**
* Return a string representing this handler's name in the UI.
*/
- function ui_name($short = FALSE) {
+ public function ui_name($short = FALSE) {
if (!empty($this->options['ui_name'])) {
$title = check_plain($this->options['ui_name']);
return $title;
@@ -284,7 +288,7 @@ class views_handler extends views_object {
* non-standard fields. Because this takes an argument, fields
* overriding this can just call return parent::get_field($formula)
*/
- function get_field($field = NULL) {
+ public function get_field($field = NULL) {
if (!isset($field)) {
if (!empty($this->formula)) {
$field = $this->get_formula();
@@ -294,7 +298,8 @@ class views_handler extends views_object {
}
}
- // If grouping, check to see if the aggregation method needs to modify the field.
+ // If grouping, check to see if the aggregation method needs to modify the
+ // field.
if ($this->view->display_handler->use_group_by()) {
$this->view->init_query();
if ($this->query) {
@@ -311,25 +316,28 @@ class views_handler extends views_object {
/**
* Sanitize the value for output.
*
- * @param $value
+ * @param string $value
* The value being rendered.
- * @param $type
+ * @param string $type
* The type of sanitization needed. If not provided, check_plain() is used.
*
* @return string
* Returns the safe value.
*/
- function sanitize_value($value, $type = NULL) {
+ public function sanitize_value($value, $type = NULL) {
switch ($type) {
case 'xss':
$value = filter_xss($value);
break;
+
case 'xss_admin':
$value = filter_xss_admin($value);
break;
+
case 'url':
$value = check_url($value);
break;
+
default:
$value = check_plain($value);
break;
@@ -340,9 +348,9 @@ class views_handler extends views_object {
/**
* Transform a string by a certain method.
*
- * @param $string
+ * @param string $string
* The input you want to transform.
- * @param $option
+ * @param array $option
* How do you want to transform it, possible values:
* - upper: Uppercase the string.
* - lower: lowercase the string.
@@ -352,7 +360,7 @@ class views_handler extends views_object {
* @return string
* The transformed string.
*/
- function case_transform($string, $option) {
+ public function case_transform($string, $option) {
global $multibyte;
switch ($option) {
@@ -360,10 +368,13 @@ class views_handler extends views_object {
return $string;
case 'upper':
return drupal_strtoupper($string);
+
case 'lower':
return drupal_strtolower($string);
+
case 'ucfirst':
return drupal_strtoupper(drupal_substr($string, 0, 1)) . drupal_substr($string, 1);
+
case 'ucwords':
if ($multibyte == UNICODE_MULTIBYTE) {
return mb_convert_case($string, MB_CASE_TITLE);
@@ -377,12 +388,13 @@ class views_handler extends views_object {
/**
* Validate the options form.
*/
- function options_validate(&$form, &$form_state) { }
+ public function options_validate(&$form, &$form_state) {
+ }
/**
* Build the options form.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
// Some form elements belong in a fieldset for presentation, but can't
// be moved into one because of the form_state['values'] hierarchy. Those
// elements can add a #fieldset => 'fieldset_name' property, and they'll
@@ -414,18 +426,20 @@ class views_handler extends views_object {
* 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) {
+ }
/**
* Provides the handler some groupby.
*/
- function use_group_by() {
+ public function use_group_by() {
return TRUE;
}
+
/**
* Provide a form for aggregation settings.
*/
- function groupby_form(&$form, &$form_state) {
+ public function groupby_form(&$form, &$form_state) {
$view = &$form_state['view'];
$display_id = $form_state['display_id'];
$types = views_object_types();
@@ -456,7 +470,7 @@ class views_handler extends views_object {
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function groupby_form_submit(&$form, &$form_state) {
+ public function groupby_form_submit(&$form, &$form_state) {
$item =& $form_state['handler']->options;
$item['group_type'] = $form_state['values']['options']['group_type'];
@@ -466,85 +480,102 @@ class views_handler extends views_object {
* If a handler has 'extra options' it will get a little settings widget and
* another form called extra_options.
*/
- function has_extra_options() { return FALSE; }
+ public function has_extra_options() {
+ return FALSE;
+ }
/**
* Provide defaults for the handler.
*/
- function extra_options(&$option) { }
+ public function extra_options(&$option) {
+ }
/**
* Provide a form for setting options.
*/
- function extra_options_form(&$form, &$form_state) { }
+ public function extra_options_form(&$form, &$form_state) {
+ }
/**
* Validate the options form.
*/
- function extra_options_validate($form, &$form_state) { }
+ public function extra_options_validate($form, &$form_state) {
+ }
/**
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function extra_options_submit($form, &$form_state) { }
+ public function extra_options_submit($form, &$form_state) {
+ }
/**
* Determine if a handler can be exposed.
*/
- function can_expose() { return FALSE; }
+ public function can_expose() {
+ return FALSE;
+ }
/**
* Set new exposed option defaults when exposed setting is flipped
* on.
*/
- function expose_options() { }
+ public function expose_options() {
+ }
/**
* Get information about the exposed form for the form renderer.
*/
- function exposed_info() { }
+ public function exposed_info() {
+ }
/**
- * Render our chunk of the exposed handler form when selecting
+ * Render our chunk of the exposed handler form when selecting.
*/
- function exposed_form(&$form, &$form_state) { }
+ public function exposed_form(&$form, &$form_state) {
+ }
/**
- * Validate the exposed handler form
+ * Validate the exposed handler form.
*/
- function exposed_validate(&$form, &$form_state) { }
+ public function exposed_validate(&$form, &$form_state) {
+ }
/**
- * Submit the exposed handler form
+ * Submit the exposed handler form.
*/
- function exposed_submit(&$form, &$form_state) { }
+ public function exposed_submit(&$form, &$form_state) {
+ }
/**
* Form for exposed handler options.
*/
- function expose_form(&$form, &$form_state) { }
+ public function expose_form(&$form, &$form_state) {
+ }
/**
* Validate the options form.
*/
- function expose_validate($form, &$form_state) { }
+ public function expose_validate($form, &$form_state) {
+ }
/**
* Perform any necessary changes to the form exposes prior to storage.
* There is no need for this function to actually store the data.
*/
- function expose_submit($form, &$form_state) { }
+ public function expose_submit($form, &$form_state) {
+ }
/**
* Shortcut to display the expose/hide button.
*/
- function show_expose_button(&$form, &$form_state) { }
+ public function show_expose_button(&$form, &$form_state) {
+ }
/**
* Shortcut to display the exposed options form.
*/
- function show_expose_form(&$form, &$form_state) {
+ public function show_expose_form(&$form, &$form_state) {
if (empty($this->options['exposed'])) {
return;
}
@@ -567,9 +598,9 @@ class views_handler extends views_object {
/**
* Check whether current user has access to this handler.
*
- * @return boolean
+ * @return bool
*/
- function access() {
+ public function access() {
if (isset($this->definition['access callback']) && function_exists($this->definition['access callback'])) {
if (isset($this->definition['access arguments']) && is_array($this->definition['access arguments'])) {
return call_user_func_array($this->definition['access callback'], $this->definition['access arguments']);
@@ -586,7 +617,8 @@ class views_handler extends views_object {
* This gives all the handlers some time to set up before any handler has
* been fully run.
*/
- function pre_query() { }
+ public function pre_query() {
+ }
/**
* Run after the view is executed, before the result is cached.
@@ -595,12 +627,13 @@ class views_handler extends views_object {
* used so that handlers that pull up secondary data can put it in the
* $values so that the raw data can be utilized externally.
*/
- function post_execute(&$values) { }
+ public function post_execute(&$values) {
+ }
/**
* Provides a unique placeholders for handlers.
*/
- function placeholder() {
+ public function placeholder() {
return $this->query->placeholder($this->options['table'] . '_' . $this->options['field']);
}
@@ -608,7 +641,7 @@ class views_handler extends views_object {
* Called just prior to query(), this lets a handler set up any relationship
* it needs.
*/
- function set_relationship() {
+ public function set_relationship() {
// Ensure this gets set to something.
$this->relationship = NULL;
@@ -638,7 +671,7 @@ class views_handler extends views_object {
* Ensure the main table for this handler is in the query. This is used
* a lot.
*/
- function ensure_my_table() {
+ public function ensure_my_table() {
if (!isset($this->table_alias)) {
if (!method_exists($this->query, 'ensure_table')) {
vpr(t('Ensure my table called but query has no ensure_table method.'));
@@ -650,48 +683,59 @@ class views_handler extends views_object {
}
/**
- * Provide text for the administrative summary
+ * Provide text for the administrative summary.
*/
- function admin_summary() { }
+ public function admin_summary() {
+ }
/**
* Determine if the argument needs a style plugin.
*
- * @return TRUE/FALSE
+ * @return bool
*/
- function needs_style_plugin() { return FALSE; }
+ public function needs_style_plugin() {
+ return FALSE;
+ }
/**
* Determine if this item is 'exposed', meaning it provides form elements
* to let users modify the view.
*
- * @return TRUE/FALSE
+ * @return bool
*/
- function is_exposed() {
+ public function is_exposed() {
return !empty($this->options['exposed']);
}
/**
* Returns TRUE if the exposed filter works like a grouped filter.
*/
- function is_a_group() { return FALSE; }
+ public function is_a_group() {
+ return FALSE;
+ }
/**
* Define if the exposed input has to be submitted multiple times.
* This is TRUE when exposed filters grouped are using checkboxes as
* widgets.
*/
- function multiple_exposed_input() { return FALSE; }
+ public function multiple_exposed_input() {
+ return FALSE;
+ }
/**
* Take input from exposed handlers and assign to this handler, if necessary.
*/
- function accept_exposed_input($input) { return TRUE; }
+ public function accept_exposed_input($input) {
+ return TRUE;
+ }
/**
* If set to remember exposed input in the session, store it there.
*/
- function store_exposed_input($input, $status) { return TRUE; }
+ public function store_exposed_input($input, $status) {
+ return TRUE;
+ }
/**
* Get the join object that should be used for this handler.
@@ -700,9 +744,9 @@ class views_handler extends views_object {
* getting the join if it is necessary to make some changes to it, such
* as adding an 'extra'.
*/
- function get_join() {
+ public function get_join() {
// get the join from this table that links back to the base table.
- // Determine the primary table to seek
+ // Determine the primary table to seek.
if (empty($this->query->relationships[$this->relationship])) {
$base_table = $this->query->base_table;
}
@@ -724,16 +768,25 @@ class views_handler extends views_object {
*
* @see views_handler::options_validate()
*
- * @return
- * Empty array if the handler is valid; an array of error strings if it is not.
+ * @return array
+ * Empty array if the handler is valid; an array of error strings if it is
+ * not.
*/
- function validate() { return array(); }
+ public function validate() {
+ return array();
+ }
/**
- * Determine if the handler is considered 'broken', meaning it's a
- * a placeholder used when a handler can't be found.
+ * Determine if the handler is considered 'broken'.
+ *
+ * Generally only returns TRUE if the handler can't be found.
+ *
+ * @return bool
+ * The handler could not be loaded.
*/
- function broken() { }
+ public function broken() {
+ }
+
}
/**
@@ -748,9 +801,9 @@ class views_handler extends views_object {
* definition terms:
* - numeric: If true, treat this field as numeric, using %d instead of %s in
* queries.
- *
*/
class views_many_to_one_helper {
+
/**
* Contains possible existing placeholders used by the query.
*
@@ -758,15 +811,24 @@ class views_many_to_one_helper {
*/
public $placeholders = array();
- function views_many_to_one_helper(&$handler) {
+ /**
+ * {@inheritdoc}
+ */
+ public function __construct(&$handler) {
$this->handler = &$handler;
}
+ /**
+ * {@inheritdoc}
+ */
static function option_definition(&$options) {
$options['reduce_duplicates'] = array('default' => FALSE, 'bool' => TRUE);
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['reduce_duplicates'] = array(
'#type' => 'checkbox',
'#title' => t('Reduce duplicates'),
@@ -777,11 +839,12 @@ class views_many_to_one_helper {
}
/**
- * Sometimes the handler might want us to use some kind of formula, so give
- * it that option. If it wants us to do this, it must set $helper->formula = TRUE
- * and implement handler->get_formula();
+ * Provide an option to use a formula.
+ *
+ * If it wants us to do this, it must set $helper->formula = TRUE and
+ * implement handler->get_formula();.
*/
- function get_field() {
+ public function get_field() {
if (!empty($this->formula)) {
return $this->handler->get_formula();
}
@@ -793,12 +856,12 @@ class views_many_to_one_helper {
/**
* Add a table to the query.
*
- * This is an advanced concept; not only does it add a new instance of the table,
- * but it follows the relationship path all the way down to the relationship
- * link point and adds *that* as a new relationship and then adds the table to
- * the relationship, if necessary.
+ * This is an advanced concept; not only does it add a new instance of the
+ * table, but it follows the relationship path all the way down to the
+ * relationship link point and adds *that* as a new relationship and then adds
+ * the table to the relationship, if necessary.
*/
- function add_table($join = NULL, $alias = NULL) {
+ public function add_table($join = NULL, $alias = NULL) {
// This is used for lookups in the many_to_one table.
$field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
@@ -806,11 +869,11 @@ class views_many_to_one_helper {
$join = $this->get_join();
}
- // See if there's a chain between us and the base relationship. If so, we need
- // to create a new relationship to use.
+ // See if there's a chain between us and the base relationship. If so, we
+ // need to create a new relationship to use.
$relationship = $this->handler->relationship;
- // Determine the primary table to seek
+ // Determine the primary table to seek.
if (empty($this->handler->query->relationships[$relationship])) {
$base_table = $this->handler->query->base_table;
}
@@ -821,7 +884,7 @@ class views_many_to_one_helper {
// Cycle through the joins. This isn't as error-safe as the normal
// ensure_path logic. Perhaps it should be.
$r_join = clone $join;
- while ($r_join->left_table != $base_table) {
+ while (!empty($r_join) && $r_join->left_table != $base_table) {
$r_join = views_get_table_join($r_join->left_table, $base_table);
}
// If we found that there are tables in between, add the relationship.
@@ -844,19 +907,24 @@ class views_many_to_one_helper {
return $alias;
}
- function get_join() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_join() {
return $this->handler->get_join();
}
/**
- * Provide the proper join for summary queries. This is important in part because
- * it will cooperate with other arguments if possible.
+ * Provide the proper join for summary queries.
+ *
+ * This is important in part because it will cooperate with other arguments if
+ * possible.
*/
- function summary_join() {
+ public function summary_join() {
$field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
$join = $this->get_join();
- // shortcuts
+ // Shortcuts.
$options = $this->handler->options;
$view = &$this->handler->view;
$query = &$this->handler->query;
@@ -887,16 +955,17 @@ class views_many_to_one_helper {
/**
* Override ensure_my_table so we can control how this joins in.
+ *
* The operator actually has influence over joining.
*/
- function ensure_my_table() {
+ public function ensure_my_table() {
if (!isset($this->handler->table_alias)) {
// Case 1: Operator is an 'or' and we're not reducing duplicates.
- // We hence get the absolute simplest:
+ // We hence get the absolute simplest.
$field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
if ($this->handler->operator == 'or' && empty($this->handler->options['reduce_duplicates'])) {
if (empty($this->handler->options['add_table']) && empty($this->handler->view->many_to_one_tables[$field])) {
- // query optimization, INNER joins are slightly faster, so use them
+ // Query optimization, INNER joins are slightly faster, so use them
// when we know we can.
$join = $this->get_join();
if (isset($join)) {
@@ -927,58 +996,39 @@ class views_many_to_one_helper {
return $this->handler->table_alias;
}
- // Case 2: it's an 'and' or an 'or'.
+ // Case 2: it's anything but an 'or'.
// We do one join per selected value.
- if ($this->handler->operator != 'not') {
- // Clone the join for each table:
- $this->handler->table_aliases = array();
- foreach ($this->handler->value as $value) {
- $join = $this->get_join();
- if ($this->handler->operator == 'and') {
- $join->type = 'INNER';
- }
- $join->extra = array(
- array(
- 'field' => $this->handler->real_field,
- 'value' => $value,
- 'numeric' => !empty($this->handler->definition['numeric']),
- ),
- );
- // The table alias needs to be unique to this value across the
- // multiple times the filter or argument is called by the view.
- if (!isset($this->handler->view->many_to_one_aliases[$field][$value])) {
- if (!isset($this->handler->view->many_to_one_count[$this->handler->table])) {
- $this->handler->view->many_to_one_count[$this->handler->table] = 0;
- }
- $this->handler->view->many_to_one_aliases[$field][$value] = $this->handler->table . '_value_' . ($this->handler->view->many_to_one_count[$this->handler->table]++);
+ // Clone the join for each table:
+ $this->handler->table_aliases = array();
+ foreach ($this->handler->value as $value) {
+ $join = $this->get_join();
+ if ($this->handler->operator == 'and') {
+ $join->type = 'INNER';
+ }
+ if (empty($join->extra)) {
+ $join->extra = array();
+ }
+ $join->extra[] = array(
+ 'field' => $this->handler->real_field,
+ 'value' => $value,
+ 'numeric' => !empty($this->handler->definition['numeric']),
+ );
+ // The table alias needs to be unique to this value across the
+ // multiple times the filter or argument is called by the view.
+ if (!isset($this->handler->view->many_to_one_aliases[$field][$value])) {
+ if (!isset($this->handler->view->many_to_one_count[$this->handler->table])) {
+ $this->handler->view->many_to_one_count[$this->handler->table] = 0;
}
- $alias = $this->handler->table_aliases[$value] = $this->add_table($join, $this->handler->view->many_to_one_aliases[$field][$value]);
-
+ $this->handler->view->many_to_one_aliases[$field][$value] = $this->handler->table . '_value_' . ($this->handler->view->many_to_one_count[$this->handler->table]++);
+ $alias = $this->handler->table_aliases[$value] = $this->add_table($join,
+ $this->handler->view->many_to_one_aliases[$field][$value]);
// and set table_alias to the first of these.
if (empty($this->handler->table_alias)) {
$this->handler->table_alias = $alias;
}
}
}
- // Case 3: it's a 'not'.
- // We just do one join. We'll add a where clause during
- // the query phase to ensure that $table.$field IS NULL.
- else {
- $join = $this->get_join();
- $join->type = 'LEFT';
- $join->extra = array();
- $join->extra_type = 'OR';
- foreach ($this->handler->value as $value) {
- $join->extra[] = array(
- 'field' => $this->handler->real_field,
- 'value' => $value,
- 'numeric' => !empty($this->handler->definition['numeric']),
- );
- }
-
- $this->handler->table_alias = $this->add_table($join);
- }
}
return $this->handler->table_alias;
}
@@ -986,17 +1036,20 @@ class views_many_to_one_helper {
/**
* Provides a unique placeholders for handlers.
*/
- function placeholder() {
+ public function placeholder() {
return $this->handler->query->placeholder($this->handler->options['table'] . '_' . $this->handler->options['field']);
}
- function add_filter() {
+ /**
+ *
+ */
+ public function add_filter() {
if (empty($this->handler->value)) {
return;
}
$this->handler->ensure_my_table();
- // Shorten some variables:
+ // Shorten some variables.
$field = $this->get_field();
$options = $this->handler->options;
$operator = $this->handler->operator;
@@ -1006,15 +1059,10 @@ class views_many_to_one_helper {
$options['group'] = 0;
}
- // add_condition determines whether a single expression is enough(FALSE) or the
- // conditions should be added via an db_or()/db_and() (TRUE).
+ // Determine whether a single expression is enough(FALSE) or the conditions
+ // should be added via an db_or()/db_and() (TRUE).
$add_condition = TRUE;
- if ($operator == 'not') {
- $value = NULL;
- $operator = 'IS NULL';
- $add_condition = FALSE;
- }
- elseif ($operator == 'or' && empty($options['reduce_duplicates'])) {
+ if ($operator == 'or' && empty($options['reduce_duplicates'])) {
if (count($value) > 1) {
$operator = 'IN';
}
@@ -1048,25 +1096,28 @@ class views_many_to_one_helper {
$field = $this->handler->real_field;
$clause = $operator == 'or' ? db_or() : db_and();
foreach ($this->handler->table_aliases as $value => $alias) {
+ if ($operator == 'not') {
+ $value = NULL;
+ }
$clause->condition("$alias.$field", $value);
}
- // implode on either AND or OR.
+ // Implode on either AND or OR.
$this->handler->query->add_where($options['group'], $clause);
}
}
+
}
/**
* Break x,y,z and x+y+z into an array. Works for strings.
*
- * @param $str
+ * @param string $str
* The string to parse.
- * @param $object
- * The object to use as a base. If not specified one will
- * be created.
+ * @param object $object
+ * The object to use as a base. If not specified one will be created.
*
- * @return $object
+ * @return object
* An object containing
* - operator: Either 'and' or 'or'
* - value: An array of numeric values.
@@ -1076,7 +1127,7 @@ function views_break_phrase_string($str, &$handler = NULL) {
$handler = new stdClass();
}
- // Set up defaults:
+ // Set up defaults.
if (!isset($handler->value)) {
$handler->value = array();
}
@@ -1121,11 +1172,10 @@ function views_break_phrase_string($str, &$handler = NULL) {
/**
* Break x,y,z and x+y+z into an array. Numeric only.
*
- * @param $str
+ * @param string $str
* The string to parse.
- * @param $handler
- * The handler object to use as a base. If not specified one will
- * be created.
+ * @param object $handler
+ * The handler object to use as a base. If not specified one will be created.
*
* @return $handler
* The new handler object.
@@ -1135,8 +1185,7 @@ function views_break_phrase($str, &$handler = NULL) {
$handler = new stdClass();
}
- // Set up defaults:
-
+ // Set up defaults.
if (!isset($handler->value)) {
$handler->value = array();
}
@@ -1174,8 +1223,7 @@ function views_break_phrase($str, &$handler = NULL) {
}
// --------------------------------------------------------------------------
-// Date helper functions
-
+// Date helper functions.
/**
* Figure out what timezone we're in; needed for some date manipulations.
*/
@@ -1188,7 +1236,7 @@ function views_get_timezone() {
$timezone = variable_get('date_default_timezone', 0);
}
- // set up the database timezone
+ // Set up the database timezone.
$db_type = Database::getConnection()->databaseType();
if (in_array($db_type, array('mysql', 'pgsql'))) {
$offset = '+00:00';
@@ -1201,7 +1249,7 @@ function views_get_timezone() {
db_query("SET @@session.time_zone = '$offset'");
}
- $already_set = true;
+ $already_set = TRUE;
}
}
@@ -1211,15 +1259,16 @@ function views_get_timezone() {
/**
* Helper function to create cross-database SQL dates.
*
- * @param $field
+ * @param string $field
* The real table and field name, like 'tablename.fieldname'.
- * @param $field_type
+ * @param string $field_type
* The type of date field, 'int' or 'datetime'.
- * @param $set_offset
+ * @param string $set_offset
* The name of a field that holds the timezone offset or a fixed timezone
* offset value. If not provided, the normal Drupal timezone handling
* will be used, i.e. $set_offset = 0 will make no timezone adjustment.
- * @return
+ *
+ * @return string
* An appropriate SQL string for the db type and field type.
*/
function views_date_sql_field($field, $field_type = 'int', $set_offset = NULL) {
@@ -1237,6 +1286,7 @@ function views_date_sql_field($field, $field_type = 'int', $set_offset = NULL) {
case 'int':
$field = "DATE_ADD('19700101', INTERVAL $field SECOND)";
break;
+
case 'datetime':
break;
}
@@ -1244,11 +1294,13 @@ function views_date_sql_field($field, $field_type = 'int', $set_offset = NULL) {
$field = "($field + INTERVAL $offset_seconds SECOND)";
}
return $field;
+
case 'pgsql':
switch ($field_type) {
case 'int':
$field = "TO_TIMESTAMP($field)";
break;
+
case 'datetime':
break;
}
@@ -1256,6 +1308,7 @@ function views_date_sql_field($field, $field_type = 'int', $set_offset = NULL) {
$field = "($field + INTERVAL '$offset_seconds SECONDS')";
}
return $field;
+
case 'sqlite':
if (!empty($offset)) {
$field = "($field + '$offset_seconds')";
@@ -1267,17 +1320,18 @@ function views_date_sql_field($field, $field_type = 'int', $set_offset = NULL) {
/**
* Helper function to create cross-database SQL date formatting.
*
- * @param $format
+ * @param string $format
* A format string for the result, like 'Y-m-d H:i:s'.
- * @param $field
+ * @param string $field
* The real table and field name, like 'tablename.fieldname'.
- * @param $field_type
+ * @param string $field_type
* The type of date field, 'int' or 'datetime'.
- * @param $set_offset
+ * @param string $set_offset
* The name of a field that holds the timezone offset or a fixed timezone
- * offset value. If not provided, the normal Drupal timezone handling
- * will be used, i.e. $set_offset = 0 will make no timezone adjustment.
- * @return
+ * offset value. If not provided, the normal Drupal timezone handling will be
+ * used, i.e. $set_offset = 0 will make no timezone adjustment.
+ *
+ * @return string
* An appropriate SQL string for the db type and field type.
*/
function views_date_sql_format($format, $field, $field_type = 'int', $set_offset = NULL) {
@@ -1302,48 +1356,69 @@ function views_date_sql_format($format, $field, $field_type = 'int', $set_offset
'i' => '%i',
's' => '%s',
'A' => '%p',
- );
+ );
$format = strtr($format, $replace);
return "DATE_FORMAT($field, '$format')";
+
case 'pgsql':
$replace = array(
'Y' => 'YYYY',
'y' => 'YY',
'M' => 'Mon',
'm' => 'MM',
- 'n' => 'MM', // no format for Numeric representation of a month, without leading zeros
+ // No format for Numeric representation of a month, without leading
+ // zeros.
+ 'n' => 'MM',
'F' => 'Month',
'D' => 'Dy',
'd' => 'DD',
'l' => 'Day',
- 'j' => 'DD', // no format for Day of the month without leading zeros
+ // No format for Day of the month without leading zeros.
+ 'j' => 'DD',
'W' => 'WW',
'H' => 'HH24',
'h' => 'HH12',
'i' => 'MI',
's' => 'SS',
'A' => 'AM',
- );
+ );
$format = strtr($format, $replace);
return "TO_CHAR($field, '$format')";
+
case 'sqlite':
$replace = array(
- 'Y' => '%Y', // 4 digit year number
- 'y' => '%Y', // no format for 2 digit year number
- 'M' => '%m', // no format for 3 letter month name
- 'm' => '%m', // month number with leading zeros
- 'n' => '%m', // no format for month number without leading zeros
- 'F' => '%m', // no format for full month name
- 'D' => '%d', // no format for 3 letter day name
- 'd' => '%d', // day of month number with leading zeros
- 'l' => '%d', // no format for full day name
- 'j' => '%d', // no format for day of month number without leading zeros
- 'W' => '%W', // ISO week number
- 'H' => '%H', // 24 hour hour with leading zeros
- 'h' => '%H', // no format for 12 hour hour with leading zeros
- 'i' => '%M', // minutes with leading zeros
- 's' => '%S', // seconds with leading zeros
- 'A' => '', // no format for AM/PM
+ // 4 digit year number.
+ 'Y' => '%Y',
+ // No format for 2 digit year number.
+ 'y' => '%Y',
+ // No format for 3 letter month name.
+ 'M' => '%m',
+ // Month number with leading zeros.
+ 'm' => '%m',
+ // No format for month number without leading zeros.
+ 'n' => '%m',
+ // No format for full month name.
+ 'F' => '%m',
+ // No format for 3 letter day name.
+ 'D' => '%d',
+ // Day of month number with leading zeros.
+ 'd' => '%d',
+ // No format for full day name.
+ 'l' => '%d',
+ // No format for day of month number without leading zeros.
+ 'j' => '%d',
+ // ISO week number.
+ 'W' => '%W',
+ // 24 hour hour with leading zeros.
+ 'H' => '%H',
+ // No format for 12 hour hour with leading zeros.
+ 'h' => '%H',
+ // Minutes with leading zeros.
+ 'i' => '%M',
+ // Seconds with leading zeros.
+ 's' => '%S',
+ // No format for AM/PM.
+ 'A' => '',
);
$format = strtr($format, $replace);
return "strftime('$format', $field, 'unixepoch')";
@@ -1353,17 +1428,18 @@ function views_date_sql_format($format, $field, $field_type = 'int', $set_offset
/**
* Helper function to create cross-database SQL date extraction.
*
- * @param $extract_type
+ * @param string $extract_type
* The type of value to extract from the date, like 'MONTH'.
- * @param $field
+ * @param string $field
* The real table and field name, like 'tablename.fieldname'.
- * @param $field_type
+ * @param string $field_type
* The type of date field, 'int' or 'datetime'.
- * @param $set_offset
+ * @param string $set_offset
* The name of a field that holds the timezone offset or a fixed timezone
* offset value. If not provided, the normal Drupal timezone handling
* will be used, i.e. $set_offset = 0 will make no timezone adjustment.
- * @return
+ *
+ * @return string
* An appropriate SQL string for the db type and field type.
*/
function views_date_sql_extract($extract_type, $field, $field_type = 'int', $set_offset = NULL) {
@@ -1371,46 +1447,58 @@ function views_date_sql_extract($extract_type, $field, $field_type = 'int', $set
$field = views_date_sql_field($field, $field_type, $set_offset);
// Note there is no space after FROM to avoid db_rewrite problems
- // see http://drupal.org/node/79904.
+ // @see http://drupal.org/node/79904.
switch ($extract_type) {
- case('DATE'):
- return $field;
- case('YEAR'):
- return "EXTRACT(YEAR FROM($field))";
- case('MONTH'):
- return "EXTRACT(MONTH FROM($field))";
- case('DAY'):
- return "EXTRACT(DAY FROM($field))";
- case('HOUR'):
- return "EXTRACT(HOUR FROM($field))";
- case('MINUTE'):
- return "EXTRACT(MINUTE FROM($field))";
- case('SECOND'):
- return "EXTRACT(SECOND FROM($field))";
- case('WEEK'): // ISO week number for date
- switch ($db_type) {
- case('mysql'):
- // WEEK using arg 3 in mysql should return the same value as postgres EXTRACT
- return "WEEK($field, 3)";
- case('pgsql'):
- return "EXTRACT(WEEK FROM($field))";
- }
- case('DOW'):
- switch ($db_type) {
- case('mysql'):
- // mysql returns 1 for Sunday through 7 for Saturday
- // php date functions and postgres use 0 for Sunday and 6 for Saturday
- return "INTEGER(DAYOFWEEK($field) - 1)";
- case('pgsql'):
- return "EXTRACT(DOW FROM($field))";
- }
- case('DOY'):
- switch ($db_type) {
- case('mysql'):
- return "DAYOFYEAR($field)";
- case('pgsql'):
- return "EXTRACT(DOY FROM($field))";
- }
+ case('DATE'):
+ return $field;
+
+ case('YEAR'):
+ return "EXTRACT(YEAR FROM($field))";
+
+ case('MONTH'):
+ return "EXTRACT(MONTH FROM($field))";
+
+ case('DAY'):
+ return "EXTRACT(DAY FROM($field))";
+
+ case('HOUR'):
+ return "EXTRACT(HOUR FROM($field))";
+
+ case('MINUTE'):
+ return "EXTRACT(MINUTE FROM($field))";
+
+ case('SECOND'):
+ return "EXTRACT(SECOND FROM($field))";
+
+ case('WEEK'):
+ // ISO week number for date.
+ switch ($db_type) {
+ case('mysql'):
+ // WEEK using arg 3 in mysql should return the same value as postgres
+ // EXTRACT.
+ return "WEEK($field, 3)";
+
+ case('pgsql'):
+ return "EXTRACT(WEEK FROM($field))";
+ }
+ case('DOW'):
+ switch ($db_type) {
+ // MySQL returns 1 for Sunday through 7 for Saturday.
+ case('mysql'):
+ return "INTEGER(DAYOFWEEK($field) - 1)";
+
+ // PHP date functions and postgres use 0 for Sunday and 6 for Saturday.
+ case('pgsql'):
+ return "EXTRACT(DOW FROM($field))";
+ }
+ case('DOY'):
+ switch ($db_type) {
+ case('mysql'):
+ return "DAYOFYEAR($field)";
+
+ case('pgsql'):
+ return "EXTRACT(DOY FROM($field))";
+ }
}
}
@@ -1430,11 +1518,11 @@ function views_date_sql_extract($extract_type, $field, $field_type = 'int', $set
* // PHP 4 doesn't call constructors of the base class automatically from a
* // constructor of a derived class. It is your responsibility to propagate
* // the call to constructors upstream where appropriate.
- * function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
+ * public function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
* parent::construct($table, $left_table, $left_field, $field, $extra, $type);
* }
*
- * function build_join($select_query, $table, $view_query) {
+ * public function build_join($select_query, $table, $view_query) {
* $this->extra = 'foo.bar = baz.boing';
* parent::build_join($select_query, $table, $view_query);
* }
@@ -1451,7 +1539,7 @@ function views_date_sql_extract($extract_type, $field, $field_type = 'int', $set
*
* Extensions of this class can be used to create more interesting joins.
*
- * join definition
+ * 'join' definition:
* - table: table to join (right table)
* - field: field to join on (right field)
* - left_table: The table we join to
@@ -1464,25 +1552,27 @@ function views_date_sql_extract($extract_type, $field, $field_type = 'int', $set
* alias. If you use realtime joins, it works better.
* - - field: Field or formula
* in formulas we can reference the right table by using %alias
- * @see SelectQueryInterface::addJoin()
- * - - operator: defaults to =
- * - - value: Must be set. If an array, operator will be defaulted to IN.
- * - - numeric: If true, the value will not be surrounded in quotes.
- * - - extra type: How all the extras will be combined. Either AND or OR. Defaults to AND.
+ *
+ * @see SelectQueryInterface::addJoin()
+ * - operator: Defaults to =.
+ * - value: Must be set. If an array, operator will be defaulted to IN.
+ * - numeric: If true, the value will not be surrounded in quotes.
+ * - extra type: How all the extras will be combined. Either AND or OR.
+ * Defaults to AND.
*/
class views_join {
- var $table = NULL;
- var $left_table = NULL;
- var $left_field = NULL;
- var $field = NULL;
- var $extra = NULL;
- var $type = NULL;
- var $definition = array();
+ public $table = NULL;
+ public $left_table = NULL;
+ public $left_field = NULL;
+ public $field = NULL;
+ public $extra = NULL;
+ public $type = NULL;
+ public $definition = array();
/**
* Construct the views_join object.
*/
- function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
+ public function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
$this->extra_type = 'AND';
if (!empty($table)) {
$this->table = $table;
@@ -1493,8 +1583,8 @@ class views_join {
$this->type = strtoupper($type);
}
elseif (!empty($this->definition)) {
- // if no arguments, construct from definition.
- // These four must exist or it will throw notices.
+ // If no arguments, construct from definition. These four must exist or
+ // it will throw notices.
$this->table = $this->definition['table'];
$this->left_table = $this->definition['left_table'];
$this->left_field = $this->definition['left_field'];
@@ -1515,14 +1605,14 @@ class views_join {
*
* When possible, try to use table alias instead of table names.
*
- * @param $select_query
- * An implementation of SelectQueryInterface.
- * @param $table
+ * @param SelectQueryInterface $select_query
+ * An Implements SelectQueryInterface.
+ * @param string $table
* The base table to join.
- * @param $view_query
- * The source query, implementation of views_plugin_query.
+ * @param views_plugin_query $view_query
+ * The source query, Implements views_plugin_query.
*/
- function build_join($select_query, $table, $view_query) {
+ public function build_join($select_query, $table, $view_query) {
if (empty($this->definition['table formula'])) {
$right_table = $this->table;
}
@@ -1535,7 +1625,8 @@ class views_join {
$left_field = "$left[alias].$this->left_field";
}
else {
- // This can be used if left_field is a formula or something. It should be used only *very* rarely.
+ // This can be used if left_field is a formula or something. It should be
+ // used only *very* rarely.
$left_field = $this->left_field;
}
@@ -1544,12 +1635,18 @@ class views_join {
// Tack on the extra.
if (isset($this->extra)) {
- if (is_array($this->extra)) {
- $extras = array();
- foreach ($this->extra as $info) {
+ // If extra has been provided as string instead of an array, convert it
+ // to an array.
+ if (!is_array($this->extra)) {
+ $this->extra = array($this->extra);
+ }
+
+ $extras = array();
+ foreach ($this->extra as $info) {
+ if (is_array($info)) {
$extra = '';
- // Figure out the table name. Remember, only use aliases provided
- // if at all possible.
+ // Figure out the table name. Remember, only use aliases provided if
+ // at all possible.
$join_table = '';
if (!array_key_exists('table', $info)) {
$join_table = $table['alias'] . '.';
@@ -1566,7 +1663,7 @@ class views_join {
}
// Convert a single-valued array of values to the single-value case,
- // and transform from IN() notation to = notation
+ // and transform from IN() notation to = notation.
if (is_array($info['value']) && count($info['value']) == 1) {
if (empty($info['operator'])) {
$operator = '=';
@@ -1596,18 +1693,18 @@ class views_join {
}
$extras[] = "$join_table$info[field] $operator $placeholder";
}
-
- if ($extras) {
- if (count($extras) == 1) {
- $condition .= ' AND ' . array_shift($extras);
- }
- else {
- $condition .= ' AND (' . implode(' ' . $this->extra_type . ' ', $extras) . ')';
- }
+ elseif (is_string($info)) {
+ $extras[] = $info;
}
}
- elseif ($this->extra && is_string($this->extra)) {
- $condition .= " AND ($this->extra)";
+
+ if ($extras) {
+ if (count($extras) == 1) {
+ $condition .= ' AND (' . array_shift($extras) . ')';
+ }
+ else {
+ $condition .= ' AND (' . implode(' ' . $this->extra_type . ' ', $extras) . ')';
+ }
}
}
@@ -1617,15 +1714,20 @@ class views_join {
/**
* Join handler for relationships that join with a subquery as the left field.
- * eg:
+ *
+ * For example:
* LEFT JOIN node node_term_data ON ([YOUR SUBQUERY HERE]) = node_term_data.nid
*
- * join definition
- * same as views_join class above, except:
+ * 'join' definition:
+ * Same as views_join class above, except:
* - left_query: The subquery to use in the left side of the join clause.
*/
class views_join_subquery extends views_join {
- function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
parent::construct($table, $left_table, $left_field, $field, $extra, $type);
$this->left_query = $this->definition['left_query'];
}
@@ -1633,16 +1735,14 @@ class views_join_subquery extends views_join {
/**
* Build the SQL for the join this object represents.
*
- * @param $select_query
- * An implementation of SelectQueryInterface.
- * @param $table
+ * @param object $select_query
+ * An Implements SelectQueryInterface.
+ * @param string $table
* The base table to join.
- * @param $view_query
- * The source query, implementation of views_plugin_query.
- * @return
- *
+ * @param array $view_query
+ * The source query, Implements views_plugin_query.
*/
- function build_join($select_query, $table, $view_query) {
+ public function build_join($select_query, $table, $view_query) {
if (empty($this->definition['table formula'])) {
$right_table = "{" . $this->table . "}";
}
@@ -1655,14 +1755,22 @@ class views_join_subquery extends views_join {
$arguments = array();
// Tack on the extra.
- // This is just copied verbatim from the parent class, which itself has a bug: http://drupal.org/node/1118100
+ // This is just copied verbatim from the parent class, which itself has a
+ // bug.
+ // @see http://drupal.org/node/1118100
if (isset($this->extra)) {
- if (is_array($this->extra)) {
- $extras = array();
- foreach ($this->extra as $info) {
+ // If extra has been provided as string instead of an array, convert it
+ // to an array.
+ if (!is_array($this->extra)) {
+ $this->extra = array($this->extra);
+ }
+
+ $extras = array();
+ foreach ($this->extra as $info) {
+ if (is_array($info)) {
$extra = '';
- // Figure out the table name. Remember, only use aliases provided
- // if at all possible.
+ // Figure out the table name. Remember, only use aliases provided if
+ // at all possible.
$join_table = '';
if (!array_key_exists('table', $info)) {
$join_table = $table['alias'] . '.';
@@ -1688,18 +1796,18 @@ class views_join_subquery extends views_join {
$extras[] = "$join_table$info[field] $operator $placeholder";
$arguments[$placeholder] = $info['value'];
}
-
- if ($extras) {
- if (count($extras) == 1) {
- $condition .= ' AND ' . array_shift($extras);
- }
- else {
- $condition .= ' AND (' . implode(' ' . $this->extra_type . ' ', $extras) . ')';
- }
+ elseif (is_string($info)) {
+ $extras[] = $info;
}
}
- elseif ($this->extra && is_string($this->extra)) {
- $condition .= " AND ($this->extra)";
+
+ if ($extras) {
+ if (count($extras) == 1) {
+ $condition .= ' AND (' . array_shift($extras) . ')';
+ }
+ else {
+ $condition .= ' AND (' . implode(' ' . $this->extra_type . ' ', $extras) . ')';
+ }
}
}
diff --git a/sites/all/modules/contrib/views/views/includes/plugins.inc b/sites/all/modules/contrib/views/views/includes/plugins.inc
index bf09573..8308e01 100644
--- a/sites/all/modules/contrib/views/views/includes/plugins.inc
+++ b/sites/all/modules/contrib/views/views/includes/plugins.inc
@@ -5,7 +5,7 @@
* Built in plugins for Views output handling.
*/
-// @todo: Remove this once update.php can use the registry
+// @todo Remove this once update.php can use the registry.
views_include('base');
/**
@@ -101,7 +101,7 @@ function views_views_plugins() {
'title' => t('Empty display extender'),
'help' => t('Default settings for this view.'),
'handler' => 'views_plugin_display_extender',
- // You can force the plugin to be enabled
+ // You can force the plugin to be enabled.
'enabled' => FALSE,
'no ui' => TRUE,
),
@@ -160,7 +160,8 @@ function views_views_plugins() {
'help' => t('Displays the default summary as a list.'),
'handler' => 'views_plugin_style_summary',
'theme' => 'views_view_summary',
- 'type' => 'summary', // only shows up as a summary style
+ 'type' => 'summary',
+ // only shows up as a summary style.
'uses options' => TRUE,
'help topic' => 'style-summary',
),
@@ -169,7 +170,8 @@ function views_views_plugins() {
'help' => t('Displays the summary unformatted, with option for one after another or inline.'),
'handler' => 'views_plugin_style_summary_unformatted',
'theme' => 'views_view_summary_unformatted',
- 'type' => 'summary', // only shows up as a summary style
+ 'type' => 'summary',
+ // only shows up as a summary style.
'uses options' => TRUE,
'help topic' => 'style-summary-unformatted',
),
@@ -266,7 +268,7 @@ function views_views_plugins() {
'views_query' => array(
'title' => t('SQL Query'),
'help' => t('Query will be generated and run using the Drupal database API.'),
- 'handler' => 'views_plugin_query_default'
+ 'handler' => 'views_plugin_query_default',
),
),
'cache' => array(
@@ -356,7 +358,7 @@ function views_views_plugins() {
'handler' => 'views_plugin_localization',
'parent' => '',
),
- 'none' => array(
+ 'none' => array(
'title' => t('None'),
'help' => t('Do not pass admin strings for translation.'),
'handler' => 'views_plugin_localization_none',
@@ -381,7 +383,8 @@ function views_views_plugins() {
'help' => t('Puts all of the results into a select box and allows the user to go to a different page based upon the results.'),
'handler' => 'views_plugin_style_summary_jump_menu',
'theme' => 'views_view_summary_jump_menu',
- 'type' => 'summary', // only shows up as a summary style
+ 'type' => 'summary',
+ // only shows up as a summary style.
'uses options' => TRUE,
'help topic' => 'style-summary-jump-menu',
);
@@ -408,7 +411,7 @@ function views_views_plugins() {
*/
function views_discover_plugins() {
$cache = array('display' => array(), 'style' => array(), 'row' => array(), 'argument default' => array(), 'argument validator' => array(), 'access' => array(), 'cache' => array(), 'exposed_form' => array());
- // Get plugins from all mdoules.
+ // Get plugins from all modules.
foreach (module_implements('views_plugins') as $module) {
$function = $module . '_views_plugins';
$result = $function();
@@ -417,7 +420,7 @@ function views_discover_plugins() {
}
$module_dir = isset($result['module']) ? $result['module'] : $module;
- // Setup automatic path/file finding for theme registration
+ // Setup automatic path/file finding for theme registration.
if ($module_dir == 'views') {
$theme_path = drupal_get_path('module', $module_dir) . '/theme';
$theme_file = 'theme.inc';
@@ -452,7 +455,7 @@ function views_discover_plugins() {
// Set the internal name to be able to read it out later.
$def['name'] = $plugin;
- // merge the new data in
+ // merge the new data in.
$cache[$type][$plugin] = $def;
}
}
@@ -467,29 +470,30 @@ function views_discover_plugins() {
* Abstract base class to provide interface common to all plugins.
*/
class views_plugin extends views_object {
+
/**
* The top object of a view.
*
* @var view
*/
- var $view = NULL;
+ public $view = NULL;
/**
* The current used views display.
*
* @var views_display
*/
- var $display = NULL;
+ public $display = NULL;
/**
* The plugin type of this plugin, for example style or query.
*/
- var $plugin_type = NULL;
+ public $plugin_type = NULL;
/**
* The plugin name of this plugin, for example table or full.
*/
- var $plugin_name = NULL;
+ public $plugin_name = NULL;
/**
* Init will be called after construct, when the plugin is attached to a
@@ -499,7 +503,7 @@ class views_plugin extends views_object {
/**
* Provide a form to edit options for this plugin.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
// Some form elements belong in a fieldset for presentation, but can't
// be moved into one because of the form_state['values'] hierarchy. Those
// elements can add a #fieldset => 'fieldset_name' property, and they'll
@@ -510,29 +514,35 @@ class views_plugin extends views_object {
/**
* Validate the options form.
*/
- function options_validate(&$form, &$form_state) { }
+ public function options_validate(&$form, &$form_state) {
+ }
/**
* Handle any special handling on the validate form.
*/
- function options_submit(&$form, &$form_state) { }
+ public function options_submit(&$form, &$form_state) {
+ }
/**
* Add anything to the query that we might need to.
*/
- function query() { }
+ public function query() {
+ }
/**
* Provide a full list of possible theme templates used by this style.
*/
- function theme_functions() {
+ public function theme_functions() {
+ if (empty($this->definition['theme'])) {
+ $this->definition['theme'] = 'views_view';
+ }
return views_theme_functions($this->definition['theme'], $this->view, $this->display);
}
/**
- * Provide a list of additional theme functions for the theme information page
+ * Provide a list of additional theme functions for the theme info page.
*/
- function additional_theme_functions() {
+ public function additional_theme_functions() {
$funcs = array();
if (!empty($this->definition['additional themes'])) {
foreach ($this->definition['additional themes'] as $theme => $type) {
@@ -545,16 +555,18 @@ class views_plugin extends views_object {
/**
* Validate that the plugin is correct and can be saved.
*
- * @return
+ * @return array
* An array of error strings to tell the user what is wrong with this
* plugin.
*/
- function validate() { return array(); }
+ public function validate() {
+ return array();
+ }
/**
* Returns the summary of the settings in the display.
*/
- function summary_title() {
+ public function summary_title() {
return t('Settings');
}
/**
@@ -562,12 +574,13 @@ class views_plugin extends views_object {
*
* This appears on the ui beside each plugin and beside the settings link.
*/
- function plugin_title() {
+ public function plugin_title() {
if (isset($this->definition['short title'])) {
return check_plain($this->definition['short title']);
}
return check_plain($this->definition['title']);
}
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/includes/view.inc b/sites/all/modules/contrib/views/views/includes/view.inc
index d082a0b..ae6df4c 100644
--- a/sites/all/modules/contrib/views/views/includes/view.inc
+++ b/sites/all/modules/contrib/views/views/includes/view.inc
@@ -2,10 +2,6 @@
/**
* @file
- * Provides the view object type and associated methods.
- */
-
-/**
* @defgroup views_objects Objects that represent a View or part of a view
* @{
* These objects are the core of Views do the bulk of the direction and
@@ -13,34 +9,48 @@
*/
/**
- * An object to contain all of the data to generate a view, plus the member
- * functions to build the view query, execute the query and render the output.
+ * An object to contain all of the data to generate a view.
+ *
+ * Also includes the member functions to build the view query, execute the
+ * query and render the output.
*/
class view extends views_db_object {
- var $db_table = 'views_view';
- var $base_table = 'node';
- var $base_field = 'nid';
+
+ /**
+ *
+ */
+ public $db_table = 'views_view';
+
+ /**
+ *
+ */
+ public $base_table = 'node';
+
+ /**
+ *
+ */
+ public $base_field = 'nid';
/**
* The name of the view.
*
* @var string
*/
- var $name = "";
+ public $name = "";
/**
* The id of the view, which is used only for views in the database.
*
* @var number
*/
- var $vid;
+ public $vid;
/**
* The description of the view, which is used only in the interface.
*
* @var string
*/
- var $description;
+ public $description;
/**
* The "tags" of a view.
@@ -49,20 +59,21 @@ class view extends views_db_object {
*
* @var string
*/
- var $tag;
+ public $tag;
/**
* The human readable name of the view.
*
* @var string
*/
- var $human_name;
+ public $human_name;
/**
* The core version the view was created for.
+ *
* @var int
*/
- var $core;
+ public $core;
/**
* The views-api version this view was created by.
@@ -71,26 +82,47 @@ class view extends views_db_object {
*
* @var string
*/
- var $api_version;
+ public $api_version;
/**
* Is the view disabled.
*
- * This value is used for exported view, to provide some default views which aren't enabled.
+ * This value is used for exported view, to provide some default views which
+ * aren't enabled.
*
* @var bool
*/
- var $disabled;
+ public $disabled;
- // State variables
- var $built = FALSE;
- var $executed = FALSE;
- var $editing = FALSE;
+ /**
+ * State variable.
+ */
+ public $built = FALSE;
- var $args = array();
- var $build_info = array();
+ /**
+ * State variable.
+ */
+ public $executed = FALSE;
- var $use_ajax = FALSE;
+ /**
+ * State variable.
+ */
+ public $editing = FALSE;
+
+ /**
+ *
+ */
+ public $args = array();
+
+ /**
+ *
+ */
+ public $build_info = array();
+
+ /**
+ *
+ */
+ public $use_ajax = FALSE;
/**
* Where the results of a query will go.
@@ -99,107 +131,107 @@ class view extends views_db_object {
*
* @var array
*/
- var $result = array();
+ public $result = array();
// May be used to override the current pager info.
- var $current_page = NULL;
- var $items_per_page = NULL;
- var $offset = NULL;
- var $total_rows = NULL;
+ public $current_page = NULL;
+ public $items_per_page = NULL;
+ public $offset = NULL;
+ public $total_rows = NULL;
- // Places to put attached renderings:
- var $attachment_before = '';
- var $attachment_after = '';
+ // Places to put attached renderings.
+ public $attachment_before = '';
+ public $attachment_after = '';
- // Exposed widget input
- var $exposed_data = array();
- var $exposed_input = array();
+ // Exposed widget input.
+ public $exposed_data = array();
+ public $exposed_input = array();
// Exposed widget input directly from the $form_state['values'].
- var $exposed_raw_input = array();
+ public $exposed_raw_input = array();
// Used to store views that were previously running if we recurse.
- var $old_view = array();
+ public $old_view = array();
// To avoid recursion in views embedded into areas.
- var $parent_views = array();
+ public $parent_views = array();
// Is the current stored view runned as an attachment to another view.
- var $is_attachment = NULL;
+ public $is_attachment = NULL;
// Stores the next steps of form items to handle.
// It's an array of stack items, which contain the form id, the type of form,
// the view, the display and some additional arguments.
// @see views_ui_add_form_to_stack()
// var $stack;
-
/**
* Identifier of the current display.
*
* @var string
*/
- var $current_display;
+ public $current_display;
/**
- * Where the $query object will reside:
+ * Where the $query object will reside:.
*
* @var views_plugin_query
*/
- var $query = NULL;
+ public $query = NULL;
- /**
+ /**
* The current used display plugin.
*
* @var views_plugin_display
*/
- var $display_handler;
+ public $display_handler;
/**
* Stores all display handlers of this view.
*
* @var array[views_display]
*/
- var $display;
+ public $display;
/**
* The current used style plugin.
*
* @var views_plugin_style
*/
- var $style_plugin;
+ public $style_plugin;
/**
* Stored the changed options of the style plugin.
*
* @deprecated Better use $view->style_plugin->options
+ *
* @var array
*/
- var $style_options;
+ public $style_options;
/**
* Stores the current active row while rendering.
*
* @var int
*/
- var $row_index;
+ public $row_index;
- /**
+ /**
* Allow to override the url of the current view.
*
* @var string
*/
- var $override_url = NULL;
+ public $override_url = NULL;
/**
* Allow to override the path used for generated urls.
*
* @var string
*/
- var $override_path = NULL;
+ public $override_path = NULL;
/**
* Allow to override the used database which is used for this query.
*/
- var $base_database = NULL;
+ public $base_database = NULL;
/**
* Here comes a list of the possible handler which are active on this view.
@@ -207,58 +239,67 @@ class view extends views_db_object {
/**
* Stores the field handlers which are initialized on this view.
+ *
* @var array[views_handler_field]
*/
- var $field;
+ public $field;
/**
* Stores the argument handlers which are initialized on this view.
+ *
* @var array[views_handler_argument]
*/
- var $argument;
+ public $argument;
/**
* Stores the sort handlers which are initialized on this view.
+ *
* @var array[views_handler_sort]
*/
- var $sort;
+ public $sort;
/**
* Stores the filter handlers which are initialized on this view.
+ *
* @var array[views_handler_filter]
*/
- var $filter;
+ public $filter;
/**
* Stores the relationship handlers which are initialized on this view.
+ *
* @var array[views_handler_relationship]
*/
- var $relationship;
+ public $relationship;
/**
* Stores the area handlers for the header which are initialized on this view.
+ *
* @var array[views_handler_area]
*/
- var $header;
+ public $header;
/**
* Stores the area handlers for the footer which are initialized on this view.
+ *
* @var array[views_handler_area]
*/
- var $footer;
+ public $footer;
/**
- * Stores the area handlers for the empty text which are initialized on this view.
+ * The area handlers for the empty text which are initialized on this view.
+ *
* @var array[views_handler_area]
*/
- var $empty;
+ public $empty;
/**
- * Constructor
+ * Standard PHP constructor.
*/
- function __construct() {
+ public function __construct() {
parent::init();
- // Make sure all of our sub objects are arrays.
+
+ // Make sure all of the sub objects are arrays.
foreach ($this->db_objects() as $object) {
$this->$object = array();
}
@@ -267,22 +308,21 @@ class view extends views_db_object {
/**
* Perform automatic updates when loading or importing a view.
*
- * Over time, some things about Views or Drupal data has changed.
- * this attempts to do some automatic updates that must happen
- * to ensure older views will at least try to work.
+ * Over time, some things about Views or Drupal data has changed. this
+ * attempts to do some automatic updates that must happen to ensure older
+ * views will at least try to work.
*/
- function update() {
+ public function update() {
// When views are converted automatically the base_table should be renamed
// to have a working query.
$this->base_table = views_move_table($this->base_table);
}
-
/**
* Returns a list of the sub-object types used by this view. These types are
* stored on the display, and are used in the build process.
*/
- function display_objects() {
+ public function display_objects() {
return array('argument', 'field', 'sort', 'filter', 'relationship', 'header', 'footer', 'empty');
}
@@ -298,27 +338,26 @@ class view extends views_db_object {
* Set the arguments that come to this view. Usually from the URL
* but possibly from elsewhere.
*/
- function set_arguments($args) {
+ public function set_arguments($args) {
$this->args = $args;
}
/**
* Change/Set the current page for the pager.
*/
- function set_current_page($page) {
+ public function set_current_page($page) {
$this->current_page = $page;
// If the pager is already initialized, pass it through to the pager.
if (!empty($this->query->pager)) {
return $this->query->pager->set_current_page($page);
}
-
}
/**
* Get the current page from the pager.
*/
- function get_current_page() {
+ public function get_current_page() {
// If the pager is already initialized, pass it through to the pager.
if (!empty($this->query->pager)) {
return $this->query->pager->get_current_page();
@@ -332,7 +371,7 @@ class view extends views_db_object {
/**
* Get the items per page from the pager.
*/
- function get_items_per_page() {
+ public function get_items_per_page() {
// If the pager is already initialized, pass it through to the pager.
if (!empty($this->query->pager)) {
return $this->query->pager->get_items_per_page();
@@ -346,7 +385,7 @@ class view extends views_db_object {
/**
* Set the items per page on the pager.
*/
- function set_items_per_page($items_per_page) {
+ public function set_items_per_page($items_per_page) {
$this->items_per_page = $items_per_page;
// If the pager is already initialized, pass it through to the pager.
@@ -358,7 +397,7 @@ class view extends views_db_object {
/**
* Get the pager offset from the pager.
*/
- function get_offset() {
+ public function get_offset() {
// If the pager is already initialized, pass it through to the pager.
if (!empty($this->query->pager)) {
return $this->query->pager->get_offset();
@@ -372,7 +411,7 @@ class view extends views_db_object {
/**
* Set the offset on the pager.
*/
- function set_offset($offset) {
+ public function set_offset($offset) {
$this->offset = $offset;
// If the pager is already initialized, pass it through to the pager.
@@ -384,7 +423,7 @@ class view extends views_db_object {
/**
* Determine if the pager actually uses a pager.
*/
- function use_pager() {
+ public function use_pager() {
if (!empty($this->query->pager)) {
return $this->query->pager->use_pager();
}
@@ -395,7 +434,7 @@ class view extends views_db_object {
* tablesorting and exposed filters will be fetched via an AJAX call
* rather than a page refresh.
*/
- function set_use_ajax($use_ajax) {
+ public function set_use_ajax($use_ajax) {
$this->use_ajax = $use_ajax;
}
@@ -403,26 +442,16 @@ class view extends views_db_object {
* Set the exposed filters input to an array. If unset they will be taken
* from $_GET when the time comes.
*/
- function set_exposed_input($filters) {
+ public function set_exposed_input($filters) {
$this->exposed_input = $filters;
}
/**
* Figure out what the exposed input for this view is.
*/
- function get_exposed_input() {
- // Fill our input either from $_GET or from something previously set on the
- // view.
+ public function get_exposed_input() {
if (empty($this->exposed_input)) {
- $this->exposed_input = $_GET;
- // unset items that are definitely not our input:
- foreach (array('page', 'q') as $key) {
- if (isset($this->exposed_input[$key])) {
- unset($this->exposed_input[$key]);
- }
- }
-
- // If we have no input at all, check for remembered input via session.
+ $this->exposed_input = array();
// If filters are not overridden, store the 'remember' settings on the
// default display. If they are, store them on this display. This way,
@@ -430,9 +459,17 @@ class view extends views_db_object {
// remember settings.
$display_id = ($this->display_handler->is_defaulted('filters')) ? 'default' : $this->current_display;
- if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->name][$display_id])) {
+ // Start with remembered input via session.
+ if (!empty($_SESSION['views'][$this->name][$display_id])) {
$this->exposed_input = $_SESSION['views'][$this->name][$display_id];
}
+
+ // Fetch exposed input values from $_GET. Overwrite if clashing.
+ foreach ($_GET as $key => $value) {
+ if (!in_array($key, array('page', 'q'))) {
+ $this->exposed_input[$key] = $value;
+ }
+ }
}
return $this->exposed_input;
@@ -441,13 +478,13 @@ class view extends views_db_object {
/**
* Set the display for this view and initialize the display handler.
*/
- function init_display($reset = FALSE) {
+ public function init_display($reset = FALSE) {
// The default display is always the first one in the list.
if (isset($this->current_display)) {
return TRUE;
}
- // Instantiate all displays
+ // Instantiate all displays.
foreach (array_keys($this->display) as $id) {
// Correct for shallow cloning
// Often we'll have a cloned view so we don't mess up each other's
@@ -483,10 +520,10 @@ class view extends views_db_object {
/**
* Get the first display that is accessible to the user.
*
- * @param $displays
+ * @param string|array $displays
* Either a single display id or an array of display ids.
*/
- function choose_display($displays) {
+ public function choose_display($displays) {
if (!is_array($displays)) {
return $displays;
}
@@ -505,10 +542,10 @@ class view extends views_db_object {
/**
* Set the display as current.
*
- * @param $display_id
+ * @param string $display_id
* The id of the display to mark as current.
*/
- function set_display($display_id = NULL) {
+ public function set_display($display_id = NULL) {
// If we have not already initialized the display, do so. But be careful.
if (empty($this->current_display)) {
$this->init_display();
@@ -544,7 +581,7 @@ class view extends views_db_object {
return FALSE;
}
- // Set a shortcut
+ // Set a shortcut.
$this->display_handler = &$this->display[$display_id]->handler;
return TRUE;
@@ -556,7 +593,7 @@ class view extends views_db_object {
* Note that arguments may have changed which style plugin we use, so
* check the view object first, then ask the display handler.
*/
- function init_style() {
+ public function init_style() {
if (isset($this->style_plugin)) {
return is_object($this->style_plugin);
}
@@ -572,7 +609,7 @@ class view extends views_db_object {
return FALSE;
}
- // init the new style handler with data.
+ // Init the new style handler with data..
$this->style_plugin->init($this, $this->display[$this->current_display], $this->style_options);
return TRUE;
}
@@ -583,7 +620,7 @@ class view extends views_db_object {
* This will try to add relationships automatically if it can, and will
* remove the handlers if it cannot.
*/
- function fix_missing_relationships() {
+ public function fix_missing_relationships() {
if (isset($this->relationships_fixed)) {
return;
}
@@ -667,7 +704,7 @@ class view extends views_db_object {
/**
* Acquire and attach all of the handlers.
*/
- function init_handlers() {
+ public function init_handlers() {
if (empty($this->inited)) {
$this->fix_missing_relationships();
foreach (views_object_types() as $key => $info) {
@@ -678,13 +715,17 @@ class view extends views_db_object {
}
/**
- * Initialize the pager
+ * Initialize the pager.
*
* Like style initialization, pager initialization is held until late
* to allow for overrides.
*/
- function init_pager() {
+ public function init_pager() {
if (empty($this->query->pager)) {
+ // If the query doesn't exist, initialize it.
+ if (empty($this->query)) {
+ $this->init_query();
+ }
$this->query->pager = $this->display_handler->get_plugin('pager');
if ($this->query->pager->use_pager()) {
@@ -707,7 +748,7 @@ class view extends views_db_object {
* Create a list of base tables eligible for this view. Used primarily
* for the UI. Display must be already initialized.
*/
- function get_base_tables() {
+ public function get_base_tables() {
$base_tables = array(
$this->base_table => TRUE,
'#global' => TRUE,
@@ -722,7 +763,7 @@ class view extends views_db_object {
/**
* Run the pre_query() on all active handlers.
*/
- function _pre_query() {
+ public function _pre_query() {
foreach (views_object_types() as $key => $info) {
$handlers = &$this->$key;
$position = 0;
@@ -737,7 +778,7 @@ class view extends views_db_object {
/**
* Run the post_execute() on all active handlers.
*/
- function _post_execute() {
+ public function _post_execute() {
foreach (views_object_types() as $key => $info) {
$handlers = &$this->$key;
foreach ($handlers as $id => $handler) {
@@ -749,12 +790,12 @@ class view extends views_db_object {
/**
* Attach all of the handlers for each type.
*
- * @param $key
- * One of 'argument', 'field', 'sort', 'filter', 'relationship'
- * @param $info
+ * @param string $key
+ * One of 'argument', 'field', 'sort', 'filter', 'relationship'.
+ * @param array $info
* The $info from views_object_types for this object.
*/
- function _init_handler($key, $info) {
+ public function _init_handler($key, $info) {
// Load the requested items from the display onto the object.
$this->$key = &$this->display_handler->get_handlers($key);
@@ -772,7 +813,7 @@ class view extends views_db_object {
/**
* Build all the arguments.
*/
- function _build_arguments() {
+ public function _build_arguments() {
// Initially, we want to build sorts and fields. This can change, though,
// if we get a summary view.
if (empty($this->argument)) {
@@ -812,11 +853,10 @@ class view extends views_db_object {
if (isset($arg)) {
$this->args[$position] = $arg;
}
- // remember that this argument was computed, not passed on the URL.
- $argument->is_default = TRUE;
}
- // Set the argument, which will also validate that the argument can be set.
+ // Set the argument, which will also validate that the argument can be
+ // set.
if (!$argument->set_argument($arg)) {
$status = $argument->validate_fail($arg);
break;
@@ -830,7 +870,7 @@ class view extends views_db_object {
$argument->query($this->display_handler->use_group_by());
}
- // Add this argument's substitution
+ // Add this argument's substitution.
$substitutions['%' . ($position + 1)] = $arg_title;
$substitutions['!' . ($position + 1)] = strip_tags(decode_entities($arg));
@@ -852,7 +892,7 @@ class view extends views_db_object {
// Allow the argument to muck with this breadcrumb.
$argument->set_breadcrumb($this->build_info['breadcrumb']);
- // Test to see if we should use this argument's title
+ // Test to see if we should use this argument's title.
if (!empty($argument->options['title_enable']) && !empty($argument->options['title'])) {
$title = $argument->options['title'];
}
@@ -865,7 +905,7 @@ class view extends views_db_object {
break;
}
- // Be safe with references and loops:
+ // Be safe with references and loops.
unset($argument);
}
@@ -883,7 +923,7 @@ class view extends views_db_object {
/**
* Do some common building initialization.
*/
- function init_query() {
+ public function init_query() {
if (!empty($this->query)) {
$class = get_class($this->query);
if ($class && $class != 'stdClass') {
@@ -917,7 +957,7 @@ class view extends views_db_object {
/**
* Build the query for the view.
*/
- function build($display_id = NULL) {
+ public function build($display_id = NULL) {
if (!empty($this->built)) {
return;
}
@@ -936,7 +976,6 @@ class view extends views_db_object {
// Attempt to load from cache.
// @todo Load a build_info from cache.
-
$start = microtime(TRUE);
// If that fails, let's build!
$this->build_info = array(
@@ -950,8 +989,7 @@ class view extends views_db_object {
// Call a module hook and see if it wants to present us with a
// pre-built query or instruct us not to build the query for
// some reason.
- // @todo: Implement this. Use the same mechanism Panels uses.
-
+ // @todo Implement this. Use the same mechanism Panels uses.
// Run through our handlers and ensure they have necessary information.
$this->init_handlers();
@@ -971,7 +1009,8 @@ class view extends views_db_object {
$exposed_errors = count($errors_after) > count($errors_before);
if ($exposed_errors || !empty($this->build_info['abort'])) {
$this->built = TRUE;
- // Don't execute the query, but rendering will still be executed to display the empty text.
+ // Don't execute the query, but rendering will still be executed to
+ // display the empty text.
$this->executed = TRUE;
return empty($this->build_info['fail']);
}
@@ -985,7 +1024,7 @@ class view extends views_db_object {
$filter_groups = $this->display_handler->get_option('filter_groups');
if ($filter_groups) {
$this->query->set_group_operator($filter_groups['operator']);
- foreach($filter_groups['groups'] as $id => $operator) {
+ foreach ($filter_groups['groups'] as $id => $operator) {
$this->query->set_where_group($operator, $id);
}
}
@@ -1030,13 +1069,13 @@ class view extends views_db_object {
$this->_build('footer');
$this->_build('empty');
- // Allow display handler to affect the query:
+ // Allow display handler to affect the query.
$this->display_handler->query($this->display_handler->use_group_by());
- // Allow style handler to affect the query:
+ // Allow style handler to affect the query.
$this->style_plugin->query($this->display_handler->use_group_by());
- // Allow exposed form to affect the query:
+ // Allow exposed form to affect the query.
if (isset($exposed_form)) {
$exposed_form->query();
}
@@ -1057,7 +1096,7 @@ class view extends views_db_object {
$this->built = TRUE;
$this->build_time = microtime(TRUE) - $start;
- // Attach displays
+ // Attach displays.
$this->attach_displays();
// Let modules modify the view just after building it.
@@ -1076,7 +1115,7 @@ class view extends views_db_object {
* The type of handlers (filter etc.) which should be iterated over to
* build the relationship and query information.
*/
- function _build($key) {
+ public function _build($key) {
$handlers = &$this->$key;
foreach ($handlers as $id => $data) {
@@ -1097,7 +1136,7 @@ class view extends views_db_object {
}
}
$rc = $handlers[$id]->accept_exposed_input($this->exposed_data);
- $handlers[$id]->store_exposed_input($this->exposed_data, $rc);
+ $handlers[$id]->store_exposed_input($this->exposed_input, $rc);
if (!$rc) {
continue;
}
@@ -1119,7 +1158,7 @@ class view extends views_db_object {
* Return whether the executing was successful, for example an argument
* could stop the process.
*/
- function execute($display_id = NULL) {
+ public function execute($display_id = NULL) {
if (empty($this->built)) {
if (!$this->build($display_id)) {
return FALSE;
@@ -1130,7 +1169,8 @@ class view extends views_db_object {
return TRUE;
}
- // Don't allow to use deactivated displays, but display them on the live preview.
+ // Don't allow to use deactivated displays, but display them on the live
+ // preview.
if (!$this->display[$this->current_display]->handler->get_option('enabled') && empty($this->live_preview)) {
$this->build_info['fail'] = TRUE;
return FALSE;
@@ -1150,7 +1190,7 @@ class view extends views_db_object {
$cache = $this->display_handler->get_plugin('cache');
}
if ($cache && $cache->cache_get('results')) {
- if($this->query->pager->use_pager()) {
+ if ($this->query->pager->use_pager() || !empty($this->get_total_rows)) {
$this->query->pager->total_items = $this->total_rows;
$this->query->pager->update_page_info();
}
@@ -1185,17 +1225,18 @@ class view extends views_db_object {
* @param string $display_id
* The machine name of the display, which should be rendered.
*
- * @return (string|NULL)
- * Return the output of the rendered view or NULL if something failed in the process.
+ * @return string|NULL
+ * Return the output of the rendered view or NULL if something failed in the
+ * process.
*/
- function render($display_id = NULL) {
+ public function render($display_id = NULL) {
$this->execute($display_id);
// Check to see if the build failed.
if (!empty($this->build_info['fail'])) {
return;
}
- if (!empty($this->view->build_info['denied'])) {
+ if (!empty($this->build_info['denied'])) {
return;
}
@@ -1284,7 +1325,7 @@ class view extends views_db_object {
foreach ($GLOBALS['base_theme_info'] as $base) {
$function = $base->name . '_views_post_render';
if (function_exists($function)) {
- $function($this);
+ $function($this, $this->display_handler->output, $cache);
}
}
$function = $GLOBALS['theme'] . '_views_post_render';
@@ -1300,21 +1341,20 @@ class view extends views_db_object {
}
/**
- * Render a specific field via the field ID and the row #
+ * Render a specific field via the field ID and the row #.
*
* Note: You might want to use views_plugin_style::render_fields as it
* caches the output for you.
*
* @param string $field
* The id of the field to be rendered.
- *
* @param int $row
* The row number in the $view->result which is used for the rendering.
*
* @return string
* The rendered output of the field.
*/
- function render_field($field, $row) {
+ public function render_field($field, $row) {
if (isset($this->field[$field]) && isset($this->result[$row])) {
return $this->field[$field]->advanced_render($this->result[$row]);
}
@@ -1332,7 +1372,7 @@ class view extends views_db_object {
*
* If you simply want to view the display, use view::preview() instead.
*/
- function execute_display($display_id = NULL, $args = array()) {
+ public function execute_display($display_id = NULL, $args = array()) {
if (empty($this->current_display) || $this->current_display != $this->choose_display($display_id)) {
if (!$this->set_display($display_id)) {
return FALSE;
@@ -1341,7 +1381,7 @@ class view extends views_db_object {
$this->pre_execute($args);
- // Execute the view
+ // Execute the view.
$output = $this->display_handler->execute();
$this->post_execute();
@@ -1355,7 +1395,7 @@ class view extends views_db_object {
* Can also be called when views are embedded, as this guarantees
* normalized output.
*/
- function preview($display_id = NULL, $args = array()) {
+ public function preview($display_id = NULL, $args = array()) {
if (empty($this->current_display) || ((!empty($display_id)) && $this->current_display != $display_id)) {
if (!$this->set_display($display_id)) {
return FALSE;
@@ -1375,7 +1415,7 @@ class view extends views_db_object {
* Run attachments and let the display do what it needs to do prior
* to running.
*/
- function pre_execute($args = array()) {
+ public function pre_execute($args = array()) {
$this->old_view[] = views_get_current_view();
views_set_current_view($this);
$display_id = $this->current_display;
@@ -1386,7 +1426,8 @@ class view extends views_db_object {
$this->set_arguments($args);
}
- // Let modules modify the view just prior to executing it.
+ // Trigger hook_views_pre_view(). Allow other modules to modify the view
+ // just prior to executing the preview.
foreach (module_implements('views_pre_view') as $module) {
$function = $module . '_views_pre_view';
$function($this, $display_id, $this->args);
@@ -1395,17 +1436,16 @@ class view extends views_db_object {
// Allow hook_views_pre_view() to set the dom_id, then ensure it is set.
$this->dom_id = !empty($this->dom_id) ? $this->dom_id : md5($this->name . REQUEST_TIME . rand());
- // Allow the display handler to set up for execution
+ // Allow the display handler to set up for execution.
$this->display_handler->pre_execute();
}
/**
* Unset the current view, mostly.
*/
- function post_execute() {
+ public function post_execute() {
// unset current view so we can be properly destructed later on.
// Return the previous value in case we're an attachment.
-
if ($this->old_view) {
$old_view = array_pop($this->old_view);
}
@@ -1416,7 +1456,7 @@ class view extends views_db_object {
/**
* Run attachment displays for the view.
*/
- function attach_displays() {
+ public function attach_displays() {
if (!empty($this->is_attachment)) {
return;
}
@@ -1436,22 +1476,21 @@ class view extends views_db_object {
}
/**
- * Called to get hook_menu() information from the view and the named display handler.
+ * Called to get hook_menu() info from the view and the named display handler.
*
- * @param $display_id
+ * @param string $display_id
* A display id.
- * @param $callbacks
+ * @param array $callbacks
* A menu callback array passed from views_menu_alter().
*/
- function execute_hook_menu($display_id = NULL, &$callbacks = array()) {
+ public function execute_hook_menu($display_id = NULL, &$callbacks = array()) {
// Prepare the view with the information we have.
-
// This was probably already called, but it's good to be safe.
if (!$this->set_display($display_id)) {
return FALSE;
}
- // Execute the view
+ // Execute the view.
if (isset($this->display_handler)) {
return $this->display_handler->execute_hook_menu($callbacks);
}
@@ -1461,26 +1500,26 @@ class view extends views_db_object {
* Called to get hook_block information from the view and the
* named display handler.
*/
- function execute_hook_block_list($display_id = NULL) {
+ public function execute_hook_block_list($display_id = NULL) {
// Prepare the view with the information we have.
-
// This was probably already called, but it's good to be safe.
if (!$this->set_display($display_id)) {
return FALSE;
}
- // Execute the view
+ // Execute the view.
if (isset($this->display_handler)) {
return $this->display_handler->execute_hook_block_list();
}
}
/**
- * Determine if the given user has access to the view. Note that
- * this sets the display handler if it hasn't been.
+ * Determine if the given user has access to the view.
+ *
+ * Note that this sets the display handler if it hasn't been.
*/
- function access($displays = NULL, $account = NULL) {
- // Noone should have access to disabled views.
+ public function access($displays = NULL, $account = NULL) {
+ // No one should have access to disabled views.
if (!empty($this->disabled)) {
return FALSE;
}
@@ -1493,9 +1532,8 @@ class view extends views_db_object {
$account = $GLOBALS['user'];
}
- // We can't use choose_display() here because that function
- // calls this one.
- $displays = (array)$displays;
+ // We can't use choose_display() here because that function calls this one.
+ $displays = (array) $displays;
foreach ($displays as $display_id) {
if (!empty($this->display[$display_id]->handler)) {
if ($this->display[$display_id]->handler->access($account)) {
@@ -1508,10 +1546,11 @@ class view extends views_db_object {
}
/**
- * Get the view's current title. This can change depending upon how it
- * was built.
+ * Get the view's current title.
+ *
+ * This can change depending upon how it was built.
*/
- function get_title() {
+ public function get_title() {
if (empty($this->display_handler)) {
if (!$this->set_display('default')) {
return FALSE;
@@ -1538,17 +1577,18 @@ class view extends views_db_object {
*
* The tokens in the title get's replaced before rendering.
*/
- function set_title($title) {
- $this->build_info['title'] = $title;
- return TRUE;
- }
+ public function set_title($title) {
+ $this->build_info['title'] = $title;
+ return TRUE;
+ }
/**
* Return the human readable name for a view.
*
- * When a certain view doesn't have a human readable name return the machine readable name.
+ * When a certain view doesn't have a human readable name return the machine
+ * readable name.
*/
- function get_human_name() {
+ public function get_human_name() {
if (!empty($this->human_name)) {
$human_name = $this->human_name;
}
@@ -1561,7 +1601,7 @@ class view extends views_db_object {
/**
* Force the view to build a title.
*/
- function build_title() {
+ public function build_title() {
$this->init_display();
if (empty($this->built)) {
@@ -1578,7 +1618,7 @@ class view extends views_db_object {
*
* This URL will be adjusted for arguments.
*/
- function get_url($args = NULL, $path = NULL) {
+ public function get_url($args = NULL, $path = NULL) {
if (!empty($this->override_url)) {
return $this->override_url;
}
@@ -1593,14 +1633,14 @@ class view extends views_db_object {
$position = 0;
if (!empty($this->argument)) {
foreach ($this->argument as $argument_id => $argument) {
- if (!empty($argument->is_default) && !empty($argument->options['default_argument_skip_url'])) {
+ if (!empty($argument->options['default_argument_skip_url'])) {
unset($args[$position]);
}
$position++;
}
}
}
- // Don't bother working if there's nothing to do:
+ // Don't bother working if there's nothing to do.
if (empty($path) || (empty($args) && strpos($path, '%') === FALSE)) {
return $path;
}
@@ -1619,7 +1659,8 @@ class view extends views_db_object {
$pieces[] = $this->argument[$id]->options['exception']['value'];
}
else {
- $pieces[] = '*'; // gotta put something if there just isn't one.
+ $pieces[] = '*';
+ // @todo Gotta put something if there just isn't one.
}
}
@@ -1642,7 +1683,7 @@ class view extends views_db_object {
/**
* Get the base path used for this view.
*/
- function get_path() {
+ public function get_path() {
if (!empty($this->override_path)) {
return $this->override_path;
}
@@ -1658,10 +1699,10 @@ class view extends views_db_object {
/**
* Get the breadcrumb used for this view.
*
- * @param $set
+ * @param bool $set
* If true, use drupal_set_breadcrumb() to install the breadcrumb.
*/
- function get_breadcrumb($set = FALSE) {
+ public function get_breadcrumb($set = FALSE) {
// Now that we've built the view, extract the breadcrumb.
$base = TRUE;
$breadcrumb = array();
@@ -1690,30 +1731,29 @@ class view extends views_db_object {
}
/**
- * Is this view cacheable?
+ * Is this view cacheable?.
*/
- function is_cacheable() {
+ public function is_cacheable() {
return $this->is_cacheable;
}
/**
* Set up query capturing.
*
- * db_query() stores the queries that it runs in global $queries,
- * bit only if dev_query is set to true. In this case, we want
- * to temporarily override that setting if it's not and we
- * can do that without forcing a db rewrite by just manipulating
- * $conf. This is kind of evil but it works.
+ * Db_query() stores the queries that it runs in global $queries, bit only if
+ * dev_query is set to true. In this case, we want to temporarily override
+ * that setting if it's not and we can do that without forcing a db rewrite by
+ * just manipulating $conf. This is kind of evil but it works.
*/
- function start_query_capture() {
+ public function start_query_capture() {
global $conf, $queries;
if (empty($conf['dev_query'])) {
$this->fix_dev_query = TRUE;
$conf['dev_query'] = TRUE;
}
- // Record the last query key used; anything already run isn't
- // a query that we are interested in.
+ // Record the last query key used; anything already run isn't a query that
+ // we are interested in.
$this->last_query_key = NULL;
if (!empty($queries)) {
@@ -1727,19 +1767,19 @@ class view extends views_db_object {
*
* @see view::start_query_capture()
*/
- function end_query_capture() {
+ public function end_query_capture() {
global $conf, $queries;
if (!empty($this->fix_dev_query)) {
$conf['dev_query'] = FALSE;
}
- // make a copy of the array so we can manipulate it with array_splice.
+ // Make a copy of the array so we can manipulate it with array_splice.
$temp = $queries;
// Scroll through the queries until we get to our last query key.
// Unset anything in our temp array.
if (isset($this->last_query_key)) {
- while (list($id, $query) = each($queries)) {
+ foreach ($queries as $id => $query) {
if ($id == $this->last_query_key) {
break;
}
@@ -1754,9 +1794,9 @@ class view extends views_db_object {
/**
* Static factory method to load a list of views based upon a $where clause.
*
- * Although this method could be implemented to simply iterate over views::load(),
- * that would be very slow. Buiding the views externally from unified queries is
- * much faster.
+ * Although this method could be implemented to simply iterate over
+ * views::load(), that would be very slow. Buiding the views externally from
+ * unified queries is much faster.
*/
static function load_views() {
$result = db_query("SELECT DISTINCT v.* FROM {views_view} v");
@@ -1764,7 +1804,7 @@ class view extends views_db_object {
// Load all the views.
foreach ($result as $data) {
- $view = new view;
+ $view = new view();
$view->load_row($data);
$view->loaded = TRUE;
$view->type = t('Normal');
@@ -1777,7 +1817,7 @@ class view extends views_db_object {
return array();
}
- // Now load all the subtables:
+ // Now load all the subtables.
foreach (view::db_objects() as $key) {
$object_name = "views_$key";
$result = db_query("SELECT * FROM {{$object_name}} WHERE vid IN (:vids) ORDER BY vid, position",
@@ -1787,8 +1827,8 @@ class view extends views_db_object {
$object = new $object_name(FALSE);
$object->load_row($data);
- // Because it can get complicated with this much indirection,
- // make a shortcut reference.
+ // Because it can get complicated with this much indirection, make a
+ // shortcut reference.
$location = &$views[$names[$object->vid]]->$key;
// If we have a basic id field, load the item onto the view based on
@@ -1805,25 +1845,31 @@ class view extends views_db_object {
}
/**
- * Save the view to the database. If the view does not already exist,
- * A vid will be assigned to the view and also returned from this function.
+ * Save the view to the database.
+ *
+ * If the view does not already exist a vid will be assigned to the view and
+ * also returned from this function.
*/
- function save() {
+ public function save() {
if ($this->vid == 'new') {
$this->vid = NULL;
}
- // If there is no vid, check if a view with this machine name already exists.
+ // If there is no vid, check if a view with this machine name already
+ // exists.
elseif (empty($this->vid)) {
$vid = db_query("SELECT vid from {views_view} WHERE name = :name", array(':name' => $this->name))->fetchField();
$this->vid = $vid ? $vid : NULL;
}
+ // Let modules modify the view just prior to saving it.
+ module_invoke_all('views_view_presave', $this);
+
$transaction = db_transaction();
try {
// If we have no vid or our vid is a string, this is a new view.
if (!empty($this->vid)) {
- // remove existing table entries
+ // remove existing table entries.
foreach ($this->db_objects() as $key) {
db_delete('views_' . $key)
->condition('vid', $this->vid)
@@ -1846,15 +1892,20 @@ class view extends views_db_object {
$this->save_locale_strings();
- // Clear caches.
- views_invalidate_cache();
+ // Clear the relevant caches.
+ cache_clear_all('views_block_items:', 'cache_views', TRUE);
+ views_invalidate_cache('ctools_export:views_view:' . $this->name);
+
+ // Notify modules that this view has been saved.
+ module_invoke_all('views_view_save', $this);
}
/**
- * Save a row to the database for the given key, which is one of the
- * keys from view::db_objects()
+ * Save a row to the database for the given key.
+ *
+ * i.e. one of the keys from view::db_objects().
*/
- function _save_rows($key) {
+ public function _save_rows($key) {
$count = 0;
foreach ($this->$key as $position => $object) {
$object->position = ++$count;
@@ -1866,7 +1917,7 @@ class view extends views_db_object {
/**
* Delete the view from the database.
*/
- function delete($clear = TRUE) {
+ public function delete($clear = TRUE) {
if (empty($this->vid)) {
return;
}
@@ -1876,7 +1927,7 @@ class view extends views_db_object {
->execute();
// Delete from all of our subtables as well.
foreach ($this->db_objects() as $key) {
- db_delete('views_'. $key)
+ db_delete('views_' . $key)
->condition('vid', $this->vid)
->execute();
}
@@ -1885,19 +1936,23 @@ class view extends views_db_object {
if ($clear) {
// Clear caches.
- views_invalidate_cache();
+ cache_clear_all('views_block_items:', 'cache_views', TRUE);
+ views_invalidate_cache('ctools_export:views_view:' . $this->name);
}
+
+ // Notify modules that this view has been deleted.
+ module_invoke_all('views_view_delete', $this);
}
/**
* Export a view as PHP code.
*/
- function export($indent = '') {
+ public function export($indent = '') {
$this->init_display();
$this->init_query();
$output = '';
$output .= $this->export_row('view', $indent);
- // Set the API version
+ // Set the API version.
$output .= $indent . '$view->api_version = \'' . views_api_version() . "';\n";
$output .= $indent . '$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */' . "\n";
@@ -1905,9 +1960,9 @@ class view extends views_db_object {
$output .= "\n" . $indent . "/* Display: $display->display_title */\n";
$output .= $indent . '$handler = $view->new_display(' . ctools_var_export($display->display_plugin, $indent) . ', ' . ctools_var_export($display->display_title, $indent) . ', \'' . $id . "');\n";
if (empty($display->handler)) {
- // @todo -- probably need a method of exporting broken displays as
- // they may simply be broken because a module is not installed. That
- // does not invalidate the display.
+ // @todo Probably need a method of exporting broken displays as they
+ // may simply be broken because a module is not installed. That does
+ // not invalidate the display.
continue;
}
@@ -1927,12 +1982,11 @@ class view extends views_db_object {
}
/**
- * Make a copy of this view that has been sanitized of all database IDs
- * and handlers and other stuff.
+ * Make a copy of this view with IDs, handlers sanitized
*
* I'd call this clone() but it's reserved.
*/
- function copy() {
+ public function copy() {
$code = $this->export();
eval($code);
return $view;
@@ -1941,24 +1995,23 @@ class view extends views_db_object {
/**
* Safely clone a view.
*
- * Because views are complicated objects within objects, and PHP loves to
- * do references to everything, if a View is not properly and safely
- * cloned it will still have references to the original view, and can
- * actually cause the original view to point to objects in the cloned
- * view. This gets ugly fast.
+ * Because views are complicated objects within objects, and PHP loves to do
+ * references to everything, if a View is not properly and safely cloned it
+ * will still have references to the original view, and can actually cause the
+ * original view to point to objects in the cloned view. This gets ugly fast.
*
* This will completely wipe a view clean so it can be considered fresh.
*
* @return view
* The cloned view.
*/
- function clone_view() {
- $clone = version_compare(phpversion(), '5.0') < 0 ? $this : clone($this);
+ public function clone_view() {
+ $clone = clone $this;
$keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'header', 'footer', 'empty', 'query', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'exposed_widgets', 'many_to_one_tables', 'feed_icon');
foreach ($keys as $key) {
- if (isset($clone->$key)) {
- unset($clone->$key);
+ if (isset($clone->{$key})) {
+ unset($clone->{$key});
}
}
$clone->built = $clone->executed = FALSE;
@@ -1967,8 +2020,8 @@ class view extends views_db_object {
$clone->attachment_after = '';
$clone->result = array();
- // shallow cloning means that all the display objects
- // *were not cloned*. We must clone them ourselves.
+ // Shallow cloning means that all the display objects *were not cloned*. We
+ // must clone them ourselves.
$displays = array();
foreach ($clone->display as $id => $display) {
$displays[$id] = clone $display;
@@ -1982,12 +2035,11 @@ class view extends views_db_object {
}
/**
- * Unset references so that a $view object may be properly garbage
- * collected.
+ * Unset references so that a $view object may be properly garbage collected.
*/
- function destroy() {
+ public function destroy() {
foreach (array_keys($this->display) as $display_id) {
- if (isset($this->display[$display_id]->handler)) {
+ if (isset($this->display[$display_id]->handler) && is_object($this->display[$display_id]->handler)) {
$this->display[$display_id]->handler->destroy();
unset($this->display[$display_id]->handler);
}
@@ -2046,10 +2098,10 @@ class view extends views_db_object {
/**
* Make sure the view is completely valid.
*
- * @return
+ * @return bool
* TRUE if the view is valid; an array of error strings if it is not.
*/
- function validate() {
+ public function validate() {
$this->init_display();
$errors = array();
@@ -2076,32 +2128,37 @@ class view extends views_db_object {
}
/**
- * Find and initialize the localizer plugin.
+ * Find and initialize the localization plugin.
*/
- function init_localization() {
- if (isset($this->localization_plugin) && is_object($this->localization_plugin)) {
- return TRUE;
+ public function init_localization() {
+ // If the translate attribute isn't set, init the localization plugin.
+ if (!isset($this->localization_plugin->translate)) {
+ $this->localization_plugin = views_get_plugin('localization', views_get_localization_plugin());
+
+ // If the plugin is still not set, turn off all localization by using the
+ // views_plugin_localization_none plugin. This plugin has the translate
+ // property set to FALSE, signifying localization should not occur.
+ if (empty($this->localization_plugin)) {
+ $this->localization_plugin = views_get_plugin('localization', 'none');
+ }
+
+ // Init the plugin.
+ $this->localization_plugin->init($this);
}
- $this->localization_plugin = views_get_plugin('localization', views_get_localization_plugin());
-
- if (empty($this->localization_plugin)) {
- $this->localization_plugin = views_get_plugin('localization', 'none');
- return FALSE;
- }
-
- /**
- * Figure out whether there should be options.
- */
- $this->localization_plugin->init($this);
-
+ // Return the value of the translate property. This is set to FALSE if
+ // localization is off.
return $this->localization_plugin->translate;
}
/**
* Determine whether a view supports admin string translation.
*/
- function is_translatable() {
+ public function is_translatable() {
+ // Use translation no matter what type of view.
+ if (variable_get('views_localize_all', FALSE)) {
+ return TRUE;
+ }
// If the view is normal or overridden, use admin string translation.
// A newly created view won't have a type. Accept this.
return (!isset($this->type) || in_array($this->type, array(t('Normal'), t('Overridden')))) ? TRUE : FALSE;
@@ -2110,31 +2167,31 @@ class view extends views_db_object {
/**
* Send strings for localization.
*/
- function save_locale_strings() {
+ public function save_locale_strings() {
$this->process_locale_strings('save');
}
/**
* Delete localized strings.
*/
- function delete_locale_strings() {
+ public function delete_locale_strings() {
$this->process_locale_strings('delete');
}
/**
* Export localized strings.
*/
- function export_locale_strings() {
+ public function export_locale_strings() {
$this->process_locale_strings('export');
}
/**
* Process strings for localization, deletion or export to code.
*/
- function process_locale_strings($op) {
+ public function process_locale_strings($op) {
// Ensure this view supports translation, we have a display, and we
// have a localization plugin.
- // @fixme Export does not init every handler.
+ // @todo Export does not init every handler.
if (($this->is_translatable() || $op == 'export') && $this->init_display() && $this->init_localization()) {
$this->localization_plugin->process_locale_strings($op);
}
@@ -2146,17 +2203,18 @@ class view extends views_db_object {
* Base class for views' database objects.
*/
class views_db_object {
+
public $db_table;
/**
* Initialize this object, setting values from schema defaults.
*
- * @param $init
+ * @param array|bool $init
* If an array, this is a set of values from db_fetch_object to
* load. Otherwse, if TRUE values will be filled in from schema
* defaults.
*/
- function init($init = TRUE) {
+ public function init($init = TRUE) {
if (is_array($init)) {
return $this->load_row($init);
}
@@ -2193,16 +2251,16 @@ class views_db_object {
/**
* Write the row to the database.
*
- * @param $update
+ * @param bool $update
* If true this will be an UPDATE query. Otherwise it will be an INSERT.
*/
- function save_row($update = NULL) {
+ public function save_row($update = NULL) {
$fields = $defs = $values = $serials = array();
$schema = drupal_get_schema($this->db_table);
// Go through our schema and build correlations.
foreach ($schema['fields'] as $field => $info) {
- // special case -- skip serial types if we are updating.
+ // Special case - skip serial types if we are updating.
if ($info['type'] == 'serial') {
$serials[] = $field;
continue;
@@ -2224,8 +2282,7 @@ class views_db_object {
->execute();
if ($serials && !$update) {
- // get last insert ids and fill them in.
- // Well, one ID.
+ // Get last insert ids and fill them in. Well, one ID.
foreach ($serials as $field) {
$this->$field = $return;
}
@@ -2235,15 +2292,14 @@ class views_db_object {
/**
* Load the object with a row from the database.
*
- * This method is separate from the constructor in order to give us
- * more flexibility in terms of how the view object is built in different
- * contexts.
+ * This method is separate from the constructor in order to give us more
+ * flexibility in terms of how the view object is built in different contexts.
*
- * @param $data
+ * @param object $data
* An object from db_fetch_object. It should contain all of the fields
* that are in the schema.
*/
- function load_row($data) {
+ public function load_row($data) {
$schema = drupal_get_schema($this->db_table);
// Go through our schema and build correlations.
@@ -2253,14 +2309,16 @@ class views_db_object {
}
/**
- * Export a loaded row, such as an argument, field or the view itself to PHP code.
+ * Export a loaded row.
*
- * @param $identifier
+ * Might be an argument, field or the view itself to PHP code.
+ *
+ * @param string $identifier
* The variable to assign the PHP code for this object to.
- * @param $indent
+ * @param int $indent
* An optional indentation for prettifying nested code.
*/
- function export_row($identifier = NULL, $indent = '') {
+ public function export_row($identifier = NULL, $indent = '') {
ctools_include('export');
if (!$identifier) {
@@ -2282,7 +2340,7 @@ class views_db_object {
$this->$field = '';
}
- // serialized defaults must be set as serialized.
+ // Serialized defaults must be set as serialized.
if (isset($info['serialize'])) {
$this->$field = unserialize($this->$field);
}
@@ -2305,17 +2363,18 @@ class views_db_object {
/**
* Add a new display handler to the view, automatically creating an id.
*
- * @param $type
+ * @param string $type
* The plugin type from the views plugin data. Defaults to 'page'.
- * @param $title
+ * @param string $title
* The title of the display; optional, may be filled in from default.
- * @param $id
+ * @param int $id
* The id to use.
- * @return
- * The key to the display in $view->display, so that the new display
- * can be easily located.
+ *
+ * @return string
+ * The key to the display in $view->display, so that the new display can be
+ * easily located.
*/
- function add_display($type = 'page', $title = NULL, $id = NULL) {
+ public function add_display($type = 'page', $title = NULL, $id = NULL) {
if (empty($type)) {
return FALSE;
}
@@ -2325,7 +2384,6 @@ class views_db_object {
$plugin['title'] = t('Broken');
}
-
if (empty($id)) {
$id = $this->generate_display_id($type);
if ($id !== 'default') {
@@ -2346,8 +2404,8 @@ class views_db_object {
}
}
- // Create the new display object
- $display = new views_display;
+ // Create the new display object.
+ $display = new views_display();
$display->options($type, $id, $title);
// Add the new display object to the view.
@@ -2358,10 +2416,10 @@ class views_db_object {
/**
* Generate a display id of a certain plugin type.
*
- * @param $type
+ * @param string $type
* Which plugin should be used for the new display id.
*/
- function generate_display_id($type) {
+ public function generate_display_id($type) {
// 'default' is singular and is unique, so just go with 'default'
// for it. For all others, start counting.
if ($type == 'default') {
@@ -2371,8 +2429,8 @@ class views_db_object {
$id = $type . '_1';
$count = 1;
- // Loop through IDs based upon our style plugin name until
- // we find one that is unused.
+ // Loop through IDs based upon our style plugin name until we find one that
+ // is unused.
while (!empty($this->display[$id])) {
$id = $type . '_' . ++$count;
}
@@ -2385,12 +2443,12 @@ class views_db_object {
*
* These items are typically fields, filters, sort criteria, or arguments.
*
- * @param $requested_id
+ * @param int $requested_id
* The requested ID for the item.
- * @param $existing_items
+ * @param array $existing_items
* An array of existing items, keyed by their IDs.
*
- * @return
+ * @return string
* A unique ID. This will be equal to $requested_id if no item with that ID
* already exists. Otherwise, it will be appended with an integer to make
* it unique, e.g. "{$requested_id}_1", "{$requested_id}_2", etc.
@@ -2406,22 +2464,24 @@ class views_db_object {
/**
* Create a new display and a display handler for it.
- * @param $type
+ *
+ * @param string $type
* The plugin type from the views plugin data. Defaults to 'page'.
- * @param $title
+ * @param string $title
* The title of the display; optional, may be filled in from default.
- * @param $id
+ * @param int $id
* The id to use.
+ *
* @return views_plugin_display
* A reference to the new handler object.
*/
- function &new_display($type = 'page', $title = NULL, $id = NULL) {
+ public function &new_display($type = 'page', $title = NULL, $id = NULL) {
$id = $this->add_display($type, $title, $id);
- // Create a handler
+ // Create a handler.
$this->display[$id]->handler = views_get_plugin('display', $this->display[$id]->display_plugin);
if (empty($this->display[$id]->handler)) {
- // provide a 'default' handler as an emergency. This won't work well but
+ // Provide a 'default' handler as an emergency. This won't work well but
// it will keep things from crashing.
$this->display[$id]->handler = views_get_plugin('display', 'default');
}
@@ -2429,7 +2489,7 @@ class views_db_object {
if (!empty($this->display[$id]->handler)) {
// Initialize the new display handler with data.
$this->display[$id]->handler->init($this, $this->display[$id]);
- // If this is NOT the default display handler, let it know which is
+ // If this is NOT the default display handler, let it know which is.
if ($id != 'default') {
$this->display[$id]->handler->default_display = &$this->display['default']->handler;
}
@@ -2443,7 +2503,7 @@ class views_db_object {
*
* These items may be fields, filters, sort criteria, or arguments.
*/
- function add_item($display_id, $type, $table, $field, $options = array(), $id = NULL) {
+ public function add_item($display_id, $type, $table, $field, $options = array(), $id = NULL) {
$types = views_object_types();
$this->set_display($display_id);
@@ -2477,7 +2537,7 @@ class views_db_object {
/**
* Get an array of items for the current display.
*/
- function get_items($type, $display_id = NULL) {
+ public function get_items($type, $display_id = NULL) {
$this->set_display($display_id);
if (!isset($display_id)) {
@@ -2490,34 +2550,32 @@ class views_db_object {
}
/**
- * Get the configuration of an item (field/sort/filter/etc) on a given
- * display.
+ * Get the config of an item (field/sort/filter/etc) on a given display.
*/
- function get_item($display_id, $type, $id) {
+ public function get_item($display_id, $type, $id) {
// Get info about the types so we can get the right data.
$types = views_object_types();
- // Initialize the display
+ // Initialize the display.
$this->set_display($display_id);
- // Get the existing configuration
+ // Get the existing configuration.
$fields = $this->display[$display_id]->handler->get_option($types[$type]['plural']);
return isset($fields[$id]) ? $fields[$id] : NULL;
}
/**
- * Set the configuration of an item (field/sort/filter/etc) on a given
- * display.
+ * Set the config of an item (field/sort/filter/etc) on a given display.
*
* Pass in NULL for the $item to remove an item.
*/
- function set_item($display_id, $type, $id, $item) {
+ public function set_item($display_id, $type, $id, $item) {
// Get info about the types so we can get the right data.
$types = views_object_types();
- // Initialize the display
+ // Initialize the display.
$this->set_display($display_id);
- // Get the existing configuration
+ // Get the existing configuration.
$fields = $this->display[$display_id]->handler->get_option($types[$type]['plural']);
if (isset($item)) {
$fields[$id] = $item;
@@ -2533,15 +2591,15 @@ class views_db_object {
/**
* Set an option on an item.
*
- * Use this only if you have just 1 or 2 options to set; if you have
- * many, consider getting the item, adding the options and doing
- * set_item yourself.
+ * Use this only if you have just 1 or 2 options to set; if you have many,
+ * consider getting the item, adding the options and doing set_item yourself.
*/
- function set_item_option($display_id, $type, $id, $option, $value) {
+ public function set_item_option($display_id, $type, $id, $option, $value) {
$item = $this->get_item($display_id, $type, $id);
$item[$option] = $value;
$this->set_item($display_id, $type, $id, $item);
}
+
}
/**
@@ -2551,47 +2609,55 @@ class views_db_object {
* to the behavior of the display at all.
*/
class views_display extends views_db_object {
+
/**
* The display handler itself, which has all the methods.
*
* @var views_plugin_display
*/
- var $handler;
+ public $handler;
/**
* Stores all options of the display, like fields, filters etc.
*
* @var array
*/
- var $display_options;
+ public $display_options;
- var $db_table = 'views_display';
- function views_display($init = TRUE) {
+ public $db_table = 'views_display';
+ public function __construct($init = TRUE) {
parent::init($init);
}
- function options($type, $id, $title) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options($type, $id, $title) {
$this->display_plugin = $type;
$this->id = $id;
$this->display_title = $title;
}
+
}
/**
- * Provide a list of views object types used in a view, with some information
- * about them.
+ * Provide a list of object types used in a view, with some info about them.
*/
function views_object_types() {
static $retval = NULL;
- // statically cache this so t() doesn't run a bajillion times.
+ // Statically cache this so t() doesn't run a bajillion times.
if (!isset($retval)) {
$retval = array(
'field' => array(
- 'title' => t('Fields'), // title
- 'ltitle' => t('fields'), // lowercase title for mid-sentence
- 'stitle' => t('Field'), // singular title
- 'lstitle' => t('field'), // singular lowercase title for mid sentence
+ // Title.
+ 'title' => t('Fields'),
+ // Lowercase title for mid-sentence.
+ 'ltitle' => t('fields'),
+ // Singular title.
+ 'stitle' => t('Field'),
+ // Lingular lowercase title for mid sentence.
+ 'lstitle' => t('field'),
'plural' => 'fields',
),
'argument' => array(
diff --git a/sites/all/modules/contrib/views/views/js/ajax.js b/sites/all/modules/contrib/views/views/js/ajax.js
index 5c68854..105465e 100644
--- a/sites/all/modules/contrib/views/views/js/ajax.js
+++ b/sites/all/modules/contrib/views/views/js/ajax.js
@@ -25,7 +25,13 @@
});
$('form', ajax_body).once('views-ajax-submit-processed').each(function() {
- var element_settings = { 'url': response.url, 'event': 'submit', 'progress': { 'type': 'throbber' } };
+ var element_settings = {
+ 'url': response.url,
+ 'event': 'submit',
+ 'progress': {
+ 'type': 'throbber'
+ }
+ };
var $form = $(this);
var id = $form.attr('id');
Drupal.ajax[id] = new Drupal.ajax(id, this, element_settings);
@@ -90,7 +96,7 @@
};
/**
- * Get rid of irritating tabledrag messages
+ * Get rid of irritating tabledrag messages.
*/
Drupal.theme.tableDragChangedWarning = function () {
return [];
@@ -143,7 +149,9 @@
var base_element_settings = {
'event': 'click',
- 'progress': { 'type': 'throbber' }
+ 'progress': {
+ 'type': 'throbber'
+ }
};
// Bind AJAX behaviors to all items showing the class.
$('a.views-ajax-link', context).once('views-ajax-processed').each(function () {
@@ -158,23 +166,23 @@
$('div#views-live-preview a')
.once('views-ajax-processed').each(function () {
- // We don't bind to links without a URL.
- if (!$(this).attr('href')) {
- return true;
- }
+ // We don't bind to links without a URL.
+ if (!$(this).attr('href')) {
+ return true;
+ }
- var element_settings = base_element_settings;
- // Set the URL to go to the anchor.
- element_settings.url = $(this).attr('href');
- if (Drupal.Views.getPath(element_settings.url).substring(0, 21) != 'admin/structure/views') {
- return true;
- }
+ var element_settings = base_element_settings;
+ // Set the URL to go to the anchor.
+ element_settings.url = $(this).attr('href');
+ if (Drupal.Views.getPath(element_settings.url).substring(0, 21) != 'admin/structure/views') {
+ return true;
+ }
- element_settings.wrapper = 'views-live-preview';
- element_settings.method = 'html';
- var base = $(this).attr('id');
- Drupal.ajax[base] = new Drupal.ajax(base, this, element_settings);
- });
+ element_settings.wrapper = 'views-live-preview';
+ element_settings.method = 'html';
+ var base = $(this).attr('id');
+ Drupal.ajax[base] = new Drupal.ajax(base, this, element_settings);
+ });
// Within a live preview, make exposed widget form buttons re-trigger the
// Preview button.
@@ -182,29 +190,29 @@
// of the main Edit form.
$('div#views-live-preview input[type=submit]')
.once('views-ajax-processed').each(function(event) {
- $(this).click(function () {
- this.form.clk = this;
- return true;
+ $(this).click(function () {
+ this.form.clk = this;
+ return true;
+ });
+ var element_settings = base_element_settings;
+ // Set the URL to go to the anchor.
+ element_settings.url = $(this.form).attr('action');
+ if (Drupal.Views.getPath(element_settings.url).substring(0, 21) != 'admin/structure/views') {
+ return true;
+ }
+
+ element_settings.wrapper = 'views-live-preview';
+ element_settings.method = 'html';
+ element_settings.event = 'click';
+
+ var base = $(this).attr('id');
+ Drupal.ajax[base] = new Drupal.ajax(base, this, element_settings);
});
- var element_settings = base_element_settings;
- // Set the URL to go to the anchor.
- element_settings.url = $(this.form).attr('action');
- if (Drupal.Views.getPath(element_settings.url).substring(0, 21) != 'admin/structure/views') {
- return true;
- }
-
- element_settings.wrapper = 'views-live-preview';
- element_settings.method = 'html';
- element_settings.event = 'click';
-
- var base = $(this).attr('id');
- Drupal.ajax[base] = new Drupal.ajax(base, this, element_settings);
- });
if (!this.collapseReplaced && Drupal.collapseScrollIntoView) {
this.collapseReplaced = true;
Drupal.collapseScrollIntoView = function (node) {
- for (var $parent = $(node); $parent.get(0) != document && $parent.size() != 0; $parent = $parent.parent()) {
+ for (var $parent = $(node); $parent.get(0) != document && $parent.length != 0; $parent = $parent.parent()) {
if ($parent.css('overflow') == 'scroll' || $parent.css('overflow') == 'auto') {
if (Drupal.viewsUi.resizeModal) {
// If the modal is already at the max height, don't bother with
diff --git a/sites/all/modules/contrib/views/views/js/ajax_view.js b/sites/all/modules/contrib/views/views/js/ajax_view.js
index 7d54c67..c3e5bb9 100644
--- a/sites/all/modules/contrib/views/views/js/ajax_view.js
+++ b/sites/all/modules/contrib/views/views/js/ajax_view.js
@@ -4,144 +4,159 @@
*/
(function ($) {
-/**
- * Attaches the AJAX behavior to Views exposed filter forms and key View links.
- */
-Drupal.behaviors.ViewsAjaxView = {};
-Drupal.behaviors.ViewsAjaxView.attach = function() {
- if (Drupal.settings && Drupal.settings.views && Drupal.settings.views.ajaxViews) {
- $.each(Drupal.settings.views.ajaxViews, function(i, settings) {
- Drupal.views.instances[i] = new Drupal.views.ajaxView(settings);
- });
- }
-};
-
-Drupal.views = {};
-Drupal.views.instances = {};
-
-/**
- * Javascript object for a certain view.
- */
-Drupal.views.ajaxView = function(settings) {
- var selector = '.view-dom-id-' + settings.view_dom_id;
- this.$view = $(selector);
-
- // Retrieve the path to use for views' ajax.
- var ajax_path = Drupal.settings.views.ajax_path;
-
- // If there are multiple views this might've ended up showing up multiple times.
- if (ajax_path.constructor.toString().indexOf("Array") != -1) {
- ajax_path = ajax_path[0];
- }
-
- // Check if there are any GET parameters to send to views.
- var queryString = window.location.search || '';
- if (queryString !== '') {
- // Remove the question mark and Drupal path component if any.
- var queryString = queryString.slice(1).replace(/q=[^&]+&?|&?render=[^&]+/, '');
- if (queryString !== '') {
- // If there is a '?' in ajax_path, clean url are on and & should be used to add parameters.
- queryString = ((/\?/.test(ajax_path)) ? '&' : '?') + queryString;
+ /**
+ * Attaches the AJAX behavior to exposed filter forms and key views links.
+ */
+ Drupal.behaviors.ViewsAjaxView = {};
+ Drupal.behaviors.ViewsAjaxView.attach = function() {
+ if (Drupal.settings && Drupal.settings.views && Drupal.settings.views.ajaxViews) {
+ $.each(Drupal.settings.views.ajaxViews, function(i, settings) {
+ Drupal.views.instances[i] = new Drupal.views.ajaxView(settings);
+ });
}
- }
-
- this.element_settings = {
- url: ajax_path + queryString,
- submit: settings,
- setClick: true,
- event: 'click',
- selector: selector,
- progress: { type: 'throbber' }
};
- this.settings = settings;
+ Drupal.views = {};
+ Drupal.views.instances = {};
- // Add the ajax to exposed forms.
- this.$exposed_form = this.$view.children('.view-filters').children('form');
- this.$exposed_form.once(jQuery.proxy(this.attachExposedFormAjax, this));
+ /**
+ * Javascript object for a certain view.
+ */
+ Drupal.views.ajaxView = function(settings) {
+ var selector = '.view-dom-id-' + settings.view_dom_id;
+ this.$view = $(selector);
- // Add the ajax to pagers.
- this.$view
+ // Retrieve the path to use for views' ajax.
+ var ajax_path = Drupal.settings.views.ajax_path;
+
+ // If there are multiple views this might've ended up showing up multiple
+ // times.
+ if (ajax_path.constructor.toString().indexOf("Array") != -1) {
+ ajax_path = ajax_path[0];
+ }
+
+ // Check if there are any GET parameters to send to views.
+ var queryString = window.location.search || '';
+ if (queryString !== '') {
+ // Remove the question mark and Drupal path component if any.
+ var queryString = queryString.slice(1).replace(/q=[^&]+&?|&?render=[^&]+/, '');
+ if (queryString !== '') {
+ // If there is a '?' in ajax_path, clean url are on and & should be
+ // used to add parameters.
+ queryString = ((/\?/.test(ajax_path)) ? '&' : '?') + queryString;
+ }
+ }
+
+ this.element_settings = {
+ url: ajax_path + queryString,
+ submit: settings,
+ setClick: true,
+ event: 'click',
+ selector: selector,
+ progress: {
+ type: 'throbber'
+ }
+ };
+
+ this.settings = settings;
+
+ // Add the ajax to exposed forms.
+ this.$exposed_form = $('#views-exposed-form-' + settings.view_name.replace(/_/g, '-') + '-' + settings.view_display_id.replace(/_/g, '-'));
+ this.$exposed_form.once(jQuery.proxy(this.attachExposedFormAjax, this));
+
+ // Store Drupal.ajax objects here for all pager links.
+ this.links = [];
+
+ // Add the ajax to pagers.
+ this.$view
// Don't attach to nested views. Doing so would attach multiple behaviors
// to a given element.
- .filter(jQuery.proxy(this.filterNestedViews, this))
- .once(jQuery.proxy(this.attachPagerAjax, this));
+ .filter(jQuery.proxy(this.filterNestedViews, this))
+ .once(jQuery.proxy(this.attachPagerAjax, this));
- // Add a trigger to update this view specifically. In order to trigger a
- // refresh use the following code.
- //
- // @code
- // jQuery('.view-name').trigger('RefreshView');
- // @endcode
- // Add a trigger to update this view specifically.
- var self_settings = this.element_settings;
- self_settings.event = 'RefreshView';
- this.refreshViewAjax = new Drupal.ajax(this.selector, this.$view, self_settings);
-};
+ // Add a trigger to update this view specifically. In order to trigger a
+ // refresh use the following code.
+ //
+ // @code
+ // jQuery('.view-name').trigger('RefreshView');
+ // @endcode
+ // Add a trigger to update this view specifically.
+ var self_settings = this.element_settings;
+ self_settings.event = 'RefreshView';
+ this.refreshViewAjax = new Drupal.ajax(this.selector, this.$view, self_settings);
+ };
-Drupal.views.ajaxView.prototype.attachExposedFormAjax = function() {
- var button = $('input[type=submit], button[type=submit], input[type=image]', this.$exposed_form);
- button = button[0];
+ Drupal.views.ajaxView.prototype.attachExposedFormAjax = function() {
+ var button = $('input[type=submit], button[type=submit], input[type=image]', this.$exposed_form);
+ button = button[0];
- this.exposedFormAjax = new Drupal.ajax($(button).attr('id'), button, this.element_settings);
-};
+ // Call the autocomplete submit before doing AJAX.
+ $(button).click(function () {
+ if (Drupal.autocompleteSubmit) {
+ Drupal.autocompleteSubmit();
+ }
+ });
-Drupal.views.ajaxView.prototype.filterNestedViews= function() {
- // If there is at least one parent with a view class, this view
- // is nested (e.g., an attachment). Bail.
- return !this.$view.parents('.view').size();
-};
+ this.exposedFormAjax = new Drupal.ajax($(button).attr('id'), button, this.element_settings);
+ };
-/**
- * Attach the ajax behavior to each link.
- */
-Drupal.views.ajaxView.prototype.attachPagerAjax = function() {
- this.$view.find('ul.pager > li > a, th.views-field a, .attachment .views-summary a')
- .each(jQuery.proxy(this.attachPagerLinkAjax, this));
-};
+ Drupal.views.ajaxView.prototype.filterNestedViews = function() {
+ // If there is at least one parent with a view class, this view
+ // is nested (e.g., an attachment). Bail.
+ return !this.$view.parents('.view').length;
+ };
-/**
- * Attach the ajax behavior to a singe link.
- */
-Drupal.views.ajaxView.prototype.attachPagerLinkAjax = function(id, link) {
- var $link = $(link);
- var viewData = {};
- var href = $link.attr('href');
- // Construct an object using the settings defaults and then overriding
- // with data specific to the link.
- $.extend(
+ /**
+ * Attach the ajax behavior to each link.
+ */
+ Drupal.views.ajaxView.prototype.attachPagerAjax = function() {
+ this.$view.find('ul.pager > li > a, th.views-field a, .attachment .views-summary a')
+ .each(jQuery.proxy(this.attachPagerLinkAjax, this));
+ };
+
+ /**
+ * Attach the ajax behavior to a singe link.
+ */
+ Drupal.views.ajaxView.prototype.attachPagerLinkAjax = function(id, link) {
+ var $link = $(link);
+ var viewData = {};
+ var href = $link.attr('href');
+ // Construct an object using the settings defaults and then overriding
+ // with data specific to the link.
+ $.extend(
viewData,
this.settings,
Drupal.Views.parseQueryString(href),
// Extract argument data from the URL.
Drupal.Views.parseViewArgs(href, this.settings.view_base_path)
- );
+ );
- // For anchor tags, these will go to the target of the anchor rather
- // than the usual location.
- $.extend(viewData, Drupal.Views.parseViewArgs(href, this.settings.view_base_path));
+ // For anchor tags, these will go to the target of the anchor rather
+ // than the usual location.
+ $.extend(viewData, Drupal.Views.parseViewArgs(href, this.settings.view_base_path));
- this.element_settings.submit = viewData;
- this.pagerAjax = new Drupal.ajax(false, $link, this.element_settings);
-};
+ this.element_settings.submit = viewData;
+ this.pagerAjax = new Drupal.ajax(false, $link, this.element_settings);
+ this.links.push(this.pagerAjax);
+ };
-Drupal.ajax.prototype.commands.viewsScrollTop = function (ajax, response, status) {
- // Scroll to the top of the view. This will allow users
- // to browse newly loaded content after e.g. clicking a pager
- // link.
- var offset = $(response.selector).offset();
- // We can't guarantee that the scrollable object should be
- // the body, as the view could be embedded in something
- // more complex such as a modal popup. Recurse up the DOM
- // and scroll the first element that has a non-zero top.
- var scrollTarget = response.selector;
- while ($(scrollTarget).scrollTop() == 0 && $(scrollTarget).parent()) {
- scrollTarget = $(scrollTarget).parent();
- }
- // Only scroll upward
- if (offset.top - 10 < $(scrollTarget).scrollTop()) {
- $(scrollTarget).animate({scrollTop: (offset.top - 10)}, 500);
- }
-};
+ Drupal.ajax.prototype.commands.viewsScrollTop = function (ajax, response, status) {
+ // Scroll to the top of the view. This will allow users
+ // to browse newly loaded content after e.g. clicking a pager
+ // link.
+ var offset = $(response.selector).offset();
+ // We can't guarantee that the scrollable object should be
+ // the body, as the view could be embedded in something
+ // more complex such as a modal popup. Recurse up the DOM
+ // and scroll the first element that has a non-zero top.
+ var scrollTarget = response.selector;
+ while ($(scrollTarget).scrollTop() == 0 && $(scrollTarget).parent()) {
+ scrollTarget = $(scrollTarget).parent();
+ }
+ // Only scroll upward.
+ if (offset.top - 10 < $(scrollTarget).scrollTop()) {
+ $(scrollTarget).animate({scrollTop: (offset.top - 10)}, 500);
+ }
+ };
})(jQuery);
diff --git a/sites/all/modules/contrib/views/views/js/base.js b/sites/all/modules/contrib/views/views/js/base.js
index 5855dce..24fa02c 100644
--- a/sites/all/modules/contrib/views/views/js/base.js
+++ b/sites/all/modules/contrib/views/views/js/base.js
@@ -4,107 +4,112 @@
*/
(function ($) {
-Drupal.Views = {};
+ Drupal.Views = {};
-/**
- * jQuery UI tabs, Views integration component
- */
-Drupal.behaviors.viewsTabs = {
- attach: function (context) {
- if ($.viewsUi && $.viewsUi.tabs) {
- $('#views-tabset').once('views-processed').viewsTabs({
- selectedClass: 'active'
- });
- }
-
- $('a.views-remove-link').once('views-processed').click(function(event) {
- var id = $(this).attr('id').replace('views-remove-link-', '');
- $('#views-row-' + id).hide();
- $('#views-removed-' + id).attr('checked', true);
- event.preventDefault();
- });
/**
- * Here is to handle display deletion
- * (checking in the hidden checkbox and hiding out the row)
- */
- $('a.display-remove-link')
- .addClass('display-processed')
- .click(function() {
- var id = $(this).attr('id').replace('display-remove-link-', '');
- $('#display-row-' + id).hide();
- $('#display-removed-' + id).attr('checked', true);
- return false;
- });
- }
-};
+ * JQuery UI tabs, Views integration component.
+ */
+ Drupal.behaviors.viewsTabs = {
+ attach: function (context) {
+ if ($.viewsUi && $.viewsUi.tabs) {
+ $('#views-tabset').once('views-processed').viewsTabs({
+ selectedClass: 'active'
+ });
+ }
-/**
+ $('a.views-remove-link').once('views-processed').click(function(event) {
+ var id = $(this).attr('id').replace('views-remove-link-', '');
+ $('#views-row-' + id).hide();
+ $('#views-removed-' + id).attr('checked', true);
+ event.preventDefault();
+ });
+ /**
+ * Here is to handle display deletion
+ * (checking in the hidden checkbox and hiding out the row).
+ */
+ $('a.display-remove-link')
+ .addClass('display-processed')
+ .click(function() {
+ var id = $(this).attr('id').replace('display-remove-link-', '');
+ $('#display-row-' + id).hide();
+ $('#display-removed-' + id).attr('checked', true);
+ return false;
+ });
+ }
+ };
+
+ /**
* Helper function to parse a querystring.
*/
-Drupal.Views.parseQueryString = function (query) {
- var args = {};
- var pos = query.indexOf('?');
- if (pos != -1) {
- query = query.substring(pos + 1);
- }
- var pairs = query.split('&');
- for(var i in pairs) {
- if (typeof(pairs[i]) == 'string') {
- var pair = pairs[i].split('=');
- // Ignore the 'q' path argument, if present.
- if (pair[0] != 'q' && pair[1]) {
- args[decodeURIComponent(pair[0].replace(/\+/g, ' '))] = decodeURIComponent(pair[1].replace(/\+/g, ' '));
+ Drupal.Views.parseQueryString = function (query) {
+ var args = {};
+ var pos = query.indexOf('?');
+ if (pos != -1) {
+ query = query.substring(pos + 1);
+ }
+ var pairs = query.split('&');
+ for (var i in pairs) {
+ if (typeof(pairs[i]) == 'string') {
+ var pair = pairs[i].split('=');
+ // Ignore the 'q' path argument, if present.
+ if (pair[0] != 'q' && pair[1]) {
+ args[decodeURIComponent(pair[0].replace(/\+/g, ' '))] = decodeURIComponent(pair[1].replace(/\+/g, ' '));
+ }
}
}
- }
- return args;
-};
+ return args;
+ };
-/**
+ /**
* Helper function to return a view's arguments based on a path.
*/
-Drupal.Views.parseViewArgs = function (href, viewPath) {
- var returnObj = {};
- var path = Drupal.Views.getPath(href);
- // Ensure we have a correct path.
- if (viewPath && path.substring(0, viewPath.length + 1) == viewPath + '/') {
- var args = decodeURIComponent(path.substring(viewPath.length + 1, path.length));
- returnObj.view_args = args;
- returnObj.view_path = path;
- }
- return returnObj;
-};
+ Drupal.Views.parseViewArgs = function (href, viewPath) {
-/**
+ // Provide language prefix.
+ if (Drupal.settings.pathPrefix) {
+ var viewPath = Drupal.settings.pathPrefix + viewPath;
+ }
+ var returnObj = {};
+ var path = Drupal.Views.getPath(href);
+ // Ensure we have a correct path.
+ if (viewPath && path.substring(0, viewPath.length + 1) == viewPath + '/') {
+ var args = decodeURIComponent(path.substring(viewPath.length + 1, path.length));
+ returnObj.view_args = args;
+ returnObj.view_path = path;
+ }
+ return returnObj;
+ };
+
+ /**
* Strip off the protocol plus domain from an href.
*/
-Drupal.Views.pathPortion = function (href) {
- // Remove e.g. http://example.com if present.
- var protocol = window.location.protocol;
- if (href.substring(0, protocol.length) == protocol) {
- // 2 is the length of the '//' that normally follows the protocol
- href = href.substring(href.indexOf('/', protocol.length + 2));
- }
- return href;
-};
+ Drupal.Views.pathPortion = function (href) {
+ // Remove e.g. http://example.com if present.
+ var protocol = window.location.protocol;
+ if (href.substring(0, protocol.length) == protocol) {
+ // 2 is the length of the '//' that normally follows the protocol.
+ href = href.substring(href.indexOf('/', protocol.length + 2));
+ }
+ return href;
+ };
-/**
+ /**
* Return the Drupal path portion of an href.
*/
-Drupal.Views.getPath = function (href) {
- href = Drupal.Views.pathPortion(href);
- href = href.substring(Drupal.settings.basePath.length, href.length);
- // 3 is the length of the '?q=' added to the url without clean urls.
- if (href.substring(0, 3) == '?q=') {
- href = href.substring(3, href.length);
- }
- var chars = ['#', '?', '&'];
- for (i in chars) {
- if (href.indexOf(chars[i]) > -1) {
- href = href.substr(0, href.indexOf(chars[i]));
+ Drupal.Views.getPath = function (href) {
+ href = Drupal.Views.pathPortion(href);
+ href = href.substring(Drupal.settings.basePath.length, href.length);
+ // 3 is the length of the '?q=' added to the url without clean urls.
+ if (href.substring(0, 3) == '?q=') {
+ href = href.substring(3, href.length);
}
- }
- return href;
-};
+ var chars = ['#', '?', '&'];
+ for (var i in chars) {
+ if (href.indexOf(chars[i]) > -1) {
+ href = href.substr(0, href.indexOf(chars[i]));
+ }
+ }
+ return href;
+ };
})(jQuery);
diff --git a/sites/all/modules/contrib/views/views/js/jquery.ui.dialog.patch.js b/sites/all/modules/contrib/views/views/js/jquery.ui.dialog.patch.js
index 3ac7704..bc468f7 100644
--- a/sites/all/modules/contrib/views/views/js/jquery.ui.dialog.patch.js
+++ b/sites/all/modules/contrib/views/views/js/jquery.ui.dialog.patch.js
@@ -1,4 +1,5 @@
/**
+ * @file
* This is part of a patch to address a jQueryUI bug. The bug is responsible
* for the inability to scroll a page when a modal dialog is active. If the content
* of the dialog extends beyond the bottom of the viewport, the user is only able
@@ -15,13 +16,16 @@
*
* The original code for this object:
* $.ui.dialog.overlay.events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
- * function(event) { return event + '.dialog-overlay'; }).join(' '),
- *
+ * function(event) {
+ * return event + '.dialog-overlay';
+ * }).join(' '),
*/
(function ($, undefined) {
if ($.ui && $.ui.dialog && $.ui.dialog.overlay) {
$.ui.dialog.overlay.events = $.map('focus,keydown,keypress'.split(','),
- function(event) { return event + '.dialog-overlay'; }).join(' ');
+ function(event) {
+ return event + '.dialog-overlay';
+ }).join(' ');
}
}(jQuery));
diff --git a/sites/all/modules/contrib/views/views/js/views-admin.js b/sites/all/modules/contrib/views/views/js/views-admin.js
index 2b4ccf3..3c55750 100644
--- a/sites/all/modules/contrib/views/views/js/views-admin.js
+++ b/sites/all/modules/contrib/views/views/js/views-admin.js
@@ -187,7 +187,8 @@ Drupal.viewsUi.addItemForm.prototype.handleCheck = function (event) {
else {
var length = this.checkedItems.length;
var position = jQuery.inArray(label, this.checkedItems);
- // Delete the item from the list and take sure that the list doesn't have undefined items left.
+ // Delete the item from the list and take sure that the list doesn't have
+ // undefined items left.
for (var i = 0; i < this.checkedItems.length; i++) {
if (i == position) {
this.checkedItems.splice(i, 1);
@@ -245,7 +246,7 @@ Drupal.behaviors.viewsUiRenderAddViewButton.attach = function (context, settings
});
$addDisplayDropdown.appendTo($menu);
- // Add the click handler for the add display button
+ // Add the click handler for the add display button.
$('li.add > a', $menu).bind('click', function (event) {
event.preventDefault();
var $trigger = $(this);
@@ -352,7 +353,7 @@ Drupal.viewsUi.OptionsSearch.prototype.handleKeyup = function (event) {
// Determine the user's search query. The search text has been converted to
// lowercase.
- search = this.$searchBox.val().toLowerCase();
+ search = (this.$searchBox.val() || '').toLowerCase();
words = search.split(' ');
wordsLength = words.length;
@@ -668,7 +669,7 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.modifyTableDrag = function () {
// Make sure the "group" dropdown is properly updated when rows are dragged
// into an empty filter group. This is borrowed heavily from the block.js
- // implementation of tableDrag.onDrop().
+ // Implements tableDrag.onDrop().
var groupRow = $(this.rowObject.element).prevAll('tr.group-message').get(0);
var groupName = groupRow.className.replace(/([^ ]+[ ]+)*group-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
var groupField = $('select.views-group-select', this.rowObject.element);
@@ -769,14 +770,14 @@ Drupal.behaviors.viewsFilterConfigSelectAll.attach = function(context) {
$('#views-ui-config-item-form div.form-item-options-value-all', context).once(function() {
$(this).show();
})
- .find('input[type=checkbox]')
- .click(function() {
- var checked = $(this).is(':checked');
- // Update all checkbox beside the select all checkbox.
- $(this).parents('.form-checkboxes').find('input[type=checkbox]').each(function() {
- $(this).attr('checked', checked);
+ .find('input[type=checkbox]')
+ .click(function() {
+ var checked = $(this).is(':checked');
+ // Update all checkbox beside the select all checkbox.
+ $(this).parents('.form-checkboxes').find('input[type=checkbox]').each(function() {
+ $(this).attr('checked', checked);
+ });
});
- });
// Uncheck the select all checkbox if any of the others are unchecked.
$('#views-ui-config-item-form div.form-type-checkbox').not($('.form-item-options-value-all')).find('input[type=checkbox]').each(function() {
$(this).click(function() {
@@ -926,7 +927,7 @@ Drupal.behaviors.viewsUiOverrideSelect.attach = function (context, settings) {
$submit.val(Drupal.t('Apply (this display)'));
}
})
- .trigger('change');
+ .trigger('change');
});
};
@@ -935,13 +936,14 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
var $ = jQuery;
var $modal = $('.views-ui-dialog');
var $scroll = $('.scroll', $modal);
- if ($modal.size() == 0 || $modal.css('display') == 'none') {
+ if ($modal.length == 0 || $modal.css('display') == 'none') {
return;
}
- var maxWidth = parseInt($(window).width() * .85); // 70% of window
- var minWidth = parseInt($(window).width() * .6); // 70% of window
-
+ var maxWidth = parseInt($(window).width() * .85);
+ // 70% of window.
+ var minWidth = parseInt($(window).width() * .6);
+ // 70% of window.
// Set the modal to the minwidth so that our width calculation of
// children works.
$modal.css('width', minWidth);
@@ -976,7 +978,6 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
// Now, calculate what the difference between the scroll and the modal
// will be.
-
var difference = 0;
difference += parseInt($scroll.css('padding-top'));
difference += parseInt($scroll.css('padding-bottom'));
@@ -1001,7 +1002,7 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
width = maxWidth;
}
- // Get where we should move content to
+ // Get where we should move content to.
var top = ($(window).height() / 2) - (height / 2);
var left = ($(window).width() / 2) - (width / 2);
diff --git a/sites/all/modules/contrib/views/views/js/views-contextual.js b/sites/all/modules/contrib/views/views/js/views-contextual.js
index a2bbc2a..5245af6 100644
--- a/sites/all/modules/contrib/views/views/js/views-contextual.js
+++ b/sites/all/modules/contrib/views/views/js/views-contextual.js
@@ -4,13 +4,13 @@
*/
(function ($) {
-Drupal.behaviors.viewsContextualLinks = {
- attach: function (context) {
- // If there are views-related contextual links attached to the main page
- // content, find the smallest region that encloses both the links and the
- // view, and display it as a contextual links region.
- $('.views-contextual-links-page', context).closest(':has(".view"):not("body")').addClass('contextual-links-region');
- }
-};
+ Drupal.behaviors.viewsContextualLinks = {
+ attach: function (context) {
+ // If there are views-related contextual links attached to the main page
+ // content, find the smallest region that encloses both the links and the
+ // view, and display it as a contextual links region.
+ $('.views-contextual-links-page', context).closest(':has(".view"):not("body")').addClass('contextual-links-region');
+ }
+ };
})(jQuery);
diff --git a/sites/all/modules/contrib/views/views/js/views-list.js b/sites/all/modules/contrib/views/views/js/views-list.js
index 9c6c5f0..be67103 100644
--- a/sites/all/modules/contrib/views/views/js/views-list.js
+++ b/sites/all/modules/contrib/views/views/js/views-list.js
@@ -4,18 +4,18 @@
*/
(function ($) {
-Drupal.behaviors.viewsUIList = {
- attach: function (context) {
- $('#ctools-export-ui-list-items thead a').once('views-ajax-processed').each(function() {
- $(this).click(function() {
- var query = $.deparam.querystring(this.href);
- $('#ctools-export-ui-list-form select[name=order]').val(query['order']);
- $('#ctools-export-ui-list-form select[name=sort]').val(query['sort']);
- $('#ctools-export-ui-list-form input.ctools-auto-submit-click').trigger('click');
- return false;
+ Drupal.behaviors.viewsUIList = {
+ attach: function (context) {
+ $('#ctools-export-ui-list-items thead a').once('views-ajax-processed').each(function() {
+ $(this).click(function() {
+ var query = $.deparam.querystring(this.href);
+ $('#ctools-export-ui-list-form select[name=order]').val(query['order']);
+ $('#ctools-export-ui-list-form select[name=sort]').val(query['sort']);
+ $('#ctools-export-ui-list-form input.ctools-auto-submit-click').trigger('click');
+ return false;
+ });
});
- });
- }
-};
+ }
+ };
})(jQuery);
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator.views.inc b/sites/all/modules/contrib/views/views/modules/aggregator.views.inc
index 0fcae2c..54f2a40 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator.views.inc
@@ -12,13 +12,12 @@
*/
function aggregator_views_data() {
// ----------------------------------------------------------------------
- // Main Aggregator Item base table
-
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // Main Aggregator Item base table.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['aggregator_item']['table']['group'] = t('Aggregator');
- // Advertise this table as a possible base table
+ // Advertise this table as a possible base table.
$data['aggregator_item']['table']['base'] = array(
'field' => 'iid',
'title' => t('Aggregator item'),
@@ -27,43 +26,25 @@ function aggregator_views_data() {
// ----------------------------------------------------------------
// Fields
-
- // item id.
- $data['aggregator_item']['iid'] = array(
- 'title' => t('Feed Item ID'),
- 'help' => t('The unique ID of the aggregator item.'),
- 'field' => array(
- 'handler' => 'views_handler_field_numeric',
- 'click sortable' => TRUE,
- ),
- 'argument' => array(
- 'handler' => 'views_handler_argument_numeric',
- 'numeric' => TRUE,
- ),
- 'filter' => array(
- 'handler' => 'views_handler_filter_numeric',
- ),
- 'sort' => array(
- 'handler' => 'views_handler_sort',
- ),
- );
-
- // iid
+ // Item ID / 'iid'.
$data['aggregator_item']['iid'] = array(
+ // The item it appears as on the UI,
'title' => t('Item ID'),
- 'help' => t('The unique ID of the aggregator item.'), // The help that appears on the UI,
- // Information for displaying the iid
+ // The help that appears on the UI,
+ 'help' => t('The unique ID of the aggregator item.'),
+ // Information for displaying the iid.
'field' => array(
'handler' => 'views_handler_field_numeric',
'click sortable' => TRUE,
),
- // Information for accepting a iid as an argument
+ // Information for accepting a iid as an argument.
'argument' => array(
'handler' => 'views_handler_argument_aggregator_iid',
- 'name field' => 'title', // the field to display in the summary.
+ 'name field' => 'title',
+ // The field to display in the summary.
'numeric' => TRUE,
),
- // Information for accepting a nid as a filter
+ // Information for accepting a nid as a filter.
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -73,55 +54,58 @@ function aggregator_views_data() {
),
);
- // title
+ // Title.
$data['aggregator_item']['title'] = array(
- 'title' => t('Title'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Title'),
'help' => t('The title of the aggregator item.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_aggregator_title_link',
'extra' => array('link'),
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
);
- // link
+ // Link.
$data['aggregator_item']['link'] = array(
- 'title' => t('Link'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Link'),
'help' => t('The link to the original source URL of the item.'),
'field' => array(
'handler' => 'views_handler_field_url',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
);
- // author
+ // Author.
$data['aggregator_item']['author'] = array(
- 'title' => t('Author'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Author'),
'help' => t('The author of the original imported item.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_aggregator_xss',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -130,19 +114,20 @@ function aggregator_views_data() {
),
);
- // guid
+ // 'guid'.
$data['aggregator_item']['guid'] = array(
- 'title' => t('GUID'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('GUID'),
'help' => t('The guid of the original imported item.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_xss',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -151,34 +136,36 @@ function aggregator_views_data() {
),
);
- // feed body
+ // Feed body.
$data['aggregator_item']['description'] = array(
- 'title' => t('Body'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Body'),
'help' => t('The actual content of the imported item.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_aggregator_xss',
'click sortable' => FALSE,
- ),
- // Information for accepting a title as a filter
+ ),
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
);
- // item timestamp
+ // Item timestamp.
$data['aggregator_item']['timestamp'] = array(
- 'title' => t('Timestamp'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Timestamp'),
'help' => t('The date the original feed item was posted. (With some feeds, this will be the date it was imported.)'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort_date',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_date',
),
@@ -187,10 +174,8 @@ function aggregator_views_data() {
),
);
-
// ----------------------------------------------------------------------
- // Aggregator feed table
-
+ // Aggregator feed table.
$data['aggregator_feed']['table']['group'] = t('Aggregator feed');
// Explain how this table joins to others.
@@ -201,22 +186,25 @@ function aggregator_views_data() {
),
);
- // fid
+ // Feed ID / 'fid'.
$data['aggregator_feed']['fid'] = array(
+ // The item it appears as on the UI,
'title' => t('Feed ID'),
- 'help' => t('The unique ID of the aggregator feed.'), // The help that appears on the UI,
- // Information for displaying the fid
+ // The help that appears on the UI,
+ 'help' => t('The unique ID of the aggregator feed.'),
+ // Information for displaying the fid.
'field' => array(
'handler' => 'views_handler_field_numeric',
'click sortable' => TRUE,
),
- // Information for accepting a fid as an argument
+ // Information for accepting a fid as an argument.
'argument' => array(
'handler' => 'views_handler_argument_aggregator_fid',
- 'name field' => 'title', // the field to display in the summary.
+ 'name field' => 'title',
+ // The field to display in the summary.
'numeric' => TRUE,
),
- // Information for accepting a nid as a filter
+ // Information for accepting a nid as a filter.
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -226,20 +214,22 @@ function aggregator_views_data() {
),
);
- // title
+ // Title.
$data['aggregator_feed']['title'] = array(
- 'title' => t('Title'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Title'),
+ // The help that appears on the UI,
'help' => t('The title of the aggregator feed.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_aggregator_title_link',
'extra' => array('link'),
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -248,15 +238,16 @@ function aggregator_views_data() {
),
);
- // link
+ // Link.
$data['aggregator_feed']['link'] = array(
- 'title' => t('Link'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Link'),
'help' => t('The link to the source URL of the feed.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_url',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -265,15 +256,16 @@ function aggregator_views_data() {
),
);
- // feed last updated
+ // Feed last updated.
$data['aggregator_feed']['checked'] = array(
- 'title' => t('Last checked'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Last checked'),
'help' => t('The date the feed was last checked for new content.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort_date',
),
@@ -285,33 +277,35 @@ function aggregator_views_data() {
),
);
- // feed description
+ // Feed description.
$data['aggregator_feed']['description'] = array(
- 'title' => t('Description'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Description'),
'help' => t('The description of the aggregator feed.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_xss',
'click sortable' => FALSE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
);
- // feed last updated
+ // Feed last updated.
$data['aggregator_feed']['modified'] = array(
- 'title' => t('Last modified'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Last modified'),
'help' => t('The date of the most recent new content on the feed.'),
- // Information for displaying a title as a field
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort_date',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_date',
),
@@ -321,8 +315,7 @@ function aggregator_views_data() {
);
// ----------------------------------------------------------------------
- // Aggregator category feed table
-
+ // Aggregator category feed table.
$data['aggregator_category_feed']['table']['join'] = array(
'aggregator_item' => array(
'left_field' => 'fid',
@@ -331,8 +324,7 @@ function aggregator_views_data() {
);
// ----------------------------------------------------------------------
- // Aggregator category table
-
+ // Aggregator category table.
$data['aggregator_category']['table']['group'] = t('Aggregator category');
$data['aggregator_category']['table']['join'] = array(
@@ -343,7 +335,7 @@ function aggregator_views_data() {
),
);
- // cid
+ // Category ID / 'cid'.
$data['aggregator_category']['cid'] = array(
'title' => t('Category ID'),
'help' => t('The unique ID of the aggregator category.'),
@@ -364,14 +356,14 @@ function aggregator_views_data() {
),
);
- // title
+ // Title.
$data['aggregator_category']['title'] = array(
'title' => t('Category'),
'help' => t('The title of the aggregator category.'),
'field' => array(
'handler' => 'views_handler_field_aggregator_category',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -388,15 +380,18 @@ function aggregator_views_data() {
*/
function aggregator_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
+ 'module' => 'views',
+ // This just tells our themes are elsewhere.
'row' => array(
'aggregator_rss' => array(
'title' => t('Aggregator item'),
'help' => t('Display the aggregator item using the data from the original source.'),
'handler' => 'views_plugin_row_aggregator_rss',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
+ 'path' => drupal_get_path('module', 'views') . '/modules/node',
+ // Not necessary for most modules.
'theme' => 'views_view_row_rss',
- 'base' => array('aggregator_item'), // only works with 'node' as base.
+ 'base' => array('aggregator_item'),
+ // Only works with 'node' as base.
'uses options' => TRUE,
'type' => 'feed',
'help topic' => 'style-aggregator-rss',
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
index 92ae8b7..343201f 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_aggregator_category_cid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title(). Get the title of the category.
*/
- function title_query() {
+ public function title_query() {
$titles = array();
$result = db_query("SELECT c.title FROM {aggregator_category} c WHERE c.cid IN (:cid)", array(':cid' => $this->value));
@@ -23,4 +24,5 @@ class views_handler_argument_aggregator_category_cid extends views_handler_argum
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_fid.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_fid.inc
index 4147626..4c3f793 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_fid.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_fid.inc
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_aggregator_fid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title(). Get the title of the feed.
*/
- function title_query() {
+ public function title_query() {
$titles = array();
$result = db_query("SELECT f.title FROM {aggregator_feed} f WHERE f.fid IN (:fids)", array(':fids' => $this->value));
@@ -23,4 +24,5 @@ class views_handler_argument_aggregator_fid extends views_handler_argument_numer
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_iid.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_iid.inc
index 4c7824e..edae517 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_iid.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_argument_aggregator_iid.inc
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_aggregator_iid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title(). Get the title of the category.
*/
- function title_query() {
+ public function title_query() {
$titles = array();
$placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
@@ -27,4 +28,5 @@ class views_handler_argument_aggregator_iid extends views_handler_argument_numer
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_category.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_category.inc
index 99fffa1..0630d0d 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_category.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_category.inc
@@ -12,15 +12,19 @@
* @ingroup views_field_handlers
*/
class views_handler_field_aggregator_category extends views_handler_field {
+
/**
* Constructor to provide additional field to add.
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->additional_fields['cid'] = 'cid';
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_category'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
@@ -29,7 +33,7 @@ class views_handler_field_aggregator_category extends views_handler_field {
/**
* Provide link to category option
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_category'] = array(
'#title' => t('Link this field to its aggregator category page'),
'#description' => t('This will override any other link you have set.'),
@@ -44,7 +48,7 @@ class views_handler_field_aggregator_category extends views_handler_field {
*
* Data should be made XSS safe prior to calling this function.
*/
- function render_link($data, $values) {
+ public function render_link($data, $values) {
$cid = $this->get_value($values, 'cid');
if (!empty($this->options['link_to_category']) && !empty($cid) && $data !== NULL && $data !== '') {
$this->options['alter']['make_link'] = TRUE;
@@ -53,8 +57,12 @@ class views_handler_field_aggregator_category extends views_handler_field {
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_title_link.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_title_link.inc
index d8bf578..fee000e 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_title_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_title_link.inc
@@ -6,18 +6,25 @@
*/
/**
- * Field handler that turns an item's title into a clickable link to the original
- * source article.
+ * Field handler that turns an item's title into a clickable link to the
+ * original source article.
*
* @ingroup views_field_handlers
*/
class views_handler_field_aggregator_title_link extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['link'] = 'link';
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['display_as_link'] = array('default' => TRUE, 'bool' => TRUE);
@@ -28,7 +35,7 @@ class views_handler_field_aggregator_title_link extends views_handler_field {
/**
* Provide link to the page being visited.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['display_as_link'] = array(
'#title' => t('Display as link'),
'#type' => 'checkbox',
@@ -37,12 +44,18 @@ class views_handler_field_aggregator_title_link extends views_handler_field {
parent::options_form($form, $form_state);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$link = $this->get_value($values, 'link');
if (!empty($this->options['display_as_link'])) {
$this->options['alter']['make_link'] = TRUE;
@@ -52,4 +65,5 @@ class views_handler_field_aggregator_title_link extends views_handler_field {
return $data;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_xss.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_xss.inc
index d39b101..66ecfc1 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_xss.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_field_aggregator_xss.inc
@@ -11,8 +11,13 @@
* @ingroup views_field_handlers
*/
class views_handler_field_aggregator_xss extends views_handler_field {
- function render($values) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return aggregator_filter_xss($value);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
index f9931c8..a8757a9 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_aggregator_category_cid extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (isset($this->value_options)) {
return;
}
@@ -23,4 +27,5 @@ class views_handler_filter_aggregator_category_cid extends views_handler_filter_
$this->value_options[$category->cid] = $category->title;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/aggregator/views_plugin_row_aggregator_rss.inc b/sites/all/modules/contrib/views/views/modules/aggregator/views_plugin_row_aggregator_rss.inc
index 672952e..ca5ab60 100644
--- a/sites/all/modules/contrib/views/views/modules/aggregator/views_plugin_row_aggregator_rss.inc
+++ b/sites/all/modules/contrib/views/views/modules/aggregator/views_plugin_row_aggregator_rss.inc
@@ -2,17 +2,28 @@
/**
* @file
- * Contains the Aggregator Item RSS row style plugin.
+ * Definition of views_plugin_row_aggregator_rss.
*/
/**
* Plugin which loads an aggregator item and formats it as an RSS item.
*/
class views_plugin_row_aggregator_rss extends views_plugin_row {
- var $base_table = 'aggregator_item';
- var $base_field = 'iid';
- function option_definition() {
+ /**
+ *
+ */
+ public $base_table = 'aggregator_item';
+
+ /**
+ *
+ */
+ public $base_field = 'iid';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['item_length'] = array('default' => 'default');
@@ -20,7 +31,10 @@ class views_plugin_row_aggregator_rss extends views_plugin_row {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['item_length'] = array(
'#type' => 'select',
'#title' => t('Display type'),
@@ -34,7 +48,10 @@ class views_plugin_row_aggregator_rss extends views_plugin_row {
);
}
- function render($row) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($row) {
$iid = $row->{$this->field_alias};
$sql = "SELECT ai.iid, ai.fid, ai.title, ai.link, ai.author, ai.description, ";
$sql .= "ai.timestamp, ai.guid, af.title AS feed_title, ai.link AS feed_LINK ";
@@ -71,4 +88,5 @@ class views_plugin_row_aggregator_rss extends views_plugin_row {
'row' => $item
));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/book.views.inc b/sites/all/modules/contrib/views/views/modules/book.views.inc
index 15a2183..87d5be6 100644
--- a/sites/all/modules/contrib/views/views/modules/book.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/book.views.inc
@@ -12,8 +12,7 @@
*/
function book_views_data() {
// ----------------------------------------------------------------------
- // book table
-
+ // 'book' table.
$data['book']['table']['group'] = t('Book');
$data['book']['table']['join'] = array(
'node' => array(
@@ -35,8 +34,7 @@ function book_views_data() {
);
// ----------------------------------------------------------------------
- // menu_links table -- this is aliased so we can get just book relations
-
+ // 'menu_links' table -- this is aliased so we can get just book relations.
// Book hierarchy and weight data are now in {menu_links}.
$data['book_menu_links']['table']['group'] = t('Book');
$data['book_menu_links']['table']['join'] = array(
@@ -87,9 +85,8 @@ function book_views_data() {
);
// ----------------------------------------------------------------------
- // book_parent table -- this is an alias of the book table which
+ // 'book_parent' table -- this is an alias of the book table which
// represents the parent book.
-
// The {book} record for the parent node.
$data['book_parent']['table']['group'] = t('Book');
$data['book_parent']['table']['join'] = array(
@@ -119,13 +116,13 @@ function book_views_data() {
* Implements hook_views_plugins().
*/
function book_views_plugins() {
- return array(
- 'module' => 'views',
- 'argument default' => array(
- 'book_root' => array(
- 'title' => t('Book root from current node'),
- 'handler' => 'views_plugin_argument_default_book_root'
- ),
- ),
- );
+ return array(
+ 'module' => 'views',
+ 'argument default' => array(
+ 'book_root' => array(
+ 'title' => t('Book root from current node'),
+ 'handler' => 'views_plugin_argument_default_book_root',
+ ),
+ ),
+ );
}
diff --git a/sites/all/modules/contrib/views/views/modules/book/views_plugin_argument_default_book_root.inc b/sites/all/modules/contrib/views/views/modules/book/views_plugin_argument_default_book_root.inc
index 1ce3046..38ecc89 100644
--- a/sites/all/modules/contrib/views/views/modules/book/views_plugin_argument_default_book_root.inc
+++ b/sites/all/modules/contrib/views/views/modules/book/views_plugin_argument_default_book_root.inc
@@ -1,14 +1,19 @@
t('Title'),
'help' => t('The title of the comment.'),
@@ -57,7 +55,7 @@ function comment_views_data() {
),
);
- // cid
+ // Comment ID / 'cid'.
$data['comment']['cid'] = array(
'title' => t('ID'),
'help' => t('The comment ID of the field'),
@@ -76,7 +74,7 @@ function comment_views_data() {
),
);
- // name (of comment author)
+ // Username of the comment author.
$data['comment']['name'] = array(
'title' => t('Author'),
'help' => t("The name of the comment's author. Can be rendered as a link to the author's homepage."),
@@ -95,7 +93,7 @@ function comment_views_data() {
),
);
- // homepage
+ // Homepage.
$data['comment']['homepage'] = array(
'title' => t("Author's website"),
'help' => t("The website address of the comment's author. Can be rendered as a link. Will be empty if the author is a registered user."),
@@ -114,14 +112,14 @@ function comment_views_data() {
),
);
- // hostname
+ // hostname.
$data['comment']['hostname'] = array(
'title' => t('Hostname'),
'help' => t('Hostname of user that posted the comment.'),
'field' => array(
'handler' => 'views_handler_field',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -133,14 +131,14 @@ function comment_views_data() {
),
);
- // mail
+ // Email address.
$data['comment']['mail'] = array(
'title' => t('Mail'),
'help' => t('Email of user that posted the comment. Will be empty if the author is a registered user.'),
'field' => array(
'handler' => 'views_handler_field',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -152,7 +150,7 @@ function comment_views_data() {
),
);
- // created (when comment was posted)
+ // Created - when comment was posted.
$data['comment']['created'] = array(
'title' => t('Post date'),
'help' => t('Date and time of when the comment was created.'),
@@ -168,8 +166,61 @@ function comment_views_data() {
),
);
+ $data['comment']['created_fulldata'] = array(
+ 'title' => t('Created date'),
+ 'help' => t('Date in the form of CCYYMMDD.'),
+ 'argument' => array(
+ 'field' => 'created',
+ 'handler' => 'views_handler_argument_node_created_fulldate',
+ ),
+ );
- // Language field
+ $data['comment']['created_year_month'] = array(
+ 'title' => t('Created year + month'),
+ 'help' => t('Date in the form of YYYYMM.'),
+ 'argument' => array(
+ 'field' => 'created',
+ 'handler' => 'views_handler_argument_node_created_year_month',
+ ),
+ );
+
+ $data['comment']['created_year'] = array(
+ 'title' => t('Created year'),
+ 'help' => t('Date in the form of YYYY.'),
+ 'argument' => array(
+ 'field' => 'created',
+ 'handler' => 'views_handler_argument_node_created_year',
+ ),
+ );
+
+ $data['comment']['created_month'] = array(
+ 'title' => t('Created month'),
+ 'help' => t('Date in the form of MM (01 - 12).'),
+ 'argument' => array(
+ 'field' => 'created',
+ 'handler' => 'views_handler_argument_node_created_month',
+ ),
+ );
+
+ $data['comment']['created_day'] = array(
+ 'title' => t('Created day'),
+ 'help' => t('Date in the form of DD (01 - 31).'),
+ 'argument' => array(
+ 'field' => 'created',
+ 'handler' => 'views_handler_argument_node_created_day',
+ ),
+ );
+
+ $data['comment']['created_week'] = array(
+ 'title' => t('Created week'),
+ 'help' => t('Date in the form of WW (01 - 53).'),
+ 'argument' => array(
+ 'field' => 'created',
+ 'handler' => 'views_handler_argument_node_created_week',
+ ),
+ );
+
+ // Language field.
if (module_exists('locale')) {
$data['comment']['language'] = array(
'title' => t('Language'),
@@ -191,7 +242,7 @@ function comment_views_data() {
}
$data['comments']['timestamp']['moved to'] = array('comment', 'changed');
- // changed (when comment was last updated)
+ // Changed (when comment was last updated).
$data['comment']['changed'] = array(
'title' => t('Updated date'),
'help' => t('Date and time of when the comment was last updated.'),
@@ -209,7 +260,7 @@ function comment_views_data() {
$data['comments']['timestamp_fulldate']['moved to'] = array('comment', 'changed_fulldata');
$data['comment']['changed_fulldata'] = array(
- 'title' => t('Created date'),
+ 'title' => t('Changed date'),
'help' => t('Date in the form of CCYYMMDD.'),
'argument' => array(
'field' => 'changed',
@@ -219,7 +270,7 @@ function comment_views_data() {
$data['comments']['timestamp_year_month']['moved to'] = array('comment', 'changed_year_month');
$data['comment']['changed_year_month'] = array(
- 'title' => t('Created year + month'),
+ 'title' => t('Changed year + month'),
'help' => t('Date in the form of YYYYMM.'),
'argument' => array(
'field' => 'changed',
@@ -229,7 +280,7 @@ function comment_views_data() {
$data['comments']['timestamp_year']['moved to'] = array('comment', 'changed_year');
$data['comment']['changed_year'] = array(
- 'title' => t('Created year'),
+ 'title' => t('Changed year'),
'help' => t('Date in the form of YYYY.'),
'argument' => array(
'field' => 'changed',
@@ -239,7 +290,7 @@ function comment_views_data() {
$data['comments']['timestamp_month']['moved to'] = array('comment', 'changed_month');
$data['comment']['changed_month'] = array(
- 'title' => t('Created month'),
+ 'title' => t('Changed month'),
'help' => t('Date in the form of MM (01 - 12).'),
'argument' => array(
'field' => 'changed',
@@ -249,7 +300,7 @@ function comment_views_data() {
$data['comments']['timestamp_day']['moved to'] = array('comment', 'changed_day');
$data['comment']['changed_day'] = array(
- 'title' => t('Created day'),
+ 'title' => t('Changed day'),
'help' => t('Date in the form of DD (01 - 31).'),
'argument' => array(
'field' => 'changed',
@@ -259,7 +310,7 @@ function comment_views_data() {
$data['comments']['timestamp_week']['moved to'] = array('comment', 'changed_week');
$data['comment']['changed_week'] = array(
- 'title' => t('Created week'),
+ 'title' => t('Changed week'),
'help' => t('Date in the form of WW (01 - 53).'),
'argument' => array(
'field' => 'changed',
@@ -267,7 +318,7 @@ function comment_views_data() {
),
);
- // status (approved or not)
+ // Status (approved or not).
$data['comment']['status'] = array(
'title' => t('Approved'),
'help' => t('Whether the comment is approved (or still in the moderation queue).'),
@@ -288,7 +339,7 @@ function comment_views_data() {
),
);
- // link to view comment
+ // Link to view comment.
$data['comment']['view_comment'] = array(
'field' => array(
'title' => t('View link'),
@@ -297,7 +348,7 @@ function comment_views_data() {
),
);
- // link to edit comment
+ // Link to edit comment.
$data['comment']['edit_comment'] = array(
'field' => array(
'title' => t('Edit link'),
@@ -306,7 +357,7 @@ function comment_views_data() {
),
);
- // link to delete comment
+ // Link to delete comment.
$data['comment']['delete_comment'] = array(
'field' => array(
'title' => t('Delete link'),
@@ -315,8 +366,7 @@ function comment_views_data() {
),
);
-
- // link to approve comment
+ // Link to approve comment.
$data['comment']['approve_comment'] = array(
'field' => array(
'title' => t('Approve link'),
@@ -325,7 +375,7 @@ function comment_views_data() {
),
);
- // link to reply to comment
+ // Link to reply to comment.
$data['comment']['replyto_comment'] = array(
'field' => array(
'title' => t('Reply-to link'),
@@ -408,22 +458,21 @@ function comment_views_data() {
);
// ----------------------------------------------------------------------
- // node_comment_statistics table
-
- // define the group
+ // 'node_comment_statistics' table.
+ // Define the group.
$data['node_comment_statistics']['table']['group'] = t('Content');
- // joins
+ // Joins.
$data['node_comment_statistics']['table']['join'] = array(
- //...to the node table
+ // ...to the node table.
'node' => array(
'type' => 'INNER',
'left_field' => 'nid',
'field' => 'nid',
- ),
+ ),
);
- // last_comment_timestamp
+ // Timestamp of the last comment.
$data['node_comment_statistics']['last_comment_timestamp'] = array(
'title' => t('Last comment time'),
'help' => t('Date and time of when the last comment was posted.'),
@@ -439,7 +488,7 @@ function comment_views_data() {
),
);
- // last_comment_name (author's name)
+ // Last comment author's username.
$data['node_comment_statistics']['last_comment_name'] = array(
'title' => t("Last comment author"),
'help' => t('The name of the author of the last posted comment.'),
@@ -454,7 +503,7 @@ function comment_views_data() {
),
);
- // comment_count
+ // Comment count.
$data['node_comment_statistics']['comment_count'] = array(
'title' => t('Comment count'),
'help' => t('The number of comments a node has.'),
@@ -473,7 +522,7 @@ function comment_views_data() {
),
);
- // last_comment_timestamp
+ // Timestamp of when the last comment update happened.
$data['node_comment_statistics']['last_updated'] = array(
'title' => t('Updated/commented date'),
'help' => t('The most recent of last comment posted or node updated time.'),
@@ -505,7 +554,7 @@ function comment_views_data() {
),
);
- // last_comment_uid
+ // The user ID / 'uid' of the user who last posted a comment.
$data['node_comment_statistics']['last_comment_uid'] = array(
'title' => t('Last comment uid'),
'help' => t('The User ID of the author of the last comment of a node.'),
@@ -531,11 +580,12 @@ function comment_views_data() {
}
/**
- * Use views_data_alter to add items to the node table that are
- * relevant to comments.
+ * Implements hook_views_data_alter() on behalf of comment.module.
+ *
+ * Add items to the node table that are relevant to comments.
*/
function comment_views_data_alter(&$data) {
- // new comments
+ // New comments.
$data['node']['new_comments'] = array(
'title' => t('New comments'),
'help' => t('The number of new comments on the node.'),
@@ -553,7 +603,7 @@ function comment_views_data_alter(&$data) {
),
);
- // Comment status of the node
+ // Comment status of the node.
$data['node']['comment'] = array(
'title' => t('Comment status'),
'help' => t('Whether comments are enabled or disabled on the node.'),
@@ -583,7 +633,7 @@ function comment_views_data_alter(&$data) {
'field' => 'uid',
'name table' => 'users',
'name field' => 'name',
- 'handler' => 'views_handler_filter_comment_user_uid'
+ 'handler' => 'views_handler_filter_comment_user_uid',
),
);
@@ -599,7 +649,6 @@ function comment_views_data_alter(&$data) {
'handler' => 'views_handler_relationship',
),
);
-
}
/**
@@ -614,8 +663,10 @@ function comment_views_plugins() {
'help' => t('Display the comment with standard comment view.'),
'handler' => 'views_plugin_row_comment_view',
'theme' => 'views_view_row_comment',
- 'path' => drupal_get_path('module', 'views') . '/modules/comment', // not necessary for most modules
- 'base' => array('comment'), // only works with 'comment' as base.
+ 'path' => drupal_get_path('module', 'views') . '/modules/comment',
+ // Not necessary for most modules.
+ 'base' => array('comment'),
+ // Only works with 'comment' as base.
'uses options' => TRUE,
'type' => 'normal',
'help topic' => 'style-comment',
@@ -625,8 +676,10 @@ function comment_views_plugins() {
'help' => t('Display the comment as RSS.'),
'handler' => 'views_plugin_row_comment_rss',
'theme' => 'views_view_row_rss',
- 'path' => drupal_get_path('module', 'views') . '/modules/comment', // not necessary for most modules
- 'base' => array('comment'), // only works with 'comment' as base.
+ 'path' => drupal_get_path('module', 'views') . '/modules/comment',
+ // Not necessary for most modules.
+ 'base' => array('comment'),
+ // Only works with 'comment' as base.
'uses options' => TRUE,
'type' => 'feed',
'help topic' => 'style-comment-rss',
@@ -636,7 +689,7 @@ function comment_views_plugins() {
}
/**
- * Template helper for theme_views_view_row_comment
+ * Template helper for theme_views_view_row_comment.
*/
function template_preprocess_views_view_row_comment(&$vars) {
$options = $vars['options'];
@@ -648,9 +701,9 @@ function template_preprocess_views_view_row_comment(&$vars) {
$node->view = &$view;
$build = comment_view_multiple(array($comment->cid => $comment), $node, $plugin->options['view_mode']);
- // If we're displaying the comments without links, remove them from the
- // renderable array. There is no way to avoid building them in the first
- // place (see comment_build_content()).
+ // If displaying the comments without links, remove them from the renderable
+ // array; there is no way to avoid building them in the first place.
+ // @see comment_build_content()
if (empty($options['links'])) {
foreach ($build as $cid => &$comment_build) {
if (isset($comment_build['links'])) {
diff --git a/sites/all/modules/contrib/views/views/modules/comment.views_default.inc b/sites/all/modules/contrib/views/views/modules/comment.views_default.inc
index d0c4796..cee9227 100644
--- a/sites/all/modules/contrib/views/views/modules/comment.views_default.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment.views_default.inc
@@ -6,12 +6,12 @@
*/
/**
- * Implementation of hook_views_default_views()
+ * Implements hook_views_default_views().
*/
function comment_views_default_views() {
$views = array();
- $view = new view;
+ $view = new view();
$view->name = 'comments_recent';
$view->description = 'Contains a block and a page to list recent comments; the block will automatically link to the page, which displays the comment body as well as a link to the node.';
$view->tag = 'default';
@@ -122,7 +122,7 @@ function comment_views_default_views() {
$views['comments_recent'] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'tracker';
$view->description = 'Shows all new activity on system.';
$view->tag = 'default';
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_argument_comment_user_uid.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_argument_comment_user_uid.inc
index d821f32..7748b40 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_argument_comment_user_uid.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_argument_comment_user_uid.inc
@@ -12,7 +12,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_comment_user_uid extends views_handler_argument {
- function title() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function title() {
if (!$this->argument) {
$title = variable_get('anonymous', t('Anonymous'));
}
@@ -26,7 +30,10 @@ class views_handler_argument_comment_user_uid extends views_handler_argument {
return check_plain($title);
}
- function default_actions($which = NULL) {
+ /**
+ * {@inheritdoc}
+ */
+ public function default_actions($which = NULL) {
// Disallow summary views on this argument.
if (!$which) {
$actions = parent::default_actions();
@@ -40,7 +47,10 @@ class views_handler_argument_comment_user_uid extends views_handler_argument {
}
}
- function query($group_by = FALSE) {
+ /**
+ * {@inheritdoc}
+ */
+ public function query($group_by = FALSE) {
$this->ensure_my_table();
$subselect = db_select('comment', 'c');
@@ -55,7 +65,11 @@ class views_handler_argument_comment_user_uid extends views_handler_argument {
$this->query->add_where(0, $condition);
}
- function get_sort_name() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_sort_name() {
return t('Numerical', array(), array('context' => 'Sort order'));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment.inc
index 7ca3256..596bb4a 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment.inc
@@ -11,10 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment extends views_handler_field {
+
/**
* Override init function to provide generic option to link to comment.
*/
- function init(&$view, &$options) {
+ public function init(&$view, &$options) {
parent::init($view, $options);
if (!empty($this->options['link_to_comment'])) {
$this->additional_fields['cid'] = 'cid';
@@ -22,7 +23,10 @@ class views_handler_field_comment extends views_handler_field {
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_comment'] = array('default' => TRUE, 'bool' => TRUE);
$options['link_to_node'] = array('default' => FALSE, 'bool' => TRUE);
@@ -31,9 +35,9 @@ class views_handler_field_comment extends views_handler_field {
}
/**
- * Provide link-to-comment option
+ * Provide link-to-comment option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_comment'] = array(
'#title' => t('Link this field to its comment'),
'#description' => t("Enable to override this field's links."),
@@ -48,7 +52,10 @@ class views_handler_field_comment extends views_handler_field {
parent::options_form($form, $form_state);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_comment'])) {
$this->options['alter']['make_link'] = TRUE;
$nid = $this->get_value($values, 'nid');
@@ -58,7 +65,7 @@ class views_handler_field_comment extends views_handler_field {
$this->options['alter']['fragment'] = "comment-" . $cid;
}
// If there is no comment link to the node.
- else if ($this->options['link_to_node']) {
+ elseif ($this->options['link_to_node']) {
$this->options['alter']['path'] = "node/" . $nid;
}
}
@@ -66,8 +73,12 @@ class views_handler_field_comment extends views_handler_field {
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_depth.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_depth.inc
index 4840a1e..8ea257d 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_depth.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_depth.inc
@@ -11,11 +11,13 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_depth extends views_handler_field {
+
/**
- * Work out the depth of this comment
+ * Work out the depth of this comment.
*/
- function render($values) {
+ public function render($values) {
$comment_thread = $this->get_value($values);
return count(explode('.', $comment_thread)) - 1;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link.inc
index 162924e..26fd483 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link.inc
@@ -11,18 +11,21 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_link extends views_handler_field_entity {
- function construct() {
- parent::construct();
- }
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['text'] = array('default' => '', 'translatable' => TRUE);
$options['link_to_node'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['text'] = array(
'#type' => 'textfield',
'#title' => t('Text to display'),
@@ -36,17 +39,26 @@ class views_handler_field_comment_link extends views_handler_field_entity {
parent::options_form($form, $form_state);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values, 'cid');
return $this->render_link($this->sanitize_value($value), $values);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$text = !empty($this->options['text']) ? $this->options['text'] : t('view');
$comment = $this->get_value($values);
$nid = $comment->nid;
@@ -60,10 +72,11 @@ class views_handler_field_comment_link extends views_handler_field_entity {
$this->options['alter']['fragment'] = "comment-" . $cid;
}
// If there is no comment link to the node.
- else if ($this->options['link_to_node']) {
+ elseif ($this->options['link_to_node']) {
$this->options['alter']['path'] = "node/" . $nid;
}
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_approve.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_approve.inc
index 0953d0c..b161eeb 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_approve.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_approve.inc
@@ -11,12 +11,19 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_link_approve extends views_handler_field_comment_link {
- function access() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
//needs permission to administer comments in general
return user_access('administer comments');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$status = $this->get_value($values, 'status');
// Don't show an approve link on published nodes.
@@ -33,4 +40,5 @@ class views_handler_field_comment_link_approve extends views_handler_field_comme
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_delete.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_delete.inc
index c55ac1c..6b230ea 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_delete.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_delete.inc
@@ -11,12 +11,19 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_link_delete extends views_handler_field_comment_link {
- function access() {
- //needs permission to administer comments in general
+
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
+ // Needs permission to administer comments in general.
return user_access('administer comments');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
$cid = $this->get_value($values, 'cid');
@@ -26,4 +33,5 @@ class views_handler_field_comment_link_delete extends views_handler_field_commen
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_edit.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_edit.inc
index 0b06c0e..96df9dc 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_edit.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_edit.inc
@@ -11,14 +11,21 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_link_edit extends views_handler_field_comment_link {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['destination'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['destination'] = array(
@@ -30,9 +37,12 @@ class views_handler_field_comment_link_edit extends views_handler_field_comment_
);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
parent::render_link($data, $values);
- // ensure user has access to edit this comment.
+ // Ensure user has access to edit this comment.
$comment = $this->get_value($values);
if (!comment_access('edit', $comment)) {
return;
@@ -49,4 +59,5 @@ class views_handler_field_comment_link_edit extends views_handler_field_comment_
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_reply.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_reply.inc
index 47d0f17..581b06d 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_reply.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_link_reply.inc
@@ -11,12 +11,19 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_link_reply extends views_handler_field_comment_link {
- function access() {
- //check for permission to reply to comments
+
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
+ // Check for permission to reply to comments.
return user_access('post comments');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$text = !empty($this->options['text']) ? $this->options['text'] : t('reply');
$nid = $this->get_value($values, 'nid');
$cid = $this->get_value($values, 'cid');
@@ -26,4 +33,5 @@ class views_handler_field_comment_link_reply extends views_handler_field_comment
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_node_link.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_node_link.inc
index 7feecfb..0e5ab6d 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_node_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_node_link.inc
@@ -11,10 +11,14 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_node_link extends views_handler_field_entity {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
- // Add the node fields that comment_link will need..
+ // Add the node fields that comment_link will need.
$this->additional_fields['nid'] = array(
'field' => 'nid',
);
@@ -26,13 +30,19 @@ class views_handler_field_comment_node_link extends views_handler_field_entity {
);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['teaser'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['teaser'] = array(
'#type' => 'checkbox',
'#title' => t('Show teaser-style link'),
@@ -43,22 +53,32 @@ class views_handler_field_comment_node_link extends views_handler_field_entity {
parent::options_form($form, $form_state);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
// Build fake $node.
$node = $this->get_value($values);
- // Call comment.module's hook_link: comment_link($type, $node = NULL, $teaser = FALSE)
- // Call node by reference so that something is changed here
+ // Call comment.module's hook_link:
+ // comment_link($type, $node = NULL, $teaser = FALSE)
+ // Call node by reference so that something is changed here.
comment_node_view($node, $this->options['teaser'] ? 'teaser' : 'full');
- // question: should we run these through: drupal_alter('link', $links, $node);
- // might this have unexpected consequences if these hooks expect items in $node that we don't have?
+ // Question: should we run these through:
+ // drupal_alter('link', $links, $node);
+ // Might this have unexpected consequences if these hooks expect items in
+ // $node that we don't have?
// Only render the links, if they are defined.
return !empty($node->content['links']['comment']) ? drupal_render($node->content['links']['comment']) : '';
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_username.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_username.inc
index 887a74e..7198d26 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_username.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_comment_username.inc
@@ -11,22 +11,29 @@
* @ingroup views_field_handlers
*/
class views_handler_field_comment_username extends views_handler_field {
+
/**
* Override init function to add uid and homepage fields.
*/
- function init(&$view, &$data) {
+ public function init(&$view, &$data) {
parent::init($view, $data);
$this->additional_fields['uid'] = 'uid';
$this->additional_fields['homepage'] = 'homepage';
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_user'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['link_to_user'] = array(
'#title' => t("Link this field to its user or an author's homepage"),
'#type' => 'checkbox',
@@ -35,7 +42,10 @@ class views_handler_field_comment_username extends views_handler_field {
parent::options_form($form, $form_state);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_user'])) {
$account = new stdClass();
$account->uid = $this->get_value($values, 'uid');
@@ -51,8 +61,12 @@ class views_handler_field_comment_username extends views_handler_field {
}
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_last_comment_timestamp.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_last_comment_timestamp.inc
index e7cf8bd..50dd8d1 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_last_comment_timestamp.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_last_comment_timestamp.inc
@@ -6,17 +6,24 @@
*/
/**
- * Field handler to display the timestamp of a comment with the count of comments.
+ * Field handler to display the timestamp of a comment with the comments count.
*
* @ingroup views_field_handlers
*/
class views_handler_field_last_comment_timestamp extends views_handler_field_date {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['comment_count'] = 'comment_count';
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$comment_count = $this->get_value($values, 'comment_count');
if (empty($this->options['empty_zero']) || $comment_count) {
return parent::render($values);
@@ -25,4 +32,5 @@ class views_handler_field_last_comment_timestamp extends views_handler_field_dat
return NULL;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_comment_name.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_comment_name.inc
index c9c6885..f38d3eb 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_comment_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_comment_name.inc
@@ -11,17 +11,22 @@
* @ingroup views_field_handlers
*/
class views_handler_field_ncs_last_comment_name extends views_handler_field {
- function query() {
- // last_comment_name only contains data if the user is anonymous. So we
- // have to join in a specially related user table.
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
+ // 'last_comment_name' only contains data if the user is anonymous, so join
+ // in a specially related user table.
$this->ensure_my_table();
- // join 'users' to this table via vid
+ // Join 'users' to this table via vid.
$join = new views_join();
$join->construct('users', $this->table_alias, 'last_comment_uid', 'uid');
$join->extra = array(array('field' => 'uid', 'operator' => '!=', 'value' => '0'));
- // ncs_user alias so this can work with the sort handler, below.
-// $this->user_table = $this->query->add_relationship(NULL, $join, 'users', $this->relationship);
+ // 'ncs_user' alias so this can work with the sort handler, below.
+ // $this->user_table = $this->query
+ // ->add_relationship(NULL, $join, 'users', $this->relationship);
$this->user_table = $this->query->ensure_table('ncs_users', $this->relationship, $join);
$this->field_alias = $this->query->add_field(NULL, "COALESCE($this->user_table.name, $this->table_alias.$this->field)", $this->table_alias . '_' . $this->field);
@@ -30,7 +35,10 @@ class views_handler_field_ncs_last_comment_name extends views_handler_field {
$this->uid = $this->query->add_field($this->table_alias, 'last_comment_uid');
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_user'] = array('default' => TRUE, 'bool' => TRUE);
@@ -38,7 +46,10 @@ class views_handler_field_ncs_last_comment_name extends views_handler_field {
return $options;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
if (!empty($this->options['link_to_user'])) {
$account = new stdClass();
$account->name = $this->get_value($values);
@@ -51,4 +62,5 @@ class views_handler_field_ncs_last_comment_name extends views_handler_field {
return $this->sanitize_value($this->get_value($values));
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_updated.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_updated.inc
index d1d7306..4d13551 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_updated.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_ncs_last_updated.inc
@@ -4,15 +4,21 @@
* @file
* Definition of views_handler_field_ncs_last_updated.
*/
+
/**
* Field handler to display the newer of last comment / node updated.
*
* @ingroup views_field_handlers
*/
class views_handler_field_ncs_last_updated extends views_handler_field_date {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->node_table = $this->query->ensure_table('node', $this->relationship);
$this->field_alias = $this->query->add_field(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->table_alias . ".last_comment_timestamp)", $this->table_alias . '_' . $this->field);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_comment.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_comment.inc
index d863c44..c76adbf 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_comment.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_comment.inc
@@ -11,7 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_node_comment extends views_handler_field {
- function render($values) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
switch ($value) {
case COMMENT_NODE_HIDDEN:
@@ -23,4 +27,5 @@ class views_handler_field_node_comment extends views_handler_field {
return t('Open');
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_new_comments.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_new_comments.inc
index 70b0581..776237a 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_new_comments.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_field_node_new_comments.inc
@@ -11,24 +11,34 @@
* @ingroup views_field_handlers
*/
class views_handler_field_node_new_comments extends views_handler_field_numeric {
- function init(&$view, &$options) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
- // translate an older setting:
+ // Translate an older setting.
if (!empty($options['no_empty'])) {
$this->options['hide_empty'] = TRUE;
unset($this->options['no_empty']);
}
}
- function construct() {
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['nid'] = 'nid';
$this->additional_fields['type'] = 'type';
$this->additional_fields['comment_count'] = array('table' => 'node_comment_statistics', 'field' => 'comment_count');
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_comment'] = array('default' => TRUE, 'bool' => TRUE);
@@ -36,7 +46,10 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['link_to_comment'] = array(
'#title' => t('Link this field to new comments'),
'#description' => t("Enable to override this field's links."),
@@ -47,13 +60,19 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
parent::options_form($form, $form_state);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
$this->field_alias = $this->table . '_' . $this->field;
}
- function pre_render(&$values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render(&$values) {
global $user;
if (!$user->uid || empty($values)) {
return;
@@ -89,7 +108,10 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
}
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_comment']) && $data !== NULL && $data !== '') {
$node = new stdClass();
$node->nid = $this->get_value($values, 'nid');
@@ -103,7 +125,10 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
if (!empty($value)) {
return $this->render_link(parent::render($values), $values);
@@ -112,4 +137,5 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
$this->options['alter']['make_link'] = FALSE;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_comment_user_uid.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_comment_user_uid.inc
index e76ebb7..199a33c 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_comment_user_uid.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_comment_user_uid.inc
@@ -12,7 +12,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_comment_user_uid extends views_handler_filter_user_name {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$subselect = db_select('comment', 'c');
@@ -26,4 +30,5 @@ class views_handler_filter_comment_user_uid extends views_handler_filter_user_na
$this->query->add_where($this->options['group'], $condition);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_ncs_last_updated.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_ncs_last_updated.inc
index 2319edf..e696390 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_ncs_last_updated.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_ncs_last_updated.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_ncs_last_updated extends views_handler_filter_date {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->node_table = $this->query->ensure_table('node', $this->relationship);
@@ -22,4 +26,5 @@ class views_handler_filter_ncs_last_updated extends views_handler_filter_date {
$this->{$info[$this->operator]['method']}($field);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_node_comment.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_node_comment.inc
index befce10..6a19948 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_node_comment.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_filter_node_comment.inc
@@ -11,11 +11,16 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_comment extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
$this->value_options = array(
COMMENT_NODE_HIDDEN => t('Hidden'),
COMMENT_NODE_CLOSED => t('Closed'),
COMMENT_NODE_OPEN => t('Open'),
);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_comment_thread.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_comment_thread.inc
index e513a93..1251859 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_comment_thread.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_comment_thread.inc
@@ -11,18 +11,23 @@
* @ingroup views_sort_handlers
*/
class views_handler_sort_comment_thread extends views_handler_sort {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
- //Read comment_render() in comment.module for an explanation of the
- //thinking behind this sort.
+ // Read comment_render() in comment.module for an explanation of the
+ // thinking behind this sort.
if ($this->options['order'] == 'DESC') {
$this->query->add_orderby($this->table_alias, $this->real_field, $this->options['order']);
}
else {
$alias = $this->table_alias . '_' . $this->real_field . 'asc';
- //@todo is this secure?
+ // @todo Is this secure?
$this->query->add_orderby(NULL, "SUBSTRING({$this->table_alias}.{$this->real_field}, 1, (LENGTH({$this->table_alias}.{$this->real_field}) - 1))", $this->options['order'], $alias);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc
index 613045a..cdb9fc5 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc
@@ -6,25 +6,30 @@
*/
/**
- * Sort handler to sort by last comment name which might be in 2 different
- * fields.
+ * Sort by last comment name, which might be in two different fields.
*
* @ingroup views_sort_handlers
*/
class views_handler_sort_ncs_last_comment_name extends views_handler_sort {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$join = new views_join();
$join->construct('users', $this->table_alias, 'last_comment_uid', 'uid');
- // @todo this might be safer if we had an ensure_relationship rather than guessing
- // the table alias. Though if we did that we'd be guessing the relationship name
- // so that doesn't matter that much.
-// $this->user_table = $this->query->add_relationship(NULL, $join, 'users', $this->relationship);
+ // @todo This might be safer if we had an ensure_relationship rather than
+ // guessing the table alias. Though if we did that we'd be guessing the
+ // relationship name so that doesn't matter that much.
+ // $this->user_table = $this->query
+ // ->add_relationship(NULL, $join, 'users', $this->relationship);
$this->user_table = $this->query->ensure_table('ncs_users', $this->relationship, $join);
$this->user_field = $this->query->add_field($this->user_table, 'name');
// Add the field.
$this->query->add_orderby(NULL, "LOWER(COALESCE($this->user_table.name, $this->table_alias.$this->field))", $this->options['order'], $this->table_alias . '_' . $this->field);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_updated.inc b/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_updated.inc
index 83f0f54..fca3532 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_updated.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_handler_sort_ncs_last_updated.inc
@@ -11,9 +11,14 @@
* @ingroup views_sort_handlers
*/
class views_handler_sort_ncs_last_updated extends views_handler_sort_date {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->node_table = $this->query->ensure_table('node', $this->relationship);
$this->field_alias = $this->query->add_orderby(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->table_alias . ".last_comment_timestamp)", $this->options['order'], $this->table_alias . '_' . $this->field);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc b/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc
index d287b8e..33b6a40 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc
@@ -2,17 +2,28 @@
/**
* @file
- * Contains the comment RSS row style plugin.
+ * Definition of views_plugin_row_comment_rss.
*/
/**
* Plugin which formats the comments as RSS items.
*/
class views_plugin_row_comment_rss extends views_plugin_row {
- var $base_table = 'comment';
- var $base_field = 'cid';
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public $base_table = 'comment';
+
+ /**
+ * {@inheritdoc}
+ */
+ public $base_field = 'cid';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['item_length'] = array('default' => 'default');
@@ -21,7 +32,10 @@ class views_plugin_row_comment_rss extends views_plugin_row {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['item_length'] = array(
@@ -37,8 +51,10 @@ class views_plugin_row_comment_rss extends views_plugin_row {
);
}
-
- function pre_render($result) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render($result) {
$cids = array();
$nids = array();
@@ -59,10 +75,10 @@ class views_plugin_row_comment_rss extends views_plugin_row {
* Return the main options, which are shown in the summary title
*
* @see views_plugin_row_node_rss::options_form_summary_options()
- * @todo: Maybe provide a views_plugin_row_rss_entity and reuse this method
+ * @todo Maybe provide a views_plugin_row_rss_entity and reuse this method
* in views_plugin_row_comment|node_rss.inc
*/
- function options_form_summary_options() {
+ public function options_form_summary_options() {
$entity_info = entity_get_info('node');
$options = array();
if (!empty($entity_info['view modes'])) {
@@ -75,8 +91,10 @@ class views_plugin_row_comment_rss extends views_plugin_row {
return $options;
}
-
- function render($row) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($row) {
global $base_url;
$cid = $row->{$this->field_alias};
@@ -89,7 +107,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
$item_length = variable_get('feed_item_length', 'teaser');
}
- // Load the specified comment and its associated node:
+ // Load the specified comment and its associated node.
$comment = $this->comments[$cid];
if (empty($comment) || empty($this->nodes[$comment->nid])) {
return;
@@ -107,7 +125,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
),
array(
'key' => 'dc:creator',
- 'value' => $comment->name,
+ 'value' => format_username($comment),
),
array(
'key' => 'guid',
@@ -149,4 +167,5 @@ class views_plugin_row_comment_rss extends views_plugin_row {
'row' => $item
));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_view.inc b/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_view.inc
index f78fa36..3895e9c 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_view.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_view.inc
@@ -2,38 +2,55 @@
/**
* @file
- * Contains the node RSS row style plugin.
+ * Definition of views_plugin_row_comment_view.
*/
/**
* Plugin which performs a comment_view on the resulting object.
*/
class views_plugin_row_comment_view extends views_plugin_row {
- var $base_field = 'cid';
- var $base_table = 'comment';
+
+ /**
+ * {@inheritdoc}
+ */
+ public $base_field = 'cid';
+
+ /**
+ * {@inheritdoc}
+ */
+ public $base_table = 'comment';
/**
* Stores all comments which are preloaded.
*/
- var $comments = array();
+ public $comments = array();
/**
* Stores all nodes of all comments which are preloaded.
*/
- var $nodes = array();
+ public $nodes = array();
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
return t('Settings');
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['links'] = array('default' => TRUE, 'bool' => TRUE);
$options['view_mode'] = array('default' => 'full');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$options = $this->options_form_summary_options();
@@ -51,11 +68,10 @@ class views_plugin_row_comment_view extends views_plugin_row {
);
}
-
/**
* Return the main options, which are shown in the summary title.
*/
- function options_form_summary_options() {
+ public function options_form_summary_options() {
$entity_info = entity_get_info('comment');
$options = array();
if (!empty($entity_info['view modes'])) {
@@ -72,7 +88,10 @@ class views_plugin_row_comment_view extends views_plugin_row {
return $options;
}
- function pre_render($result) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render($result) {
$cids = array();
foreach ($result as $row) {
@@ -94,4 +113,5 @@ class views_plugin_row_comment_view extends views_plugin_row {
$this->nodes[$node->nid] = $node;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/contact/views_handler_field_contact_link.inc b/sites/all/modules/contrib/views/views/modules/contact/views_handler_field_contact_link.inc
index 9d22f01..c8db429 100644
--- a/sites/all/modules/contrib/views/views/modules/contact/views_handler_field_contact_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/contact/views_handler_field_contact_link.inc
@@ -12,21 +12,30 @@
*/
class views_handler_field_contact_link extends views_handler_field_user_link {
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['text']['#title'] = t('Link label');
$form['text']['#required'] = TRUE;
$form['text']['#default_value'] = empty($this->options['text']) ? t('contact') : $this->options['text'];
parent::options_form($form, $form_state);
}
- // An example of field level access control.
- // We must override the access method in the parent class, as that requires
- // the 'access user profiles' permission, which the contact form does not.
- function access() {
+ /**
+ * An example of field level access control.
+ *
+ * We must override the access method in the parent class, as that requires
+ * the 'access user profiles' permission, which the contact form does not.
+ */
+ public function access() {
return user_access('access user contact forms');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
global $user;
$uid = $this->get_value($values, 'uid');
@@ -54,4 +63,5 @@ class views_handler_field_contact_link extends views_handler_field_user_link {
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/field.views.inc b/sites/all/modules/contrib/views/views/modules/field.views.inc
index 0bf1ad2..9f19374 100644
--- a/sites/all/modules/contrib/views/views/modules/field.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/field.views.inc
@@ -108,7 +108,14 @@ function field_views_field_default_views_data($field) {
$revision_tables = array();
$groups = array();
- $group_name = count($field['bundles']) > 1 ? t('Field') : NULL;
+ // Store translations to avoid being called thousands of times.
+ $translations['no_value_bracket'] = t('');
+ $translations['no_value_dash'] = t('- No value -');
+ $translations['field'] = t('Field');
+ $translations['node'] = t('Node');
+ $translations['content'] = t('Content');
+
+ $group_name = count($field['bundles']) > 1 ? $translations['field'] : NULL;
// Build the relationships between the field table and the entity tables.
foreach ($field['bundles'] as $entity => $bundles) {
@@ -116,8 +123,8 @@ function field_views_field_default_views_data($field) {
$groups[$entity] = $entity_info['label'];
// Override Node to Content.
- if ($groups[$entity] == t('Node')) {
- $groups[$entity] = t('Content');
+ if ($groups[$entity] == $translations['node']) {
+ $groups[$entity] = $translations['content'];
}
// If only one bundle use this as the default name.
@@ -175,6 +182,15 @@ function field_views_field_default_views_data($field) {
// and take the one which is used the most frequently.
$field_name = $field['field_name'];
list($label, $all_labels) = field_views_field_label($field_name);
+
+ $bundle_names_text = implode(', ', $bundles_names);
+ $translations['appears_in_help'] = t('Appears in: @bundles.', array('@bundles' => $bundle_names_text));
+ $translations['delta_appears_in_help'] = t('Delta - Appears in: @bundles.', array('@bundles' => $bundle_names_text));
+ $translations['language_appears_in_help'] = t('Language - Appears in: @bundles.', array('@bundles' => $bundle_names_text));
+ $translations['group_historical'] = t('@group (historical data)', array('@group' => $group_name));
+ $translations['alias_help'] = t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $label));
+ $translations['label_short_language'] = t('@label:language', array('@label' => $label));
+
foreach ($tables as $type => $table) {
if ($type == FIELD_LOAD_CURRENT) {
$group = $group_name;
@@ -182,7 +198,7 @@ function field_views_field_default_views_data($field) {
$column = $field['field_name'];
}
else {
- $group = t('@group (historical data)', array('@group' => $group_name));
+ $group = $translations['group_historical'];
$old_column = 'revision_id';
$column = $field['field_name'] . '-' . $old_column;
}
@@ -192,7 +208,7 @@ function field_views_field_default_views_data($field) {
'group' => $group,
'title' => $label,
'title short' => $label,
- 'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
+ 'help' => $translations['appears_in_help'],
);
// Go through and create a list of aliases for all possible combinations of
@@ -207,7 +223,7 @@ function field_views_field_default_views_data($field) {
'base' => $current_tables[$entity_name],
'group' => $groups[$entity_name],
'title' => $label_name,
- 'help' => t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $label)),
+ 'help' => $translations['alias_help'],
);
}
$also_known[] = t('@group: @field', array('@group' => $groups[$entity_name], '@field' => $label_name));
@@ -218,7 +234,7 @@ function field_views_field_default_views_data($field) {
'base' => $revision_tables[$entity_name],
'group' => t('@group (historical data)', array('@group' => $groups[$entity_name])),
'title' => $label_name,
- 'help' => t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $label)),
+ 'help' => $translations['alias_help'],
);
}
$also_known[] = t('@group (historical data): @field', array('@group' => $groups[$entity_name], '@field' => $label_name));
@@ -250,7 +266,8 @@ function field_views_field_default_views_data($field) {
foreach ($field['columns'] as $column => $attributes) {
$allow_sort = TRUE;
- // Identify likely filters and arguments for each column based on field type.
+ // Identify likely filters and arguments for each column based on field
+ // type.
switch ($attributes['type']) {
case 'int':
case 'mediumint':
@@ -263,6 +280,7 @@ function field_views_field_default_views_data($field) {
$argument = 'views_handler_argument_numeric';
$sort = 'views_handler_sort';
break;
+
case 'text':
case 'blob':
// It does not make sense to sort by blob or text.
@@ -274,7 +292,6 @@ function field_views_field_default_views_data($field) {
break;
}
-
if (count($field['columns']) == 1 || $column == 'value') {
$title = t('@label (!name)', array('@label' => $label, '!name' => $field['field_name']));
// CCK used the first 10 characters of $label. Probably doesn't matter.
@@ -290,7 +307,7 @@ function field_views_field_default_views_data($field) {
$group = $group_name;
}
else {
- $group = t('@group (historical data)', array('@group' => $group_name));
+ $group = $translations['group_historical'];
}
$column_real_name = $field['storage']['details']['sql'][$type][$table][$column];
@@ -301,19 +318,20 @@ function field_views_field_default_views_data($field) {
'group' => $group,
'title' => $title,
'title short' => $title_short,
- 'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
+ 'help' => $translations['appears_in_help'],
);
- // Go through and create a list of aliases for all possible combinations of
- // entity type + name.
+ // Go through and create a list of aliases for all possible combinations
+ // of entity type + name.
$aliases = array();
$also_known = array();
foreach ($all_labels as $entity_name => $labels) {
foreach ($labels as $label_name => $true) {
if ($group_name != $groups[$entity_name] || $label != $label_name) {
if (count($field['columns']) == 1 || $column == 'value') {
+ // CCK used the first 10 characters of $label. Probably doesn't
+ // matter.
$alias_title = t('@label (!name)', array('@label' => $label_name, '!name' => $field['field_name']));
- // CCK used the first 10 characters of $label. Probably doesn't matter.
}
else {
$alias_title = t('@label (!name:!column)', array('@label' => $label_name, '!name' => $field['field_name'], '!column' => $column));
@@ -338,7 +356,7 @@ function field_views_field_default_views_data($field) {
'handler' => $argument,
'additional fields' => $additional_fields,
'field_name' => $field['field_name'],
- 'empty field name' => t('- No value -'),
+ 'empty field name' => $translations['no_value_dash'],
);
$data[$table][$column_real_name]['filter'] = array(
'field' => $column_real_name,
@@ -367,7 +385,7 @@ function field_views_field_default_views_data($field) {
'group' => $group,
'title' => $title_delta,
'title short' => $title_short_delta,
- 'help' => t('Delta - Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
+ 'help' => $translations['delta_appears_in_help'],
);
$data[$table]['delta']['field'] = array(
'handler' => 'views_handler_field_numeric',
@@ -377,7 +395,7 @@ function field_views_field_default_views_data($field) {
'table' => $table,
'handler' => 'views_handler_argument_numeric',
'additional fields' => $additional_fields,
- 'empty field name' => t('- No value -'),
+ 'empty field name' => $translations['no_value_dash'],
'field_name' => $field['field_name'],
);
$data[$table]['delta']['filter'] = array(
@@ -416,46 +434,7 @@ function field_views_field_default_views_data($field) {
'table' => $table,
'handler' => 'views_handler_argument_locale_language',
'additional fields' => $additional_fields,
- 'empty field name' => t(''),
- 'field_name' => $field['field_name'],
- );
- $data[$table]['language']['filter'] = array(
- 'field' => 'language',
- 'table' => $table,
- 'handler' => 'views_handler_filter_locale_language',
- 'additional fields' => $additional_fields,
- 'field_name' => $field['field_name'],
- 'allow empty' => TRUE,
- );
- $data[$table]['language']['sort'] = array(
- 'field' => 'language',
- 'table' => $table,
- 'handler' => 'views_handler_sort',
- 'additional fields' => $additional_fields,
- 'field_name' => $field['field_name'],
- );
- }
-
- // Expose additional language column for translatable fields.
- if (!empty($field['translatable'])) {
- $title_language = t('@label (!name:language)', array('@label' => $label, '!name' => $field['field_name']));
- $title_short_language = t('@label:language', array('@label' => $label));
-
- $data[$table]['language'] = array(
- 'group' => $group,
- 'title' => $title_language,
- 'title short' => $title_short_language,
- 'help' => t('Language - Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
- );
- $data[$table]['language']['field'] = array(
- 'handler' => 'views_handler_field_locale_language',
- );
- $data[$table]['language']['argument'] = array(
- 'field' => 'language',
- 'table' => $table,
- 'handler' => 'views_handler_argument_locale_language',
- 'additional fields' => $additional_fields,
- 'empty field name' => t(''),
+ 'empty field name' => $translations['no_value_bracket'],
'field_name' => $field['field_name'],
);
$data[$table]['language']['filter'] = array(
@@ -481,7 +460,9 @@ function field_views_field_default_views_data($field) {
}
/**
- * Have a different filter handler for lists. This should allow to select values of the list.
+ * Have a different filter handler for lists.
+ *
+ * This should allow to select values of the list.
*/
function list_field_views_data($field) {
$data = field_views_field_default_views_data($field);
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list.inc
index e0f7abe..5ae0d43 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list.inc
@@ -12,27 +12,37 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_field_list extends views_handler_argument_numeric {
+
/**
* Stores the allowed values of this field.
*
* @var array
*/
- var $allowed_values = NULL;
+ public $allowed_values = NULL;
- function init(&$view, &$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
$field = field_info_field($this->definition['field_name']);
$this->allowed_values = list_allowed_values($field);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['summary']['contains']['human'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['summary']['human'] = array(
@@ -43,16 +53,19 @@ class views_handler_argument_field_list extends views_handler_argument_numeric {
);
}
-
- function summary_name($data) {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_name($data) {
$value = $data->{$this->name_alias};
// If the list element has a human readable name show it,
if (isset($this->allowed_values[$value]) && !empty($this->options['summary']['human'])) {
return field_filter_xss($this->allowed_values[$value]);
}
- // else fallback to the key.
+ // Else fallback to the key.
else {
return check_plain($value);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list_string.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list_string.inc
index 67a9f2d..fae7094 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list_string.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_argument_field_list_string.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_argument_field_list_text.
+ * Definition of views_handler_argument_field_list_string.
*/
/**
@@ -12,20 +12,27 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_field_list_string extends views_handler_argument_string {
+
/**
* Stores the allowed values of this field.
*
* @var array
*/
- var $allowed_values = NULL;
+ public $allowed_values = NULL;
- function init(&$view, &$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
$field = field_info_field($this->definition['field_name']);
$this->allowed_values = list_allowed_values($field);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['summary']['contains']['human'] = array('default' => FALSE, 'bool' => TRUE);
@@ -33,7 +40,10 @@ class views_handler_argument_field_list_string extends views_handler_argument_st
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['summary']['human'] = array(
@@ -44,16 +54,19 @@ class views_handler_argument_field_list_string extends views_handler_argument_st
);
}
-
- function summary_name($data) {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_name($data) {
$value = $data->{$this->name_alias};
// If the list element has a human readable name show it,
if (isset($this->allowed_values[$value]) && !empty($this->options['summary']['human'])) {
return $this->case_transform(field_filter_xss($this->allowed_values[$value]), $this->options['case']);
}
- // else fallback to the key.
+ // Else fallback to the key.
else {
return $this->case_transform(check_plain($value), $this->options['case']);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc
index a91e13a..cbc2251 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc
@@ -38,6 +38,7 @@ function _field_view_formatter_options($field_type = NULL) {
* @ingroup views_field_handlers
*/
class views_handler_field_field extends views_handler_field {
+
/**
* An array to store field renderable arrays for use by render_items.
*
@@ -52,7 +53,6 @@ class views_handler_field_field extends views_handler_field {
*/
public $field_info = array();
-
/**
* Does the field supports multiple field values.
*
@@ -81,7 +81,10 @@ class views_handler_field_field extends views_handler_field {
*/
public $instance;
- function init(&$view, &$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
$this->field_info = $field = field_info_field($this->definition['field_name']);
@@ -97,13 +100,13 @@ class views_handler_field_field extends views_handler_field {
$this->limit_values = TRUE;
}
- // If "First and last only" is chosen, limit the values
+ // If "First and last only" is chosen, limit the values.
if (!empty($this->options['delta_first_last'])) {
$this->limit_values = TRUE;
}
- // Otherwise, we only limit values if the user hasn't selected "all", 0, or
- // the value matching field cardinality.
+ // Otherwise, we only limit values if the user hasn't selected "all", 0,
+ // or the value matching field cardinality.
if ((intval($this->options['delta_limit']) && ($this->options['delta_limit'] != $field['cardinality'])) || intval($this->options['delta_offset'])) {
$this->limit_values = TRUE;
}
@@ -122,7 +125,7 @@ class views_handler_field_field extends views_handler_field {
* @return bool
* Return TRUE if the user has access to view this field.
*/
- function access() {
+ public function access() {
$base_table = $this->get_base_table();
return field_access('view', $this->field_info, $this->definition['entity_tables'][$base_table]);
}
@@ -133,14 +136,15 @@ class views_handler_field_field extends views_handler_field {
* @return string
* The base table which is used in the current view "context".
*/
- function get_base_table() {
+ public function get_base_table() {
if (!isset($this->base_table)) {
// This base_table is coming from the entity not the field.
$this->base_table = $this->view->base_table;
// If the current field is under a relationship you can't be sure that the
- // base table of the view is the base table of the current field.
- // For example a field from a node author on a node view does have users as base table.
+ // base table of the view is the base table of the current field. For
+ // example, a field from a node author on a node view does have users as
+ // base table.
if (!empty($this->options['relationship']) && $this->options['relationship'] != 'none') {
$relationships = $this->view->display_handler->get_option('relationships');
if (!empty($relationships[$this->options['relationship']])) {
@@ -165,7 +169,7 @@ class views_handler_field_field extends views_handler_field {
* The 'add fields to query' switch is used by modules which need all data
* present in the query itself (such as "sphinx").
*/
- function query($use_groupby = FALSE) {
+ public function query($use_groupby = FALSE) {
$this->get_base_table();
$params = array();
@@ -202,8 +206,8 @@ class views_handler_field_field extends views_handler_field {
$this->aliases['entity_id'] = $this->query->add_field($this->base_table_alias, $entity_info['entity keys']['id'], '', $params);
}
-
- // The alias needs to be unique, so we use both the field table and the entity type.
+ // The alias needs to be unique, so we use both the field table and the
+ // entity type.
$entity_type_alias = $this->definition['table'] . '_' . $entity_type . '_entity_type';
$this->aliases['entity_type'] = $this->query->add_field(NULL, "'$entity_type'", $entity_type_alias);
@@ -224,10 +228,10 @@ class views_handler_field_field extends views_handler_field {
$options += is_array($this->options['group_columns']) ? $this->options['group_columns'] : array();
-
$fields = array();
$rkey = $this->definition['is revision'] ? 'FIELD_LOAD_REVISION' : 'FIELD_LOAD_CURRENT';
- // Go through the list and determine the actual column name from field api.
+ // Go through the list and determine the actual column name from field
+ // API.
foreach ($options as $column) {
$name = $column;
if (isset($this->field_info['storage']['details']['sql'][$rkey][$this->table][$column])) {
@@ -249,7 +253,8 @@ class views_handler_field_field extends views_handler_field {
$field = $this->field_info;
if (field_is_translatable($entity_type, $field) && !empty($this->view->display_handler->options['field_language_add_to_query'])) {
$column = $this->table_alias . '.language';
- // By the same reason as field_language the field might be LANGUAGE_NONE in reality so allow it as well.
+ // By the same reason as field_language the field might be
+ // LANGUAGE_NONE in reality so allow it as well.
// @see this::field_language()
global $language_content;
$default_language = language_default('language');
@@ -282,7 +287,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Determine if the field table should be added to the query.
*/
- function add_field_table($use_groupby) {
+ public function add_field_table($use_groupby) {
// Grouping is enabled, or we are explicitly required to do this.
if ($use_groupby || !empty($this->definition['add fields to query'])) {
return TRUE;
@@ -297,7 +302,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Determine if this field is click sortable.
*/
- function click_sortable() {
+ public function click_sortable() {
// Not click sortable in any case.
if (empty($this->definition['click sortable'])) {
return FALSE;
@@ -314,7 +319,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Called to determine what to tell the clicksorter.
*/
- function click_sort($order) {
+ public function click_sort($order) {
// No column selected, can't continue.
if (empty($this->options['click_sort_column'])) {
return;
@@ -329,7 +334,10 @@ class views_handler_field_field extends views_handler_field {
$this->query->add_orderby(NULL, NULL, $order, $this->aliases[$column]);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
// option_definition runs before init/construct, so no $this->field_info
@@ -383,12 +391,16 @@ class views_handler_field_field extends views_handler_field {
'default' => FALSE,
'bool' => TRUE,
);
+ $options['delta_random'] = array(
+ 'default' => FALSE,
+ 'bool' => TRUE,
+ );
$options['multi_type'] = array(
- 'default' => 'separator'
+ 'default' => 'separator',
);
$options['separator'] = array(
- 'default' => ', '
+ 'default' => ', ',
);
$options['field_api_classes'] = array(
@@ -399,7 +411,10 @@ class views_handler_field_field extends views_handler_field {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$field = $this->field_info;
@@ -482,7 +497,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Provide options for multiple value fields.
*/
- function multiple_options_form(&$form, &$form_state) {
+ public function multiple_options_form(&$form, &$form_state) {
$field = $this->field_info;
$form['multiple_field_settings'] = array(
@@ -576,6 +591,14 @@ class views_handler_field_field extends views_handler_field {
'#title' => t('First and last only'),
'#type' => 'checkbox',
'#default_value' => $this->options['delta_first_last'],
+ '#suffix' => $suffix,
+ '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#fieldset' => 'multiple_field_settings',
+ );
+ $form['delta_random'] = array(
+ '#title' => t('Random order'),
+ '#type' => 'checkbox',
+ '#default_value' => $this->options['delta_random'],
'#suffix' => ' ',
'#dependency' => array('edit-options-group-rows' => array(TRUE)),
'#fieldset' => 'multiple_field_settings',
@@ -585,7 +608,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Extend the groupby form with group columns.
*/
- function groupby_form(&$form, &$form_state) {
+ public function groupby_form(&$form, &$form_state) {
parent::groupby_form($form, $form_state);
// With "field API" fields, the column target of the grouping function
// and any additional grouping columns must be specified.
@@ -613,7 +636,10 @@ class views_handler_field_field extends views_handler_field {
);
}
- function groupby_form_submit(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function groupby_form_submit(&$form, &$form_state) {
parent::groupby_form_submit($form, $form_state);
$item =& $form_state['handler']->options;
@@ -625,7 +651,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Load the entities for all fields that are about to be displayed.
*/
- function post_execute(&$values) {
+ public function post_execute(&$values) {
if (!empty($values)) {
// Divide the entity ids by entity type, so they can be loaded in bulk.
$entities_by_type = array();
@@ -678,7 +704,8 @@ class views_handler_field_field extends views_handler_field {
}
}
- // Now, transfer the data back into the resultset so it can be easily used.
+ // Now, transfer the data back into the resultset so it can be easily
+ // used.
foreach ($values as $row_id => &$value) {
$value->{'field_' . $this->options['id']} = $this->set_items($value, $row_id);
}
@@ -691,7 +718,7 @@ class views_handler_field_field extends views_handler_field {
* When using advanced render, each possible item in the list is rendered
* individually. Then the items are all pasted together.
*/
- function render_items($items) {
+ public function render_items($items) {
if (!empty($items)) {
if (!$this->options['group_rows']) {
return implode('', $items);
@@ -705,17 +732,27 @@ class views_handler_field_field extends views_handler_field {
array(
'items' => $items,
'title' => NULL,
- 'type' => $this->options['multi_type']
+ 'type' => $this->options['multi_type'],
));
}
}
}
- function get_items($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_items($values) {
return $values->{'field_' . $this->options['id']};
}
- function get_value($values, $field = NULL) {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value($values, $field = NULL) {
+ if (!isset($values->_field_data[$this->field_alias]['entity']) || !is_object($values->_field_data[$this->field_alias]['entity'])) {
+ return array();
+ }
+
// Go ahead and render and store in $this->items.
$entity = clone $values->_field_data[$this->field_alias]['entity'];
@@ -741,7 +778,7 @@ class views_handler_field_field extends views_handler_field {
}
}
- // If any of our aggregated fields have data, fake it:
+ // If any of our aggregated fields have data, fake it.
if ($data) {
// Now, overwrite the original value with our aggregated value.
// This overwrites it so there is always just one entry.
@@ -757,6 +794,11 @@ class views_handler_field_field extends views_handler_field {
return array();
}
+ // If requested, randomize the order of the deltas.
+ if ($this->options['delta_random'] && !empty($entity->{$this->definition['field_name']})) {
+ shuffle($entity->{$this->definition['field_name']}[$langcode]);
+ }
+
// We are supposed to show only certain deltas.
if ($this->limit_values && !empty($entity->{$this->definition['field_name']})) {
$all_values = !empty($entity->{$this->definition['field_name']}[$langcode]) ? $entity->{$this->definition['field_name']}[$langcode] : array();
@@ -787,7 +829,7 @@ class views_handler_field_field extends views_handler_field {
}
}
- // Determine if only the first and last values should be shown
+ // Determine if only the first and last values should be shown.
$delta_first_last = $this->options['delta_first_last'];
$new_values = array();
@@ -795,7 +837,8 @@ class views_handler_field_field extends views_handler_field {
$new_delta = $offset + $i;
if (isset($all_values[$new_delta])) {
- // If first-last option was selected, only use the first and last values
+ // If first-last option was selected, only use the first and last
+ // values.
if (!$delta_first_last
// Use the first value.
|| $new_delta == $offset
@@ -819,7 +862,7 @@ class views_handler_field_field extends views_handler_field {
/**
* Return an array of items for the field.
*/
- function set_items($values, $row_id) {
+ public function set_items($values, $row_id) {
// In some cases the instance on the entity might be easy, see
// https://drupal.org/node/1161708 and https://drupal.org/node/1461536 for
// more information.
@@ -837,7 +880,6 @@ class views_handler_field_field extends views_handler_field {
'views_row_id' => $row_id,
);
-
$entity_type = $values->_field_data[$this->field_alias]['entity_type'];
$entity = $this->get_value($values, 'entity');
if (!$entity) {
@@ -849,8 +891,6 @@ class views_handler_field_field extends views_handler_field {
$items = array();
if ($this->options['field_api_classes']) {
- // Make a copy.
- $array = $render_array;
return array(array('rendered' => drupal_render($render_array)));
}
@@ -873,28 +913,37 @@ class views_handler_field_field extends views_handler_field {
return $items;
}
- function render_item($count, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_item($count, $item) {
return render($item['rendered']);
}
- function document_self_tokens(&$tokens) {
+ /**
+ * {@inheritdoc}
+ */
+ public function document_self_tokens(&$tokens) {
$field = $this->field_info;
foreach ($field['columns'] as $id => $column) {
$tokens['[' . $this->options['id'] . '-' . $id . ']'] = t('Raw @column', array('@column' => $id));
}
}
- function add_self_tokens(&$tokens, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function add_self_tokens(&$tokens, $item) {
$field = $this->field_info;
foreach ($field['columns'] as $id => $column) {
- // Use filter_xss_admin because it's user data and we can't be sure it is safe.
- // We know nothing about the data, though, so we can't really do much else.
-
+ // Use filter_xss_admin because it's user data and we can't be sure it is
+ // safe. We know nothing about the data, though, so we can't really do
+ // much else.
if (isset($item['raw'])) {
// If $item['raw'] is an array then we can use as is, if it's an object
// we cast it to an array, if it's neither, we can't use it.
$raw = is_array($item['raw']) ? $item['raw'] :
- (is_object($item['raw']) ? (array)$item['raw'] : NULL);
+ (is_object($item['raw']) ? (array) $item['raw'] : NULL);
}
if (isset($raw) && isset($raw[$id]) && is_scalar($raw[$id])) {
$tokens['[' . $this->options['id'] . '-' . $id . ']'] = filter_xss_admin($raw[$id]);
@@ -910,7 +959,7 @@ class views_handler_field_field extends views_handler_field {
* Return the language code of the language the field should be displayed in,
* according to the settings.
*/
- function field_language($entity_type, $entity) {
+ public function field_language($entity_type, $entity) {
global $language_content;
if (field_is_translatable($entity_type, $this->field_info)) {
@@ -919,10 +968,11 @@ class views_handler_field_field extends views_handler_field {
array($language_content->language, $default_language),
$this->view->display_handler->options['field_language']);
- // Give the Field Language API a chance to fallback to a different language
- // (or LANGUAGE_NONE), in case the field has no data for the selected language.
- // field_view_field() does this as well, but since the returned language code
- // is used before calling it, the fallback needs to happen explicitly.
+ // Give the Field Language API a chance to fallback to a different
+ // language (or LANGUAGE_NONE), in case the field has no data for the
+ // selected language. field_view_field() does this as well, but since the
+ // returned language code is used before calling it, the fallback needs
+ // to happen explicitly.
$language = field_language($entity_type, $entity, $this->field_info['field_name'], $language);
return $language;
@@ -931,4 +981,5 @@ class views_handler_field_field extends views_handler_field {
return LANGUAGE_NONE;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list.inc
index 440d55b..e9fab80 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list.inc
@@ -12,9 +12,13 @@
*/
class views_handler_filter_field_list extends views_handler_filter_many_to_one {
- function init(&$view, &$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
- // Migrate the settings from the old filter_in_operator values to filter_many_to_one.
+ // Migrate the settings from the old filter_in_operator values to
+ // filter_many_to_one.
if ($this->options['operator'] == 'in') {
$this->options['operator'] = 'or';
}
@@ -24,9 +28,12 @@ class views_handler_filter_field_list extends views_handler_filter_many_to_one {
$this->operator = $this->options['operator'];
}
-
- function get_value_options() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
$field = field_info_field($this->definition['field_name']);
$this->value_options = list_allowed_values($field);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list_boolean.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list_boolean.inc
index 34bca54..dd9938b 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list_boolean.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_filter_field_list_boolean.inc
@@ -12,7 +12,10 @@
*/
class views_handler_filter_field_list_boolean extends views_handler_filter_field_list {
- function get_value_options() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
$field = field_info_field($this->definition['field_name']);
$value_options = list_allowed_values($field);
@@ -30,4 +33,5 @@ class views_handler_filter_field_list_boolean extends views_handler_filter_field
$this->value_options = $value_options;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_relationship_entity_reverse.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_relationship_entity_reverse.inc
index 89f2483..04fde51 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_relationship_entity_reverse.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_relationship_entity_reverse.inc
@@ -10,8 +10,12 @@
*
* @ingroup views_relationship_handlers
*/
-class views_handler_relationship_entity_reverse extends views_handler_relationship {
- function init(&$view, &$options) {
+class views_handler_relationship_entity_reverse extends views_handler_relationship {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
$this->field_info = field_info_field($this->definition['field_name']);
@@ -20,7 +24,7 @@ class views_handler_relationship_entity_reverse extends views_handler_relationsh
/**
* Called to implement a relationship in a query.
*/
- function query() {
+ public function query() {
$this->ensure_my_table();
// First, relate our base table to the current base table to the
// field, using the base table's id field to the field's column.
@@ -76,9 +80,10 @@ class views_handler_relationship_entity_reverse extends views_handler_relationsh
$second_join->construct();
$second_join->adjusted = TRUE;
- // use a short alias for this:
+ // Use a short alias for this.
$alias = $this->definition['field_name'] . '_' . $this->table;
$this->alias = $this->query->add_relationship($alias, $second_join, $this->definition['base'], $this->relationship);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/filter.views.inc b/sites/all/modules/contrib/views/views/modules/filter.views.inc
index 0a3b4fc..1a1bfd4 100644
--- a/sites/all/modules/contrib/views/views/modules/filter.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/filter.views.inc
@@ -12,10 +12,9 @@
*/
function filter_views_data() {
// ----------------------------------------------------------------------
- // filter_format table
-
- // Have not defined $data['filter_formats']['table']['group'] since
- // no fields are defined here yet.
+ // 'filter_format' table.
+ // Have not defined $data['filter_formats']['table']['group'] since no fields
+ // are defined here yet.
$data['filter_formats']['moved to'] = 'filter_format';
$data['filter_format']['table']['join'] = array(
'node_revision' => array(
diff --git a/sites/all/modules/contrib/views/views/modules/filter/views_handler_field_filter_format_name.inc b/sites/all/modules/contrib/views/views/modules/filter/views_handler_field_filter_format_name.inc
index 0a7bf3b..ddddb3d 100644
--- a/sites/all/modules/contrib/views/views/modules/filter/views_handler_field_filter_format_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/filter/views_handler_field_filter_format_name.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_field_filter_format_name.
+ * Contains .
*/
/**
@@ -11,18 +11,28 @@
* @ingroup views_field_handlers
*/
class views_handler_field_filter_format_name extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
// Be explicit about the table we are using.
$this->additional_fields['name'] = array('table' => 'filter_formats', 'field' => 'name');
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$format_name = $this->get_value($values, 'name');
if (!$format_name) {
// Default or invalid input format.
@@ -33,4 +43,5 @@ class views_handler_field_filter_format_name extends views_handler_field {
}
return $this->sanitize_value($format_name);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale.views.inc b/sites/all/modules/contrib/views/views/modules/locale.views.inc
index 3bff7db..3577e8c 100644
--- a/sites/all/modules/contrib/views/views/modules/locale.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale.views.inc
@@ -12,7 +12,6 @@
*/
function locale_views_data() {
// Basic table information.
-
// Define the base group of this table.
$data['locales_source']['table']['group'] = t('Locale source');
@@ -23,7 +22,7 @@ function locale_views_data() {
'help' => t('A source string for translation, in English or the default site language.'),
);
- // lid
+ // Locale ID / 'lid'.
$data['locales_source']['lid'] = array(
'title' => t('LID'),
'help' => t('The ID of the source string.'),
@@ -44,7 +43,7 @@ function locale_views_data() {
),
);
- // location
+ // Location.
$data['locales_source']['location'] = array(
'group' => t('Locale source'),
'title' => t('Location'),
@@ -52,7 +51,7 @@ function locale_views_data() {
'field' => array(
'handler' => 'views_handler_field',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -64,7 +63,7 @@ function locale_views_data() {
),
);
- // Group field
+ // Group field.
$data['locales_source']['textgroup'] = array(
'group' => t('Locale source'),
'title' => t('Group'),
@@ -81,7 +80,7 @@ function locale_views_data() {
),
);
- // Source field
+ // Source field.
$data['locales_source']['source'] = array(
'group' => t('Locale source'),
'title' => t('Source'),
@@ -94,7 +93,7 @@ function locale_views_data() {
),
);
- // Version field
+ // Version field.
$data['locales_source']['version'] = array(
'group' => t('Locale source'),
'title' => t('Version'),
@@ -121,13 +120,12 @@ function locale_views_data() {
);
// ----------------------------------------------------------------------
- // Locales target table
-
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // 'locales_target' table.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['locales_target']['table']['group'] = t('Locale target');
- // Join information
+ // Join information.
$data['locales_target']['table']['join'] = array(
'locales_source' => array(
'left_field' => 'lid',
@@ -135,7 +133,7 @@ function locale_views_data() {
),
);
- // Translation field
+ // Translation field.
$data['locales_target']['translation'] = array(
'group' => t('Locale target'),
'title' => t('Translation'),
@@ -148,7 +146,7 @@ function locale_views_data() {
),
);
- // Language field
+ // Language field.
$data['locales_target']['language'] = array(
'group' => t('Locale target'),
'title' => t('Language'),
@@ -174,7 +172,7 @@ function locale_views_data() {
),
);
- // Plural
+ // Plural.
$data['locales_target']['plural'] = array(
'group' => t('Locale target'),
'title' => t('Plural'),
@@ -200,7 +198,7 @@ function locale_views_data() {
* Implements hook_views_data_alter().
*/
function locale_views_data_alter(&$data) {
- // Language field
+ // Language field.
$data['node']['language'] = array(
'title' => t('Language'),
'help' => t('The language the content is in.'),
@@ -218,4 +216,11 @@ function locale_views_data_alter(&$data) {
'handler' => 'views_handler_sort',
),
);
+ $data['node']['specific_language'] = array(
+ 'title' => t('Specific language'),
+ 'help' => t('Sort by a specific language that the content is in.'),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort_node_language',
+ ),
+ );
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_group.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_group.inc
index 7ced836..6efcd55 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_group.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_group.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_argument_locale_group.
+ * Contains .
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_locale_group extends views_handler_argument {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct('group');
}
@@ -19,7 +23,7 @@ class views_handler_argument_locale_group extends views_handler_argument {
* Override the behavior of summary_name(). Get the user friendly version
* of the group.
*/
- function summary_name($data) {
+ public function summary_name($data) {
return $this->locale_group($data->{$this->name_alias});
}
@@ -27,14 +31,18 @@ class views_handler_argument_locale_group extends views_handler_argument {
* Override the behavior of title(). Get the user friendly version
* of the language.
*/
- function title() {
+ public function title() {
return $this->locale_group($this->argument);
}
- function locale_group($group) {
+ /**
+ * {@inheritdoc}
+ */
+ public function locale_group($group) {
$groups = module_invoke_all('locale', 'groups');
// Sort the list.
asort($groups);
return isset($groups[$group]) ? $groups[$group] : t('Unknown group');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_language.inc
index 316d4b1..0c3f61e 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_argument_locale_language.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_argument_locale_language.
+ * Contains .
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_locale_language extends views_handler_argument {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct('language');
}
@@ -19,7 +23,7 @@ class views_handler_argument_locale_language extends views_handler_argument {
* Override the behavior of summary_name(). Get the user friendly version
* of the language.
*/
- function summary_name($data) {
+ public function summary_name($data) {
return $this->locale_language($data->{$this->name_alias});
}
@@ -27,12 +31,16 @@ class views_handler_argument_locale_language extends views_handler_argument {
* Override the behavior of title(). Get the user friendly version
* of the language.
*/
- function title() {
+ public function title() {
return $this->locale_language($this->argument);
}
- function locale_language($langcode) {
+ /**
+ * {@inheritdoc}
+ */
+ public function locale_language($langcode) {
$languages = views_language_list();
return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_group.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_group.inc
index 393a948..dbdedc4 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_group.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_group.inc
@@ -11,11 +11,16 @@
* @ingroup views_field_handlers
*/
class views_handler_field_locale_group extends views_handler_field {
- function render($values) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$groups = module_invoke_all('locale', 'groups');
// Sort the list.
asort($groups);
$value = $this->get_value($values);
return isset($groups[$value]) ? $groups[$value] : '';
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_language.inc
index 8038e2b..552ccf2 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_language.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_field_locale_language.
+ * Contains .
*/
/**
@@ -11,14 +11,21 @@
* @ingroup views_field_handlers
*/
class views_handler_field_locale_language extends views_handler_field {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['native_language'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['native_language'] = array(
'#title' => t('Native language'),
@@ -28,9 +35,13 @@ class views_handler_field_locale_language extends views_handler_field {
);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$languages = locale_language_list(empty($this->options['native_language']) ? 'name' : 'native');
$value = $this->get_value($values);
return isset($languages[$value]) ? $languages[$value] : '';
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc
index 3789355..6d2189d 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_field_locale_link_edit.
+ * Contains .
*/
/**
@@ -11,12 +11,19 @@
* @ingroup views_field_handlers
*/
class views_handler_field_locale_link_edit extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['lid'] = 'lid';
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['text'] = array('default' => '', 'translatable' => TRUE);
@@ -24,7 +31,10 @@ class views_handler_field_locale_link_edit extends views_handler_field {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['text'] = array(
'#type' => 'textfield',
'#title' => t('Text to display'),
@@ -33,28 +43,41 @@ class views_handler_field_locale_link_edit extends views_handler_field {
parent::options_form($form, $form_state);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function access() {
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
// Ensure user has access to edit translations.
return user_access('translate interface');
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values, 'lid');
return $this->render_link($this->sanitize_value($value), $values);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
$this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = 'admin/build/translate/edit/' . $data;
+ $this->options['alter']['path'] = 'admin/config/regional/translate/edit/' . $data;
$this->options['alter']['query'] = drupal_get_destination();
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_node_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_node_language.inc
index 467605b..281d464 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_node_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_node_language.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_field_node_language.
+ * Contains .
*/
/**
@@ -11,14 +11,21 @@
* @ingroup views_field_handlers
*/
class views_handler_field_node_language extends views_handler_field_node {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['native_language'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['native_language'] = array(
'#title' => t('Native language'),
@@ -28,10 +35,14 @@ class views_handler_field_node_language extends views_handler_field_node {
);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$languages = views_language_list(empty($this->options['native_language']) ? 'name' : 'native');
$value = $this->get_value($values);
$value = isset($languages[$value]) ? $languages[$value] : '';
return $this->render_link($value, $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_group.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_group.inc
index 5ec1e92..b866972 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_group.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_group.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_filter_locale_group.
+ * Contains .
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_locale_group extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Group');
$groups = module_invoke_all('locale', 'groups');
@@ -20,4 +24,5 @@ class views_handler_filter_locale_group extends views_handler_filter_in_operator
$this->value_options = $groups;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_language.inc
index eee12a6..92d4bd8 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_language.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_filter_locale_language.
+ * Contains .
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_locale_language extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Language');
$languages = array(
@@ -23,4 +27,5 @@ class views_handler_filter_locale_language extends views_handler_filter_in_opera
$this->value_options = $languages;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_version.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_version.inc
index 7170860..f5eafee 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_version.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_locale_version.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_filter_locale_version.
+ * Contains .
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_locale_version extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Version');
// Enable filtering by the current installed Drupal version.
@@ -25,4 +29,5 @@ class views_handler_filter_locale_version extends views_handler_filter_in_operat
$this->value_options = $versions;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_node_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_node_language.inc
index 7592577..ba6b670 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_node_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_filter_node_language.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_filter_node_language.
+ * Contains .
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_language extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Language');
$languages = array(
@@ -23,4 +27,5 @@ class views_handler_filter_node_language extends views_handler_filter_in_operato
$this->value_options = $languages;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_sort_node_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_sort_node_language.inc
new file mode 100644
index 0000000..fa446a8
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_sort_node_language.inc
@@ -0,0 +1,111 @@
+options['language'])) {
+ $langcode = $this->get_system_langcode($this->options['language']);
+ // Validate the langcode.
+ if (preg_match('/^[a-z0-9\-]+$/i', $langcode)) {
+ $this->ensure_my_table();
+ // See https://stackoverflow.com/questions/14104055/ordering-by-specific-field-value-first
+ $formula = "{$this->table_alias}_language = '{$langcode}'";
+ $this->query->add_orderby($this->table_alias, NULL, $this->options['order'], $formula);
+ }
+ }
+ }
+
+ /**
+ * Converts a views language code into a Drupal language code.
+ */
+ public function get_system_langcode($langcode) {
+ global $language_content;
+ $default_language = language_default('language');
+ $system_langcode = str_replace(array(
+ '***CURRENT_LANGUAGE***',
+ '***DEFAULT_LANGUAGE***',
+ ),
+ array(
+ $language_content->language,
+ $default_language,
+ ),
+ $langcode);
+ return $system_langcode;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
+ $options = parent::option_definition();
+ $options['language'] = array('default' => '***CURRENT_LANGUAGE***');
+ return $options;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
+ $summary = parent::admin_summary();
+ if ($this->options['language']) {
+ $language_options = $this->get_language_options();
+ $summary = t('@order, @language', array(
+ '@order' => $summary,
+ '@language' => $language_options[$this->options['language']],
+ ));
+ }
+ return $summary;
+ }
+
+ /**
+ * Returns languages to sort by.
+ *
+ * @return array
+ * All the languages.
+ */
+ public function get_language_options() {
+ $languages = array(
+ '***CURRENT_LANGUAGE***' => t("Current user's language"),
+ '***DEFAULT_LANGUAGE***' => t("Default site language"),
+ LANGUAGE_NONE => t('No language'),
+ );
+ $languages = array_merge($languages, views_language_list());
+ return $languages;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function show_sort_form(&$form, &$form_state) {
+ parent::show_sort_form($form, $form_state);
+
+ $form['language'] = array(
+ '#type' => 'radios',
+ '#title' => t("Specific language"),
+ '#description' => t("Choose which specific language to sort by. Not to be confused with the 'Language' sort handler, which sorts by language."),
+ '#options' => $this->get_language_options(),
+ '#default_value' => $this->options['language'],
+ );
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node.views.inc b/sites/all/modules/contrib/views/views/modules/node.views.inc
index 71a1023..642825f 100644
--- a/sites/all/modules/contrib/views/views/modules/node.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/node.views.inc
@@ -12,13 +12,12 @@
*/
function node_views_data() {
// ----------------------------------------------------------------
- // node table -- basic table information.
-
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // 'node' table -- basic table information.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['node']['table']['group'] = t('Content');
- // Advertise this table as a possible base table
+ // Advertise this table as a possible base table.
$data['node']['table']['base'] = array(
'field' => 'nid',
'title' => t('Content'),
@@ -38,25 +37,27 @@ function node_views_data() {
);
// ----------------------------------------------------------------
- // node table -- fields
-
- // nid
+ // 'node' table -- fields.
+ // Node ID / 'nid'.
$data['node']['nid'] = array(
+ // The item it appears as on the UI,
'title' => t('Nid'),
- 'help' => t('The node ID.'), // The help that appears on the UI,
- // Information for displaying the nid
+ // The help that appears on the UI,
+ 'help' => t('The node ID.'),
+ // Information for displaying the nid.
'field' => array(
'handler' => 'views_handler_field_node',
'click sortable' => TRUE,
),
- // Information for accepting a nid as an argument
+ // Information for accepting a nid as an argument.
'argument' => array(
'handler' => 'views_handler_argument_node_nid',
- 'name field' => 'title', // the field to display in the summary.
+ 'name field' => 'title',
+ // The field to display in the summary.
'numeric' => TRUE,
'validate type' => 'nid',
),
- // Information for accepting a nid as a filter
+ // Information for accepting a nid as a filter.
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -66,23 +67,27 @@ function node_views_data() {
),
);
- // title
+ // Title.
// This definition has more items in it than it needs to as an example.
$data['node']['title'] = array(
- 'title' => t('Title'), // The item it appears as on the UI,
- 'help' => t('The content title.'), // The help that appears on the UI,
- // Information for displaying a title as a field
+ // The item it appears as on the UI,
+ 'title' => t('Title'),
+ // The help that appears on the UI,
+ 'help' => t('The content title.'),
+ // Information for displaying a title as a field.
'field' => array(
- 'field' => 'title', // the real field. This could be left out since it is the same.
- 'group' => t('Content'), // The group it appears in on the UI. Could be left out.
+ 'field' => 'title',
+ // The real field. This could be left out since it is the same.
+ 'group' => t('Content'),
+ // The group it appears in on the UI. Could be left out.
'handler' => 'views_handler_field_node',
'click sortable' => TRUE,
'link_to_node default' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
+ // Information for accepting a title as a filter.
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -91,10 +96,12 @@ function node_views_data() {
),
);
- // created field
+ // Created field.
$data['node']['created'] = array(
- 'title' => t('Post date'), // The item it appears as on the UI,
- 'help' => t('The date the content was posted.'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Post date'),
+ // The help that appears on the UI,
+ 'help' => t('The date the content was posted.'),
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
@@ -107,10 +114,12 @@ function node_views_data() {
),
);
- // changed field
+ // Changed field.
$data['node']['changed'] = array(
- 'title' => t('Updated date'), // The item it appears as on the UI,
- 'help' => t('The date the content was last updated.'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Updated date'),
+ // The help that appears on the UI,
+ 'help' => t('The date the content was last updated.'),
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
@@ -123,10 +132,12 @@ function node_views_data() {
),
);
- // Content type
+ // Content type.
$data['node']['type'] = array(
- 'title' => t('Type'), // The item it appears as on the UI,
- 'help' => t('The content type (for example, "blog entry", "forum post", "story", etc).'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Type'),
+ // The help that appears on the UI,
+ 'help' => t('The content type (for example, "blog entry", "forum post", "story", etc).'),
'field' => array(
'handler' => 'views_handler_field_node_type',
'click sortable' => TRUE,
@@ -142,7 +153,7 @@ function node_views_data() {
),
);
- // published status
+ // Published status.
$data['node']['status'] = array(
'title' => t('Published'),
'help' => t('Whether or not the content is published.'),
@@ -157,14 +168,15 @@ function node_views_data() {
'handler' => 'views_handler_filter_boolean_operator',
'label' => t('Published'),
'type' => 'yes-no',
- 'use equal' => TRUE, // Use status = 1 instead of status <> 0 in WHERE statment
+ 'use equal' => TRUE,
+ // Use status = 1 instead of status <> 0 in WHERE statment.
),
'sort' => array(
'handler' => 'views_handler_sort',
),
);
- // published status + extra
+ // Published status + extra.
$data['node']['status_extra'] = array(
'title' => t('Published or admin'),
'help' => t('Filters out unpublished content if the current user cannot view it.'),
@@ -175,7 +187,7 @@ function node_views_data() {
),
);
- // promote status
+ // Promote status.
$data['node']['promote'] = array(
'title' => t('Promoted to front page'),
'help' => t('Whether or not the content is promoted to the front page.'),
@@ -196,11 +208,13 @@ function node_views_data() {
),
);
- // sticky
+ // Sticky.
$data['node']['sticky'] = array(
- 'title' => t('Sticky'), // The item it appears as on the UI,
- 'help' => t('Whether or not the content is sticky.'), // The help that appears on the UI,
- // Information for displaying a title as a field
+ // The item it appears as on the UI,
+ 'title' => t('Sticky'),
+ // The help that appears on the UI,
+ 'help' => t('Whether or not the content is sticky.'),
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_boolean',
'click sortable' => TRUE,
@@ -221,8 +235,7 @@ function node_views_data() {
// Define some fields based upon views_handler_field_entity in the entity
// table so they can be re-used with other query backends.
- // @see views_handler_field_entity
-
+ // @see views_handler_field_entity()
$data['views_entity_node']['table']['group'] = t('Content');
$data['node']['view_node']['moved to'] = array('views_entity_node', 'view_node');
@@ -260,9 +273,7 @@ function node_views_data() {
),
);
-
// Bogus fields for aliasing purposes.
-
$data['node']['created_fulldate'] = array(
'title' => t('Created date'),
'help' => t('Date in the form of CCYYMMDD.'),
@@ -371,7 +382,7 @@ function node_views_data() {
),
);
- // uid field
+ // User ID / 'uid' field.
$data['node']['uid'] = array(
'title' => t('Author uid'),
'help' => t('The user authoring the content. If you need more fields than the uid add the content: author relationship'),
@@ -406,18 +417,35 @@ function node_views_data() {
),
);
- // ----------------------------------------------------------------------
- // Content revision table
+ $data['node']['version_count'] = array(
+ 'title' => t('Version Count'),
+ 'help' => t('The total count of versions/revisions of a certain node.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_node_version_count',
+ 'field' => 'nid',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_node_version_count',
+ 'allow empty' => FALSE,
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort_node_version_count',
+ ),
+ );
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // ----------------------------------------------------------------------
+ // Content revision table.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['node_revisions']['moved to'] = 'node_revision';
$data['node_revision']['table']['entity type'] = 'node';
+ $data['node_revision']['table']['revision'] = TRUE;
$data['node_revision']['table']['group'] = t('Content revision');
- // Support the conversion of the field body
+ // Support the conversion of the field body.
$data['node_revisions']['body']['moved to'] = array('field_revision_data', 'body-revision_id');
- // Advertise this table as a possible base table
+ // Advertise this table as a possible base table.
$data['node_revision']['table']['base'] = array(
'field' => 'vid',
'title' => t('Content revision'),
@@ -427,7 +455,7 @@ function node_views_data() {
),
);
- // For other base tables, explain how we join
+ // For other base tables, explain how we join.
$data['node_revision']['table']['join'] = array(
// Directly links to node table.
'node' => array(
@@ -443,7 +471,7 @@ function node_views_data() {
),
);
- // uid field for node revision
+ // User ID / 'uid' field for node revision.
$data['node_revision']['uid'] = array(
'title' => t('User'),
'help' => t('Relate a content revision to the user who created the revision.'),
@@ -455,7 +483,7 @@ function node_views_data() {
),
);
- // nid
+ // Node ID / 'nid'.
$data['node_revision']['nid'] = array(
'title' => t('Nid'),
// The help that appears on the UI.
@@ -487,7 +515,7 @@ function node_views_data() {
),
);
- // vid
+ // Revision ID / 'vid'.
$data['node_revision']['vid'] = array(
'title' => t('Vid'),
// The help that appears on the UI.
@@ -519,16 +547,19 @@ function node_views_data() {
),
);
- // title
+ // Title.
$data['node_revision']['title'] = array(
- 'title' => t('Title'), // The item it appears as on the UI,
- 'help' => t('The content title.'), // The help that appears on the UI,
- // Information for displaying a title as a field
+ // The item it appears as on the UI,
+ 'title' => t('Title'),
+ // The help that appears on the UI,
+ 'help' => t('The content title.'),
+ // Information for displaying a title as a field.
'field' => array(
- 'field' => 'title', // the real field
+ 'field' => 'title',
+ // The real field.
'handler' => 'views_handler_field_node_revision',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -540,24 +571,27 @@ function node_views_data() {
),
);
- // log field
+ // Log field.
$data['node_revision']['log'] = array(
- 'title' => t('Log message'), // The item it appears as on the UI,
- 'help' => t('The log message entered when the revision was created.'), // The help that appears on the UI,
- // Information for displaying a title as a field
+ // The item it appears as on the UI,
+ 'title' => t('Log message'),
+ // The help that appears on the UI,
+ 'help' => t('The log message entered when the revision was created.'),
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_xss',
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
);
- // revision timestamp
- // changed field
+ // Revision timestamp / 'changed' field.
$data['node_revision']['timestamp'] = array(
- 'title' => t('Updated date'), // The item it appears as on the UI,
- 'help' => t('The date the node was last updated.'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Updated date'),
+ // The help that appears on the UI,
+ 'help' => t('The date the node was last updated.'),
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
@@ -595,13 +629,12 @@ function node_views_data() {
);
// ----------------------------------------------------------------------
- // Node access table
-
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // Node access table.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['node_access']['table']['group'] = t('Content access');
- // For other base tables, explain how we join
+ // For other base tables, explain how we join.
$data['node_access']['table']['join'] = array(
// Directly links to node table.
'node' => array(
@@ -609,7 +642,7 @@ function node_views_data() {
'field' => 'nid',
),
);
- // nid field
+ // Node ID / 'nid' field.
$data['node_access']['nid'] = array(
'title' => t('Access'),
'help' => t('Filter by access.'),
@@ -620,11 +653,10 @@ function node_views_data() {
);
// ----------------------------------------------------------------------
- // History table
-
- // We're actually defining a specific instance of the table, so let's
- // alias it so that we can later add the real table for other purposes if we
- // need it.
+ // History table.
+ // We're actually defining a specific instance of the table, so let's alias
+ // it so that we can later add the real table for other purposes if we need
+ // it.
$data['history_user']['moved to'] = 'history';
$data['history']['table']['group'] = t('Content');
@@ -660,14 +692,17 @@ function node_views_data() {
*/
function node_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
+ 'module' => 'views',
+ // This just tells our themes are elsewhere.
'row' => array(
'node' => array(
'title' => t('Content'),
'help' => t('Display the content with standard node view.'),
'handler' => 'views_plugin_row_node_view',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
- 'base' => array('node'), // only works with 'node' as base.
+ 'path' => drupal_get_path('module', 'views') . '/modules/node',
+ // Not necessary for most modules.
+ 'base' => array('node'),
+ // Only works with 'node' as base.
'uses options' => TRUE,
'type' => 'normal',
'help topic' => 'style-node',
@@ -676,9 +711,11 @@ function node_views_plugins() {
'title' => t('Content'),
'help' => t('Display the content with standard node view.'),
'handler' => 'views_plugin_row_node_rss',
- 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
+ 'path' => drupal_get_path('module', 'views') . '/modules/node',
+ // Not necessary for most modules.
'theme' => 'views_view_row_rss',
- 'base' => array('node'), // only works with 'node' as base.
+ 'base' => array('node'),
+ // Only works with 'node' as base.
'uses options' => TRUE,
'type' => 'feed',
'help topic' => 'style-node-rss',
@@ -693,7 +730,7 @@ function node_views_plugins() {
'argument default' => array(
'node' => array(
'title' => t('Content ID from URL'),
- 'handler' => 'views_plugin_argument_default_node'
+ 'handler' => 'views_plugin_argument_default_node',
),
),
);
@@ -715,7 +752,7 @@ function node_row_node_view_preprocess_node(&$vars) {
unset($vars['content']['links']);
}
- if (!empty($options['comments']) && user_access('access comments') && $node->comment) {
+ if (module_exists('comment') && !empty($options['comments']) && user_access('access comments') && $node->comment) {
$vars['content']['comments'] = comment_node_page_additions($node);
}
}
@@ -727,7 +764,7 @@ function node_views_query_substitutions() {
return array(
'***ADMINISTER_NODES***' => intval(user_access('administer nodes')),
'***VIEW_OWN_UNPUBLISHED_NODES***' => intval(user_access('view own unpublished content')),
- '***BYPASS_NODE_ACCESS***' => intval(user_access('bypass node access')),
+ '***BYPASS_NODE_ACCESS***' => intval(user_access('bypass node access')),
);
}
@@ -736,14 +773,14 @@ function node_views_query_substitutions() {
*/
function node_views_analyze($view) {
$ret = array();
- // Check for something other than the default display:
+ // Check for something other than the default display.
if ($view->base_table == 'node') {
foreach ($view->display as $id => $display) {
if (empty($display->handler)) {
continue;
}
if (!$display->handler->is_defaulted('access') || !$display->handler->is_defaulted('filters')) {
- // check for no access control
+ // Check for no access control.
$access = $display->handler->get_option('access');
if (empty($access['type']) || $access['type'] == 'none') {
$select = db_select('role', 'r');
diff --git a/sites/all/modules/contrib/views/views/modules/node.views_default.inc b/sites/all/modules/contrib/views/views/modules/node.views_default.inc
index de619c1..b46b52c 100644
--- a/sites/all/modules/contrib/views/views/modules/node.views_default.inc
+++ b/sites/all/modules/contrib/views/views/modules/node.views_default.inc
@@ -6,12 +6,12 @@
*/
/**
- * Implementation of hook_views_default_views()
+ * Implements hook_views_default_views().
*/
function node_views_default_views() {
$views = array();
- $view = new view;
+ $view = new view();
$view->name = 'archive';
$view->description = 'Display a list of months that link to content for that month.';
$view->tag = 'default';
@@ -99,7 +99,7 @@ function node_views_default_views() {
$views['archive'] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'frontpage';
$view->description = 'Emulates the default Drupal front page; you may set the default home page path to this view to make it your front page.';
$view->tag = 'default';
@@ -181,7 +181,7 @@ function node_views_default_views() {
$views['frontpage'] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'glossary';
$view->description = 'A list of all content, by letter.';
$view->tag = 'default';
diff --git a/sites/all/modules/contrib/views/views/modules/node.views_template.inc b/sites/all/modules/contrib/views/views/modules/node.views_template.inc
index ad89414..861578d 100644
--- a/sites/all/modules/contrib/views/views/modules/node.views_template.inc
+++ b/sites/all/modules/contrib/views/views/modules/node.views_template.inc
@@ -2,15 +2,19 @@
/**
* @file
- * Contains views templates on behalf of the node module.
+ * Definition of views templates on behalf of the node module.
*/
+/**
+ * Implements hook_views_templates().
+ */
function node_views_templates() {
- // Only the standard install profile has the image field provided so only show it for it.
+ // Only the standard install profile has the image field provided so only
+ // show it for it.
if (variable_get('install_profile', 'standard') != 'standard') {
return array();
}
- $view = new view;
+ $view = new view();
$view->name = 'image_gallery';
$view->description = 'Shows all images which was uploaded on the "field_image" field';
$view->tag = '';
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_dates_various.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_dates_various.inc
index 5f4e4b2..d80efb5 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_dates_various.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_dates_various.inc
@@ -2,19 +2,18 @@
/**
* @file
- * Handlers for various date arguments.
- *
- * @ingroup views_argument_handlers
+ * Definition of views_handler_argument_node_created_fulldate.
*/
/**
- * Argument handler for a full date (CCYYMMDD)
+ * Argument handler for a full date (CCYYMMDD).
*/
class views_handler_argument_node_created_fulldate extends views_handler_argument_date {
+
/**
- * Constructor implementation
+ * {@inheritdoc}
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->format = 'F j, Y';
$this->arg_format = 'Ymd';
@@ -22,43 +21,50 @@ class views_handler_argument_node_created_fulldate extends views_handler_argumen
}
/**
- * Provide a link to the next level of the view
+ * Provide a link to the next level of the view.
*/
- function summary_name($data) {
+ public function summary_name($data) {
$created = $data->{$this->name_alias};
return format_date(strtotime($created . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
}
/**
- * Provide a link to the next level of the view
+ * Provide a link to the next level of the view.
*/
- function title() {
- return format_date(strtotime($this->argument . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
+ public function title() {
+ $timestamp = strtotime($this->argument . " 00:00:00 UTC");
+ if ($timestamp !== FALSE) {
+ return format_date($timestamp, 'custom', $this->format, 'UTC');
+ }
}
+
}
/**
- * Argument handler for a year (CCYY)
+ * Argument handler for a year (CCYY).
*/
class views_handler_argument_node_created_year extends views_handler_argument_date {
+
/**
- * Constructor implementation
+ * {@inheritdoc}
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->arg_format = 'Y';
$this->formula = views_date_sql_extract('YEAR', "***table***.$this->real_field");
}
+
}
/**
- * Argument handler for a year plus month (CCYYMM)
+ * Argument handler for a year plus month (CCYYMM).
*/
class views_handler_argument_node_created_year_month extends views_handler_argument_date {
+
/**
- * Constructor implementation
+ * {@inheritdoc}
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->format = 'F Y';
$this->arg_format = 'Ym';
@@ -68,7 +74,7 @@ class views_handler_argument_node_created_year_month extends views_handler_argum
/**
* Provide a link to the next level of the view
*/
- function summary_name($data) {
+ public function summary_name($data) {
$created = $data->{$this->name_alias};
return format_date(strtotime($created . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
}
@@ -76,19 +82,24 @@ class views_handler_argument_node_created_year_month extends views_handler_argum
/**
* Provide a link to the next level of the view
*/
- function title() {
- return format_date(strtotime($this->argument . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
+ public function title() {
+ $timestamp = strtotime($this->argument . "15" . " 00:00:00 UTC");
+ if ($timestamp !== FALSE) {
+ return format_date($timestamp, 'custom', $this->format, 'UTC');
+ }
}
+
}
/**
- * Argument handler for a month (MM)
+ * Argument handler for a month (MM).
*/
class views_handler_argument_node_created_month extends views_handler_argument_date {
+
/**
- * Constructor implementation
+ * {@inheritdoc}
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->formula = views_date_sql_extract('MONTH', "***table***.$this->real_field");
$this->format = 'F';
@@ -98,7 +109,7 @@ class views_handler_argument_node_created_month extends views_handler_argument_d
/**
* Provide a link to the next level of the view
*/
- function summary_name($data) {
+ public function summary_name($data) {
$month = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
return format_date(strtotime("2005" . $month . "15" . " 00:00:00 UTC" ), 'custom', $this->format, 'UTC');
}
@@ -106,25 +117,33 @@ class views_handler_argument_node_created_month extends views_handler_argument_d
/**
* Provide a link to the next level of the view
*/
- function title() {
+ public function title() {
$month = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
- return format_date(strtotime("2005" . $month . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
+ $timestamp = strtotime("2005" . $month . "15" . " 00:00:00 UTC");
+ if ($timestamp !== FALSE) {
+ return format_date($timestamp, 'custom', $this->format, 'UTC');
+ }
}
- function summary_argument($data) {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_argument($data) {
// Make sure the argument contains leading zeroes.
return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
}
+
}
/**
- * Argument handler for a day (DD)
+ * Argument handler for a day (DD).
*/
class views_handler_argument_node_created_day extends views_handler_argument_date {
+
/**
- * Constructor implementation
+ * {@inheritdoc}
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->formula = views_date_sql_extract('DAY', "***table***.$this->real_field");
$this->format = 'j';
@@ -132,46 +151,56 @@ class views_handler_argument_node_created_day extends views_handler_argument_dat
}
/**
- * Provide a link to the next level of the view
+ * Provide a link to the next level of the view.
*/
- function summary_name($data) {
+ public function summary_name($data) {
$day = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
- // strtotime respects server timezone, so we need to set the time fixed as utc time
+ // strtotime() respects server timezone, so we need to set the time fixed
+ // as UTC time.
return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
}
/**
- * Provide a link to the next level of the view
+ * Provide a link to the next level of the view.
*/
- function title() {
+ public function title() {
$day = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
- return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
+ $timestamp = strtotime("2005" . "05" . $day . " 00:00:00 UTC");
+ if ($timestamp !== FALSE) {
+ return format_date($timestamp, 'custom', $this->format, 'UTC');
+ }
}
- function summary_argument($data) {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_argument($data) {
// Make sure the argument contains leading zeroes.
return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
}
+
}
/**
* Argument handler for a week.
*/
class views_handler_argument_node_created_week extends views_handler_argument_date {
+
/**
- * Constructor implementation
+ * {@inheritdoc}
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->arg_format = 'w';
$this->formula = views_date_sql_extract('WEEK', "***table***.$this->real_field");
}
/**
- * Provide a link to the next level of the view
+ * Provide a link to the next level of the view.
*/
- function summary_name($data) {
+ public function summary_name($data) {
$created = $data->{$this->name_alias};
return t('Week @week', array('@week' => $created));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_language.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_language.inc
index 170388a..5effd65 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_language.inc
@@ -9,7 +9,11 @@
* Argument handler to accept a language.
*/
class views_handler_argument_node_language extends views_handler_argument {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct('language');
}
@@ -17,7 +21,7 @@ class views_handler_argument_node_language extends views_handler_argument {
* Override the behavior of summary_name(). Get the user friendly version
* of the language.
*/
- function summary_name($data) {
+ public function summary_name($data) {
return $this->node_language($data->{$this->name_alias});
}
@@ -25,12 +29,16 @@ class views_handler_argument_node_language extends views_handler_argument {
* Override the behavior of title(). Get the user friendly version of the
* node type.
*/
- function title() {
+ public function title() {
return $this->node_language($this->argument);
}
- function node_language($langcode) {
+ /**
+ *
+ */
+ public function node_language($langcode) {
$languages = views_language_list();
return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_nid.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_nid.inc
index b0dbee0..7d64f79 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_nid.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_nid.inc
@@ -2,17 +2,18 @@
/**
* @file
- * Provide node nid argument handler.
+ * Definition of views_handler_argument_node_nid.
*/
/**
* Argument handler to accept a node id.
*/
class views_handler_argument_node_nid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title(). Get the title of the node.
*/
- function title_query() {
+ public function title_query() {
$titles = array();
$result = db_query("SELECT n.title FROM {node} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
@@ -21,4 +22,5 @@ class views_handler_argument_node_nid extends views_handler_argument_numeric {
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_type.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_type.inc
index ea99d7c..569e81e 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_type.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_type.inc
@@ -9,7 +9,11 @@
* Argument handler to accept a node type.
*/
class views_handler_argument_node_type extends views_handler_argument_string {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct('type');
}
@@ -17,7 +21,7 @@ class views_handler_argument_node_type extends views_handler_argument_string {
* Override the behavior of summary_name(). Get the user friendly version
* of the node type.
*/
- function summary_name($data) {
+ public function summary_name($data) {
return $this->node_type($data->{$this->name_alias});
}
@@ -25,15 +29,25 @@ class views_handler_argument_node_type extends views_handler_argument_string {
* Override the behavior of title(). Get the user friendly version of the
* node type.
*/
- function title() {
+ public function title() {
return $this->node_type($this->argument);
}
- function node_type($type) {
+ /**
+ * Get the friendly version of a content type's name.
+ *
+ * @param string $type
+ * The content type to check.
+ *
+ * @return string
+ * The system friendly version of a content type's name.
+ */
+ public function node_type($type) {
$output = node_type_get_name($type);
if (empty($output)) {
$output = t('Unknown content type');
}
return check_plain($output);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_uid_revision.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_uid_revision.inc
index 142882a..ef981f0 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_uid_revision.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_uid_revision.inc
@@ -2,17 +2,22 @@
/**
* @file
- * Defintion of views_handler_argument_node_uid_revision.
+ * Definition of views_handler_argument_node_uid_revision.
*/
/**
- * Filter handler to accept a user id to check for nodes that
- * user posted or created a revision on.
+ * Filter handler to accept a user id to check for nodes that user posted or
+ * created a revision on.
*/
class views_handler_argument_node_uid_revision extends views_handler_argument_comment_user_uid {
- function query($group_by = FALSE) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query($group_by = FALSE) {
$this->ensure_my_table();
$placeholder = $this->placeholder();
$this->query->add_where_expression(0, "$this->table_alias.uid = $placeholder OR ((SELECT COUNT(*) FROM {node_revision} nr WHERE nr.uid = $placeholder AND nr.nid = $this->table_alias.nid) > 0)", array($placeholder => $this->argument));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_vid.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_vid.inc
index 1f970ad..a177804 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_vid.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_argument_node_vid.inc
@@ -2,19 +2,18 @@
/**
* @file
- * Provide node vid argument handler.
+ * Definition of views_handler_argument_node_vid.
*/
/**
* Argument handler to accept a node revision id.
*/
class views_handler_argument_node_vid extends views_handler_argument_numeric {
- // No constructor is necessary.
/**
* Override the behavior of title(). Get the title of the revision.
*/
- function title_query() {
+ public function title_query() {
$titles = array();
$result = db_query("SELECT n.title FROM {node_revision} n WHERE n.vid IN (:vids)", array(':vids' => $this->value));
@@ -23,4 +22,5 @@ class views_handler_argument_node_vid extends views_handler_argument_numeric {
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_history_user_timestamp.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_history_user_timestamp.inc
index dfe4931..bbda56b 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_history_user_timestamp.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_history_user_timestamp.inc
@@ -14,7 +14,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_history_user_timestamp extends views_handler_field_node {
- function init(&$view, &$options) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
global $user;
if ($user->uid) {
@@ -26,7 +30,10 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['comments'] = array('default' => FALSE, 'bool' => TRUE);
@@ -34,7 +41,10 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
if (module_exists('comment')) {
$form['comments'] = array(
@@ -46,7 +56,10 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
}
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
// Only add ourselves to the query if logged in.
global $user;
if (!$user->uid) {
@@ -55,7 +68,10 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
parent::query();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
// Let's default to 'read' state.
// This code shadows node_mark, but it reads from the db directly and
// we already have that info.
@@ -65,7 +81,7 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
$last_read = $this->get_value($values);
$changed = $this->get_value($values, 'changed');
- $last_comment = module_exists('comment') && !empty($this->options['comments']) ? $this->get_value($values, 'last_comment') : 0;
+ $last_comment = module_exists('comment') && !empty($this->options['comments']) ? $this->get_value($values, 'last_comment') : 0;
if (!$last_read && $changed > NODE_NEW_LIMIT) {
$mark = MARK_NEW;
@@ -79,4 +95,5 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
return $this->render_link(theme('mark', array('type' => $mark)), $values);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node.inc
index f712a53..76c4e87 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node.inc
@@ -2,21 +2,26 @@
/**
* @file
- * Contains the basic 'node' field handler.
+ * Definition of views_handler_field_node.
*/
/**
* Field handler to provide simple renderer that allows linking to a node.
+ *
* Definition terms:
- * - link_to_node default: Should this field have the checkbox "link to node" enabled by default.
+ * - link_to_node default: Should this field have the checkbox "link to node"
+ * enabled by default.
*
* @ingroup views_field_handlers
*/
class views_handler_field_node extends views_handler_field {
- function init(&$view, &$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
- // Don't add the additional fields to groupby
+ // Don't add the additional fields to groupby.
if (!empty($this->options['link_to_node'])) {
$this->additional_fields['nid'] = array('table' => 'node', 'field' => 'nid');
if (module_exists('translation')) {
@@ -25,16 +30,19 @@ class views_handler_field_node extends views_handler_field {
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_node'] = array('default' => isset($this->definition['link_to_node default']) ? $this->definition['link_to_node default'] : FALSE, 'bool' => TRUE);
return $options;
}
/**
- * Provide link to node option
+ * Provide link to node option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_node'] = array(
'#title' => t('Link this field to the original piece of content'),
'#description' => t("Enable to override this field's links."),
@@ -50,7 +58,7 @@ class views_handler_field_node extends views_handler_field {
*
* Data should be made XSS safe prior to calling this function.
*/
- function render_link($data, $values) {
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_node']) && !empty($this->additional_fields['nid'])) {
if ($data !== NULL && $data !== '') {
$this->options['alter']['make_link'] = TRUE;
@@ -73,8 +81,12 @@ class views_handler_field_node extends views_handler_field {
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link.inc
index 7e9bbd2..594f62a 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link.inc
@@ -12,13 +12,19 @@
*/
class views_handler_field_node_link extends views_handler_field_entity {
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['text'] = array('default' => '', 'translatable' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['text'] = array(
'#type' => 'textfield',
'#title' => t('Text to display'),
@@ -31,13 +37,19 @@ class views_handler_field_node_link extends views_handler_field_entity {
$form['alter']['external'] = array('#access' => FALSE);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
if ($entity = $this->get_value($values)) {
return $this->render_link($entity, $values);
}
}
- function render_link($node, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($node, $values) {
if (node_access('view', $node)) {
$this->options['alter']['make_link'] = TRUE;
$this->options['alter']['path'] = "node/$node->nid";
@@ -45,4 +57,5 @@ class views_handler_field_node_link extends views_handler_field_entity {
return $text;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_delete.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_delete.inc
index 8271c0b..8bc8292 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_delete.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_delete.inc
@@ -15,7 +15,7 @@ class views_handler_field_node_link_delete extends views_handler_field_node_link
/**
* Renders the link.
*/
- function render_link($node, $values) {
+ public function render_link($node, $values) {
// Ensure user has access to delete this node.
if (!node_access('delete', $node)) {
return;
@@ -28,4 +28,5 @@ class views_handler_field_node_link_delete extends views_handler_field_node_link
$text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_edit.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_edit.inc
index 4e8aad0..b28afc3 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_edit.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_link_edit.inc
@@ -15,7 +15,7 @@ class views_handler_field_node_link_edit extends views_handler_field_node_link {
/**
* Renders the link.
*/
- function render_link($node, $values) {
+ public function render_link($node, $values) {
// Ensure user has access to edit this node.
if (!node_access('update', $node)) {
return;
@@ -28,4 +28,5 @@ class views_handler_field_node_link_edit extends views_handler_field_node_link {
$text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_path.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_path.inc
index f47f85f..eb66415 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_path.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_path.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Handler for node path field.
+ * Definition of views_handler_field_node_path.
*/
/**
@@ -12,19 +12,28 @@
*/
class views_handler_field_node_path extends views_handler_field {
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['absolute'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function construct() {
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['nid'] = 'nid';
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['absolute'] = array(
'#type' => 'checkbox',
@@ -35,13 +44,20 @@ class views_handler_field_node_path extends views_handler_field {
);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$nid = $this->get_value($values, 'nid');
return url("node/$nid", array('absolute' => $this->options['absolute']));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision.inc
index d29b070..1b47d90 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision.inc
@@ -7,15 +7,15 @@
/**
* Contains the basic 'node_revision' field handler.
- */
-
-/**
- * A basic node_revision handler.
*
* @ingroup views_field_handlers
*/
class views_handler_field_node_revision extends views_handler_field_node {
- function init(&$view, &$options) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
if (!empty($this->options['link_to_node_revision'])) {
$this->additional_fields['vid'] = 'vid';
@@ -25,7 +25,11 @@ class views_handler_field_node_revision extends views_handler_field_node {
}
}
}
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_node_revision'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
@@ -34,7 +38,7 @@ class views_handler_field_node_revision extends views_handler_field_node {
/**
* Provide link to revision option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_node_revision'] = array(
'#title' => t('Link this field to its content revision'),
'#description' => t('This will override any other link you have set.'),
@@ -49,7 +53,7 @@ class views_handler_field_node_revision extends views_handler_field_node {
*
* Data should be made XSS safe prior to calling this function.
*/
- function render_link($data, $values) {
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_node_revision']) && $data !== NULL && $data !== '') {
$this->options['alter']['make_link'] = TRUE;
$nid = $this->get_value($values, 'nid');
@@ -71,4 +75,5 @@ class views_handler_field_node_revision extends views_handler_field_node {
}
return $data;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link.inc
index 69047bb..0be4230 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link.inc
@@ -12,16 +12,25 @@
*/
class views_handler_field_node_revision_link extends views_handler_field_node_link {
- function construct() {
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid');
}
- function access() {
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
return user_access('view revisions') || user_access('administer nodes');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
list($node, $vid) = $this->get_revision_entity($values, 'view');
if (!isset($vid)) {
return;
@@ -52,7 +61,7 @@ class views_handler_field_node_revision_link extends views_handler_field_node_li
* A numerically indexed array containing the current node object and the
* revision ID for this row.
*/
- function get_revision_entity($values, $op) {
+ public function get_revision_entity($values, $op) {
$vid = $this->get_value($values, 'node_vid');
$node = $this->get_value($values);
// Unpublished nodes ignore access control.
@@ -63,4 +72,5 @@ class views_handler_field_node_revision_link extends views_handler_field_node_li
}
return array($node, $vid);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_delete.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_delete.inc
index e0d00a7..8c07210 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_delete.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_delete.inc
@@ -12,11 +12,17 @@
*/
class views_handler_field_node_revision_link_delete extends views_handler_field_node_revision_link {
- function access() {
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
return user_access('delete revisions') || user_access('administer nodes');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
list($node, $vid) = $this->get_revision_entity($values, 'delete');
if (!isset($vid)) {
return;
@@ -33,4 +39,5 @@ class views_handler_field_node_revision_link_delete extends views_handler_field_
return !empty($this->options['text']) ? $this->options['text'] : t('delete');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_revert.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_revert.inc
index af20442..64ea972 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_revert.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_revision_link_revert.inc
@@ -12,11 +12,17 @@
*/
class views_handler_field_node_revision_link_revert extends views_handler_field_node_revision_link {
- function access() {
+ /**
+ * {@inheritdoc}
+ */
+ public function access() {
return user_access('revert revisions') || user_access('administer nodes');
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
list($node, $vid) = $this->get_revision_entity($values, 'update');
if (!isset($vid)) {
return;
@@ -33,4 +39,5 @@ class views_handler_field_node_revision_link_revert extends views_handler_field_
return !empty($this->options['text']) ? $this->options['text'] : t('revert');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_type.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_type.inc
index ba8ee3e..e644649 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_type.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_type.inc
@@ -11,7 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_node_type extends views_handler_field_node {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['machine_name'] = array('default' => FALSE, 'bool' => TRUE);
@@ -21,7 +25,7 @@ class views_handler_field_node_type extends views_handler_field_node {
/**
* Provide machine_name option for to node type display.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['machine_name'] = array(
@@ -33,17 +37,21 @@ class views_handler_field_node_type extends views_handler_field_node {
}
/**
- * Render node type as human readable name, unless using machine_name option.
- */
- function render_name($data, $values) {
+ * Render node type as human readable name, unless using machine_name option.
+ */
+ public function render_name($data, $values) {
if ($this->options['machine_name'] != 1 && $data !== NULL && $data !== '') {
return t($this->sanitize_value(node_type_get_name($data)));
}
return $this->sanitize_value($data);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->render_name($value, $values), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_version_count.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_version_count.inc
new file mode 100644
index 0000000..058bb7a
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_version_count.inc
@@ -0,0 +1,27 @@
+ensure_my_table();
+ // Add the field.
+ $params = $this->options['group_type'] != 'group' ? array('function' => $this->options['group_type']) : array();
+ $this->field_alias = $this->query->add_field(NULL, '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {node}.nid)', 'node_version_count', $params);
+
+ $this->add_additional_fields();
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_history_user_timestamp.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_history_user_timestamp.inc
index acdb831..0543acd 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_history_user_timestamp.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_history_user_timestamp.inc
@@ -14,10 +14,16 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_history_user_timestamp extends views_handler_filter {
- // Don't display empty space where the operator would be.
- var $no_operator = TRUE;
- function expose_form(&$form, &$form_state) {
+ /**
+ * Don't display empty space where the operator would be.
+ */
+ public $no_operator = TRUE;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function expose_form(&$form, &$form_state) {
parent::expose_form($form, $form_state);
// @todo There are better ways of excluding required and multiple (object flags)
unset($form['expose']['required']);
@@ -25,7 +31,10 @@ class views_handler_filter_history_user_timestamp extends views_handler_filter {
unset($form['expose']['remember']);
}
- function value_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function value_form(&$form, &$form_state) {
// Only present a checkbox for the exposed filter itself. There's no way
// to tell the difference between not checked and the default value, so
// specifying the default value via the views UI is meaningless.
@@ -44,7 +53,10 @@ class views_handler_filter_history_user_timestamp extends views_handler_filter {
}
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
global $user;
// This can only work if we're logged in.
if (!$user || !$user->uid) {
@@ -58,7 +70,6 @@ class views_handler_filter_history_user_timestamp extends views_handler_filter {
// Hey, Drupal kills old history, so nodes that haven't been updated
// since NODE_NEW_LIMIT are bzzzzzzzt outta here!
-
$limit = REQUEST_TIME - NODE_NEW_LIMIT;
$this->ensure_my_table();
@@ -79,9 +90,13 @@ class views_handler_filter_history_user_timestamp extends views_handler_filter {
$this->query->add_where_expression($this->options['group'], "($field IS NULL AND ($node.changed > (***CURRENT_TIME*** - $limit) $clause)) OR $field < $node.changed $clause2");
}
- function admin_summary() {
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
if (!empty($this->options['exposed'])) {
return t('exposed');
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_access.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_access.inc
index a29b13f..71a9c35 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_access.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_access.inc
@@ -11,16 +11,30 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_access extends views_handler_filter {
- function admin_summary() { }
- function operator_form(&$form, &$form_state) { }
- function can_expose() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function operator_form(&$form, &$form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function can_expose() {
return FALSE;
}
/**
* See _node_access_where_sql() for a non-views query based implementation.
*/
- function query() {
+ public function query() {
if (!user_access('administer nodes') && module_implements('node_grants')) {
$table = $this->ensure_my_table();
$grants = db_or();
@@ -37,4 +51,5 @@ class views_handler_filter_node_access extends views_handler_filter {
$this->query->add_where('AND', $table . '.grant_view', 1, '>=');
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_status.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_status.inc
index 2afb286..b402d9a 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_status.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_status.inc
@@ -11,12 +11,32 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_status extends views_handler_filter {
- function admin_summary() { }
- function operator_form(&$form, &$form_state) { }
- function can_expose() { return FALSE; }
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function operator_form(&$form, &$form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function can_expose() {
+ return FALSE;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$table = $this->ensure_my_table();
$this->query->add_where_expression($this->options['group'], "$table.status = 1 OR ($table.uid = ***CURRENT_USER*** AND ***CURRENT_USER*** <> 0 AND ***VIEW_OWN_UNPUBLISHED_NODES*** = 1) OR ***BYPASS_NODE_ACCESS*** = 1");
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_type.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_type.inc
index 7f8ab4b..f743a87 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_type.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_type.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_type extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Content types');
$types = node_type_get_types();
@@ -23,4 +27,5 @@ class views_handler_filter_node_type extends views_handler_filter_in_operator {
$this->value_options = $options;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc
index 4d3d9a7..3741ef5 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc
@@ -11,15 +11,20 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_uid_revision extends views_handler_filter_user_name {
- function query($group_by = FALSE) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query($group_by = FALSE) {
$this->ensure_my_table();
$placeholder = $this->placeholder();
$args = array_values($this->value);
- $this->query->add_where_expression($this->options['group'], "$this->table_alias.uid IN($placeholder) " . $condition . " OR
+ $this->query->add_where_expression($this->options['group'], "$this->table_alias.uid IN($placeholder) " . "OR
((SELECT COUNT(*) FROM {node_revision} nr WHERE nr.uid IN($placeholder) AND nr.nid = $this->table_alias.nid) > 0)", array($placeholder => $args),
$args);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_version_count.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_version_count.inc
new file mode 100644
index 0000000..3fb7314
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_version_count.inc
@@ -0,0 +1,55 @@
+operator == 'between') {
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) BETWEEN :min AND :max', array(':min' => $this->value['min'], ':max' => $this->value['max']));
+ }
+ else {
+ $this->query->add_where_expression($this->options['group'], '((SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) <= :min OR (SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) >= :max)', array(':min' => $this->value['min'], ':max' => $this->value['max']));
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function op_simple($field) {
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid)' . $this->operator . ' :value', array(':value' => $this->value['value']));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function op_empty($field) {
+ if ($this->operator == 'empty') {
+ $operator = "IS NULL";
+ }
+ else {
+ $operator = "IS NOT NULL";
+ }
+
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) ' . $this->operator);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function op_regex($field) {
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) RLIKE :value', array(':value' => $this->value['value']));
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_sort_node_version_count.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_sort_node_version_count.inc
new file mode 100644
index 0000000..3abb36a
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_sort_node_version_count.inc
@@ -0,0 +1,24 @@
+ensure_my_table();
+
+ $this->query->add_orderby(NULL, '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid)', $this->options['order'], 'sort_node_version_count');
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_default_node.inc b/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_default_node.inc
index 65fc0eb..257b39f 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_default_node.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_default_node.inc
@@ -2,16 +2,20 @@
/**
* @file
- * Contains the node from URL argument default plugin.
+ * Definition of views_plugin_argument_default_node.
*/
/**
- * Default argument plugin to extract a node via menu_get_object
+ * Default argument plugin to extract a node via menu_get_object.
*
* This plugin actually has no options so it odes not need to do a great deal.
*/
class views_plugin_argument_default_node extends views_plugin_argument_default {
- function get_argument() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_argument() {
foreach (range(1, 3) as $i) {
$node = menu_get_object('node', $i);
if (!empty($node)) {
@@ -23,4 +27,5 @@ class views_plugin_argument_default_node extends views_plugin_argument_default {
return arg(1);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_validate_node.inc b/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_validate_node.inc
index 018965d..5fedbab 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_validate_node.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_plugin_argument_validate_node.inc
@@ -2,14 +2,18 @@
/**
* @file
- * Contains the 'node' argument validator plugin.
+ * Definition of views_plugin_argument_validate_node.
*/
/**
* Validate whether an argument is an acceptable node.
*/
class views_plugin_argument_validate_node extends views_plugin_argument_validate {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['types'] = array('default' => array());
$options['access'] = array('default' => FALSE, 'bool' => TRUE);
@@ -19,7 +23,10 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$types = node_type_get_types();
$options = array();
foreach ($types as $type => $info) {
@@ -58,12 +65,19 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
);
}
- function options_submit(&$form, &$form_state, &$options = array()) {
- // filter trash out of the options so we don't store giant unnecessary arrays
+ /**
+ * {@inheritdoc}
+ */
+ public function options_submit(&$form, &$form_state, &$options = array()) {
+ // Filter trash out of the options so we don't store giant unnecessary
+ // arrays.
$options['types'] = array_filter($options['types']);
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['types']) && !empty($this->argument->options['validate_argument_node_type'])) {
$options['types'] = isset($this->argument->options['validate_argument_node_type']) ? $this->argument->options['validate_argument_node_type'] : array();
$options['access'] = !empty($this->argument->options['validate_argument_node_access']);
@@ -72,7 +86,10 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
}
}
- function validate_argument($argument) {
+ /**
+ * {@inheritdoc}
+ */
+ public function validate_argument($argument) {
$types = $this->options['types'];
switch ($this->options['nid_type']) {
@@ -99,7 +116,8 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
}
return isset($types[$node->type]);
- break;
+ break;
+
case 'nids':
$nids = new stdClass();
$nids->value = array($argument);
@@ -111,7 +129,7 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
$test = drupal_map_assoc($nids->value);
$titles = array();
- $result = db_query("SELECT * FROM {node} WHERE nid IN (:nids)", array(':nids' => $nids->value));
+ $result = db_query("SELECT * FROM {node} WHERE nid IN (:nids)", array(':nids' => $nids->value));
foreach ($result as $node) {
if ($types && empty($types[$node->type])) {
return FALSE;
@@ -132,4 +150,5 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
return empty($test);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc b/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc
index 5da746b..d9228e4 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the node RSS row style plugin.
+ * Definition of views_plugin_row_node_rss.
*/
/**
@@ -10,14 +10,26 @@
* and formats it as an RSS item.
*/
class views_plugin_row_node_rss extends views_plugin_row {
- // Basic properties that let the row style follow relationships.
- var $base_table = 'node';
- var $base_field = 'nid';
- // Stores the nodes loaded with pre_render.
- var $nodes = array();
+ /**
+ * Basic properties that let the row style follow relationships.
+ */
+ public $base_table = 'node';
- function option_definition() {
+ /**
+ *
+ */
+ public $base_field = 'nid';
+
+ /**
+ * Stores the nodes loaded with pre_render.
+ */
+ public $nodes = array();
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['item_length'] = array('default' => 'default');
@@ -29,7 +41,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
/**
* Override init function to convert fulltext view-mode to full.
*/
- function init(&$view, &$display, $options = NULL) {
+ public function init(&$view, &$display, $options = NULL) {
parent::init($view, $display, $options);
if ($this->options['item_length'] == 'fulltext') {
@@ -37,7 +49,10 @@ class views_plugin_row_node_rss extends views_plugin_row {
}
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['item_length'] = array(
@@ -56,7 +71,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
/**
* Return the main options, which are shown in the summary title.
*/
- function options_form_summary_options() {
+ public function options_form_summary_options() {
$entity_info = entity_get_info('node');
$options = array();
if (!empty($entity_info['view modes'])) {
@@ -69,13 +84,18 @@ class views_plugin_row_node_rss extends views_plugin_row {
return $options;
}
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
$options = $this->options_form_summary_options();
return check_plain($options[$this->options['item_length']]);
}
-
- function pre_render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render($values) {
$nids = array();
foreach ($values as $row) {
$nids[] = $row->{$this->field_alias};
@@ -85,8 +105,11 @@ class views_plugin_row_node_rss extends views_plugin_row {
}
}
- function render($row) {
- // For the most part, this code is taken from node_feed() in node.module
+ /**
+ * {@inheritdoc}
+ */
+ public function render($row) {
+ // For the most part; This code is taken from node_feed() in node.module.
global $base_url;
$nid = $row->{$this->field_alias};
@@ -99,7 +122,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
$display_mode = variable_get('feed_item_length', 'teaser');
}
- // Load the specified node:
+ // Load the specified node.
$node = $this->nodes[$nid];
if (empty($node)) {
return;
@@ -117,7 +140,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
),
array(
'key' => 'dc:creator',
- 'value' => $node->name,
+ 'value' => format_username($node),
),
array(
'key' => 'guid',
@@ -128,7 +151,6 @@ class views_plugin_row_node_rss extends views_plugin_row {
// The node gets built and modules add to or modify $node->rss_elements
// and $node->rss_namespaces.
-
$build_mode = $display_mode;
$build = node_view($node, $build_mode);
@@ -168,7 +190,8 @@ class views_plugin_row_node_rss extends views_plugin_row {
return theme($this->theme_functions(), array(
'view' => $this->view,
'options' => $this->options,
- 'row' => $item
+ 'row' => $item,
));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_view.inc b/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_view.inc
index 4aefe46..f758dfc 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_view.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_view.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the node view row style plugin.
+ * Definition of views_plugin_row_node_view.
*/
/**
@@ -13,14 +13,26 @@
* @ingroup views_row_plugins
*/
class views_plugin_row_node_view extends views_plugin_row {
- // Basic properties that let the row style follow relationships.
- var $base_table = 'node';
- var $base_field = 'nid';
- // Stores the nodes loaded with pre_render.
- var $nodes = array();
+ /**
+ * Basic properties that let the row style follow relationships.
+ */
+ public $base_table = 'node';
- function init(&$view, &$display, $options = NULL) {
+ /**
+ *
+ */
+ public $base_field = 'nid';
+
+ /**
+ * Stores the nodes loaded with pre_render.
+ */
+ public $nodes = array();
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$display, $options = NULL) {
parent::init($view, $display, $options);
// Handle existing views with the deprecated 'teaser' option.
if (isset($this->options['teaser'])) {
@@ -32,7 +44,10 @@ class views_plugin_row_node_view extends views_plugin_row {
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['view_mode'] = array('default' => 'teaser');
@@ -42,7 +57,10 @@ class views_plugin_row_node_view extends views_plugin_row {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$options = $this->options_form_summary_options();
@@ -51,7 +69,7 @@ class views_plugin_row_node_view extends views_plugin_row {
'#options' => $options,
'#title' => t('View mode'),
'#default_value' => $this->options['view_mode'],
- );
+ );
$form['links'] = array(
'#type' => 'checkbox',
'#title' => t('Display links'),
@@ -61,13 +79,14 @@ class views_plugin_row_node_view extends views_plugin_row {
'#type' => 'checkbox',
'#title' => t('Display comments'),
'#default_value' => $this->options['comments'],
+ '#access' => module_exists('comment'),
);
}
/**
* Return the main options, which are shown in the summary title.
*/
- function options_form_summary_options() {
+ public function options_form_summary_options() {
$entity_info = entity_get_info('node');
$options = array();
if (!empty($entity_info['view modes'])) {
@@ -78,19 +97,25 @@ class views_plugin_row_node_view extends views_plugin_row {
if (empty($options)) {
$options = array(
'teaser' => t('Teaser'),
- 'full' => t('Full content')
+ 'full' => t('Full content'),
);
}
return $options;
}
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
$options = $this->options_form_summary_options();
return check_plain($options[$this->options['view_mode']]);
}
- function pre_render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render($values) {
$nids = array();
foreach ($values as $row) {
$nids[] = $row->{$this->field_alias};
@@ -98,7 +123,10 @@ class views_plugin_row_node_view extends views_plugin_row {
$this->nodes = node_load_multiple($nids);
}
- function render($row) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($row) {
if (isset($this->nodes[$row->{$this->field_alias}])) {
$node = $this->nodes[$row->{$this->field_alias}];
$node->view = $this->view;
@@ -107,4 +135,5 @@ class views_plugin_row_node_view extends views_plugin_row {
return drupal_render($build);
}
}
-}
\ No newline at end of file
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/poll.views.inc b/sites/all/modules/contrib/views/views/modules/poll.views.inc
index d3fd76a..58f3b66 100644
--- a/sites/all/modules/contrib/views/views/modules/poll.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/poll.views.inc
@@ -23,9 +23,8 @@ function poll_views_data() {
);
// ----------------------------------------------------------------
- // Fields
-
- // poll active status
+ // Fields.
+ // Poll active status.
$data['poll']['active'] = array(
'title' => t('Active'),
'help' => t('Whether the poll is open for voting.'),
diff --git a/sites/all/modules/contrib/views/views/modules/profile.views.inc b/sites/all/modules/contrib/views/views/modules/profile.views.inc
index 89db913..96fa227 100644
--- a/sites/all/modules/contrib/views/views/modules/profile.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/profile.views.inc
@@ -12,8 +12,8 @@
*/
function profile_views_data() {
$data['profile_values']['moved to'] = 'profile_value';
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['profile_value']['table']['group'] = t('Profile');
$data['profile_value']['table']['join'] = array(
@@ -60,7 +60,7 @@ function profile_views_data() {
}
/**
- * Get all profile fields
+ * Get all profile fields.
*/
function profile_views_get_fields() {
static $fields = NULL;
@@ -71,14 +71,14 @@ function profile_views_get_fields() {
foreach ($results as $row) {
if (!empty($row->options)) {
- if (!in_array(substr($row->options, 0, 2), array('a:', 'b:', 'i:', 'f:', 'o:', 's:', ))) {
- // unserialized fields default version
+ if (!in_array(substr($row->options, 0, 2), array('a:', 'b:', 'i:', 'f:', 'o:', 's:'))) {
+ // unserialized fields default version.
$options = $row->options;
unset($row->options);
$row->options = $options;
}
else {
- // serialized fields or modified version
+ // serialized fields or modified version.
$row->options = unserialize($row->options);
}
}
@@ -90,7 +90,7 @@ function profile_views_get_fields() {
/**
- * Add profile fields to view table
+ * Add profile fields to view table.
*/
function profile_views_fetch_field($field) {
$data = array(
@@ -116,8 +116,8 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_argument_string',
),
);
-
break;
+
case 'textarea':
$data += array(
'help' => t('Profile textarea'),
@@ -132,8 +132,8 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_filter_string',
),
);
-
break;
+
case 'checkbox':
$data += array(
'help' => t('Profile checkbox'),
@@ -148,10 +148,10 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_filter_boolean_operator',
'accept null' => TRUE,
),
- // @todo there ought to be a boolean argument handler
+ // @todo There ought to be a boolean argument handler.
);
-
break;
+
case 'url':
$data += array(
'help' => t('Profile URL'),
@@ -166,8 +166,8 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_filter_string',
),
);
-
break;
+
case 'selection':
$data += array(
'help' => t('Profile selection'),
@@ -186,8 +186,8 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_argument_string',
),
);
-
break;
+
case 'list':
$data += array(
'help' => t('Profile freeform list %field-name.', array('%field-name' => $field->title)),
@@ -199,8 +199,8 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_filter_string',
),
);
-
break;
+
case 'date':
$data += array(
'help' => t('Profile date %field-name.', array('%field-name' => $field->title)),
@@ -208,10 +208,9 @@ function profile_views_fetch_field($field) {
'handler' => 'views_handler_field_profile_date',
),
);
-
break;
}
- // @todo: add access control to hidden fields.
+ // @todo Add access control to hidden fields.
return $data;
}
diff --git a/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_date.inc b/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_date.inc
index c2cf691..89b099e 100644
--- a/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_date.inc
+++ b/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_date.inc
@@ -6,7 +6,7 @@
*/
/**
- * Field handler display a profile date
+ * Field handler display a profile date.
*
* The dates are stored serialized, which makes them mostly useless from
* SQL. About all we can do is unserialize and display them.
@@ -14,16 +14,20 @@
* @ingroup views_field_handlers
*/
class views_handler_field_profile_date extends views_handler_field_date {
- function options_form(&$form, &$form_state) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
// we can't do "time ago" so remove it from the form.
unset($form['date_format']['#options']['time ago']);
}
/**
- * Display a profile field of type 'date'
+ * Display a profile field of type 'date'.
*/
- function render($values) {
+ public function render($values) {
$value = $this->get_value($values);
if (!$value) {
return;
@@ -34,12 +38,15 @@ class views_handler_field_profile_date extends views_handler_field_date {
case 'custom':
$format = $this->options['custom_date_format'];
break;
+
case 'small':
$format = variable_get('date_format_short', 'm/d/Y - H:i');
break;
+
case 'medium':
$format = variable_get('date_format_medium', 'D, m/d/Y - H:i');
break;
+
case 'large':
$format = variable_get('date_format_long', 'l, F j, Y - H:i');
break;
@@ -48,12 +55,11 @@ class views_handler_field_profile_date extends views_handler_field_date {
// Note: Avoid PHP's date() because it does not handle dates before
// 1970 on Windows. This would make the date field useless for e.g.
// birthdays.
-
- // But we *can* deal with non-year stuff:
+ // But we *can* deal with non-year stuff.
$date = gmmktime(0, 0, 0, $value['month'], $value['day'], $value['year']);
$replace = array(
- // day
+ // day.
'd' => sprintf('%02d', $value['day']),
'D' => NULL,
'l' => NULL,
@@ -61,7 +67,7 @@ class views_handler_field_profile_date extends views_handler_field_date {
'S' => gmdate('S', $date),
'w' => NULL,
'j' => $value['day'],
- // month
+ // month.
'F' => gmdate('F', $date),
'm' => sprintf('%02d', $value['month']),
'M' => gmdate('M', $date),
@@ -70,7 +76,7 @@ class views_handler_field_profile_date extends views_handler_field_date {
'Y' => $value['year'],
'y' => substr($value['year'], 2, 2),
- // kill time stuff
+ // kill time stuff.
'a' => NULL,
'A' => NULL,
'g' => NULL,
@@ -87,4 +93,5 @@ class views_handler_field_profile_date extends views_handler_field_date {
return strtr($format, $replace);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_list.inc b/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_list.inc
index 8917b93..5233850 100644
--- a/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_list.inc
+++ b/sites/all/modules/contrib/views/views/modules/profile/views_handler_field_profile_list.inc
@@ -11,10 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_profile_list extends views_handler_field_prerender_list {
+
/**
* Break up our field into a proper list.
*/
- function pre_render(&$values) {
+ public function pre_render(&$values) {
$this->items = array();
foreach ($values as $value) {
$field = $this->get_value($value);
@@ -27,15 +28,25 @@ class views_handler_field_profile_list extends views_handler_field_prerender_lis
}
}
- function render_item($count, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_item($count, $item) {
return $item['item'];
}
- function document_self_tokens(&$tokens) {
+ /**
+ * {@inheritdoc}
+ */
+ public function document_self_tokens(&$tokens) {
$tokens['[' . $this->options['id'] . '-item' . ']'] = t('The text of the profile item.');
}
- function add_self_tokens(&$tokens, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function add_self_tokens(&$tokens, $item) {
$tokens['[' . $this->options['id'] . '-item' . ']'] = $item['item'];
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/profile/views_handler_filter_profile_selection.inc b/sites/all/modules/contrib/views/views/modules/profile/views_handler_filter_profile_selection.inc
index d3403c9..29b2c7a 100644
--- a/sites/all/modules/contrib/views/views/modules/profile/views_handler_filter_profile_selection.inc
+++ b/sites/all/modules/contrib/views/views/modules/profile/views_handler_filter_profile_selection.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_profile_selection extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (isset($this->value_options)) {
return;
}
@@ -27,4 +31,5 @@ class views_handler_filter_profile_selection extends views_handler_filter_in_ope
}
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/search.views.inc b/sites/all/modules/contrib/views/views/modules/search.views.inc
index dad84bb..09aad14 100644
--- a/sites/all/modules/contrib/views/views/modules/search.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/search.views.inc
@@ -12,12 +12,11 @@
*/
function search_views_data() {
// Basic table information.
-
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['search_index']['table']['group'] = t('Search');
- // For other base tables, explain how we join
+ // For other base tables, explain how we join.
$data['search_index']['table']['join'] = array(
'node' => array(
'left_field' => 'nid',
@@ -35,7 +34,7 @@ function search_views_data() {
'left_table' => 'search_index',
'left_field' => 'word',
'field' => 'word',
- )
+ ),
);
$data['search_dataset']['table']['join'] = array(
@@ -43,22 +42,21 @@ function search_views_data() {
'left_table' => 'search_index',
'left_field' => 'sid',
'field' => 'sid',
- 'extra' => 'search_index.type = search_dataset.type',
+ 'extra' => array('search_index.type = search_dataset.type'),
'type' => 'INNER',
),
'users' => array(
'left_table' => 'search_index',
'left_field' => 'sid',
'field' => 'sid',
- 'extra' => 'search_index.type = search_dataset.type',
+ 'extra' => array('search_index.type = search_dataset.type'),
'type' => 'INNER',
),
);
// ----------------------------------------------------------------
- // Fields
-
- // score
+ // Fields.
+ // Score.
$data['search_index']['score'] = array(
'title' => t('Score'),
'help' => t('The score of the search item. This will not be used if the search filter is not also present.'),
@@ -111,11 +109,13 @@ function search_views_data() {
),
);
- // search filter
+ // Search filter.
$data['search_index']['keys'] = array(
- 'title' => t('Search Terms'), // The item it appears as on the UI,
- 'help' => t('The terms to search for.'), // The help that appears on the UI,
- // Information for searching terms using the full search syntax
+ // The item it appears as on the UI,
+ 'title' => t('Search Terms'),
+ // The help that appears on the UI,
+ 'help' => t('The terms to search for.'),
+ // Information for searching terms using the full search syntax.
'filter' => array(
'handler' => 'views_handler_filter_search',
'no group by' => TRUE,
@@ -135,16 +135,20 @@ function search_views_data() {
function search_views_plugins() {
return;
// DISABLED. This currently doesn't work.
+ // @todo Fix this.
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
+ 'module' => 'views',
+ // This just tells our themes are elsewhere.
'row' => array(
'search' => array(
'title' => t('Search'),
'help' => t('Display the results with standard search view.'),
'handler' => 'views_plugin_row_search_view',
'theme' => 'views_view_row_search',
- 'path' => drupal_get_path('module', 'views') . '/modules/search', // not necessary for most modules
- 'base' => array('node'), // only works with 'node' as base.
+ 'path' => drupal_get_path('module', 'views') . '/modules/search',
+ // Not necessary for most modules.
+ 'base' => array('node'),
+ // Only works with 'node' as base.
'type' => 'normal',
),
'views_handler_argument_search' => array(
@@ -155,16 +159,18 @@ function search_views_plugins() {
}
/**
- * Template helper for theme_views_view_row_search
+ * Template helper for theme_views_view_row_search.
*/
function template_preprocess_views_view_row_search(&$vars) {
- $vars['node'] = ''; // make sure var is defined.
+ $vars['node'] = '';
+ // Make sure var is defined.
$nid = $vars['row']->nid;
if (!is_numeric($nid)) {
return;
}
- // @todo: Once the search row is fixed this node_load should be replace by a node_load_multiple
+ // @todo Once the search row is fixed this node_load should be replace by a
+ // node_load_multiple().
$node = node_load($nid);
if (empty($node)) {
@@ -175,10 +181,10 @@ function template_preprocess_views_view_row_search(&$vars) {
$node = node_build_content($node, FALSE, FALSE);
$node->body = drupal_render($node->content);
- // Fetch comments for snippet
+ // Fetch comments for snippet.
$node->body .= module_invoke('comment', 'nodeapi', $node, 'update index');
- // Fetch terms for snippet
+ // Fetch terms for snippet.
$node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
$vars['url'] = url('node/' . $nid);
@@ -196,7 +202,7 @@ function template_preprocess_views_view_row_search(&$vars) {
$vars['info'] = implode(' - ', $info);
$vars['node'] = $node;
- // @todo: get score from ???
-//$vars['score'] = $item->score;
+ // @todo Where does the score come from?
+ // $vars['score'] = $item->score;
$vars['snippet'] = search_excerpt($vars['view']->value, $node->body);
}
diff --git a/sites/all/modules/contrib/views/views/modules/search.views_default.inc b/sites/all/modules/contrib/views/views/modules/search.views_default.inc
index dcde622..bfd96b8 100644
--- a/sites/all/modules/contrib/views/views/modules/search.views_default.inc
+++ b/sites/all/modules/contrib/views/views/modules/search.views_default.inc
@@ -6,12 +6,12 @@
*/
/**
- * Implementation of hook_views_default_views()
+ * Implements hook_views_default_views().
*/
function search_views_default_views() {
$views = array();
- $view = new view;
+ $view = new view();
$view->name = 'backlinks';
$view->description = 'Displays a list of nodes that link to the node, using the search backlinks table.';
$view->tag = 'default';
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc b/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc
index f0a4a44..1c2d8f6 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc
@@ -13,12 +13,12 @@
class views_handler_argument_search extends views_handler_argument {
/**
- * Take sure that parseSearchExpression is runned and everything is set up for it.
+ * Take sure that parseSearchExpression is runned and everything is set up.
*
- * @param $input
+ * @param string $input
* The search phrase which was input by the user.
*/
- function query_parse_search_expression($input) {
+ public function query_parse_search_expression($input) {
if (!isset($this->search_query)) {
$this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('viewsSearchQuery');
$this->search_query->searchExpression($input, $this->view->base_table);
@@ -29,7 +29,7 @@ class views_handler_argument_search extends views_handler_argument {
/**
* Add this argument to the query.
*/
- function query($group_by = FALSE) {
+ public function query($group_by = FALSE) {
$required = FALSE;
$this->query_parse_search_expression($this->argument);
if (!isset($this->search_query)) {
@@ -42,7 +42,7 @@ class views_handler_argument_search extends views_handler_argument {
}
}
if ($required) {
- if ($this->operator == 'required') {
+ if (isset($this->operator) && ($this->operator == 'required')) {
$this->query->add_where(0, 'FALSE');
}
}
@@ -51,12 +51,13 @@ class views_handler_argument_search extends views_handler_argument {
$search_condition = db_and();
- // Create a new join to relate the 'search_total' table to our current 'search_index' table.
- $join = new views_join;
+ // Create a new join to relate the 'search_total' table to our current
+ // 'search_index' table.
+ $join = new views_join();
$join->construct('search_total', $search_index, 'word', 'word');
$search_total = $this->query->add_relationship('search_total', $join, $search_index);
- $this->search_score = $this->query->add_field('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE));
+ $this->search_score = $this->query->add_field('', "$search_index.score * $search_total.count", 'score', array('aggregate' => TRUE, 'function' => 'sum'));
if (empty($this->query->relationships[$this->relationship])) {
$base_table = $this->query->base_table;
@@ -70,7 +71,7 @@ class views_handler_argument_search extends views_handler_argument {
$search_dataset = $this->query->add_table('search_dataset');
$conditions = $this->search_query->conditions();
$condition_conditions =& $conditions->conditions();
- foreach ($condition_conditions as $key => &$condition) {
+ foreach ($condition_conditions as $key => &$condition) {
// Take sure we just look at real conditions.
if (is_numeric($key)) {
// Replace the conditions with the table alias of views.
@@ -97,4 +98,5 @@ class views_handler_argument_search extends views_handler_argument {
$this->query->add_having_expression(0, "COUNT(*) >= $placeholder", array($placeholder => $matches));
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_handler_field_search_score.inc b/sites/all/modules/contrib/views/views/modules/search/views_handler_field_search_score.inc
index 0feddac..3fa26ef 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_handler_field_search_score.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_handler_field_search_score.inc
@@ -11,7 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_search_score extends views_handler_field_numeric {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['alternate_sort'] = array('default' => '');
@@ -20,7 +24,10 @@ class views_handler_field_search_score extends views_handler_field_numeric {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$style_options = $this->view->display_handler->get_option('style_options');
if (isset($style_options['default']) && $style_options['default'] == $this->options['id']) {
$handlers = $this->view->display_handler->get_handlers('field');
@@ -48,7 +55,10 @@ class views_handler_field_search_score extends views_handler_field_numeric {
parent::options_form($form, $form_state);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
// Check to see if the search filter added 'score' to the table.
// Our filter stores it as $handler->search_score -- and we also
// need to check its relationship to make sure that we're using the same
@@ -65,17 +75,22 @@ class views_handler_field_search_score extends views_handler_field_numeric {
$this->options['exclude'] = TRUE;
if (!empty($this->options['alternate_sort'])) {
if (isset($this->view->style_plugin->options['default']) && $this->view->style_plugin->options['default'] == $this->options['id']) {
- // Since the style handler initiates fields, we plug these values right into the active handler.
+ // Since the style handler initiates fields, we plug these values right
+ // into the active handler.
$this->view->style_plugin->options['default'] = $this->options['alternate_sort'];
$this->view->style_plugin->options['order'] = $this->options['alternate_order'];
}
}
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
// Only render if we exist.
if (isset($this->table_alias)) {
return parent::render($values);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc b/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc
index 16515a7..178858b 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains a search filter handler.
+ * Definition of views_handler_filter_search.
*/
/**
@@ -11,21 +11,28 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_search extends views_handler_filter {
- var $always_multiple = TRUE;
+
+ /**
+ *
+ */
+ public $always_multiple = TRUE;
/**
* Stores a viewsSearchQuery object to be able to use the search.module "api".
*
* @var viewsSearchQuery
*/
- var $search_query = NULL;
+ public $search_query = NULL;
/**
* Checks if the search query has been parsed.
*/
- var $parsed = FALSE;
+ public $parsed = FALSE;
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['operator']['default'] = 'optional';
@@ -35,26 +42,24 @@ class views_handler_filter_search extends views_handler_filter {
}
/**
- * Overrides views_handler_filter::options_form().
- *
- * Add an option to remove search scores from the query.
+ * {@inheritdoc}
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
+ // Add an option to remove search scores from the query.
$form['remove_score'] = array(
'#type' => 'checkbox',
'#title' => t('Remove search score'),
- '#description' => t('Check this box to remove the search score from the query. This can help reduce help reduce duplicate search results when using this filter.'),
+ '#description' => t('Check this box to remove the search score from the query. This can help reduce duplicate search results when using this filter.'),
'#default_value' => $this->options['remove_score'],
);
}
-
/**
- * Provide simple equality operator
+ * Provide simple equality operator.
*/
- function operator_form(&$form, &$form_state) {
+ public function operator_form(&$form, &$form_state) {
$form['operator'] = array(
'#type' => 'radios',
'#title' => t('On empty input'),
@@ -67,9 +72,9 @@ class views_handler_filter_search extends views_handler_filter {
}
/**
- * Provide a simple textfield for equality
+ * Provide a simple textfield for equality.
*/
- function value_form(&$form, &$form_state) {
+ public function value_form(&$form, &$form_state) {
$form['value'] = array(
'#type' => 'textfield',
'#size' => 15,
@@ -82,7 +87,7 @@ class views_handler_filter_search extends views_handler_filter {
/**
* Validate the options form.
*/
- function exposed_validate(&$form, &$form_state) {
+ public function exposed_validate(&$form, &$form_state) {
if (!isset($this->options['expose']['identifier'])) {
return;
}
@@ -97,12 +102,12 @@ class views_handler_filter_search extends views_handler_filter {
}
/**
- * Take sure that parseSearchExpression is runned and everything is set up for it.
+ * Make sure that parseSearchExpression is run and everything is set up.
*
- * @param $input
+ * @param string $input
* The search phrase which was input by the user.
*/
- function query_parse_search_expression($input) {
+ public function query_parse_search_expression($input) {
if (!isset($this->search_query)) {
$this->parsed = TRUE;
$this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('viewsSearchQuery');
@@ -118,7 +123,7 @@ class views_handler_filter_search extends views_handler_filter {
* level of indirection. You will find them in $this->operator
* and $this->value respectively.
*/
- function query() {
+ public function query() {
// Since attachment views don't validate the exposed input, parse the search
// expression if required.
if (!$this->parsed) {
@@ -145,12 +150,13 @@ class views_handler_filter_search extends views_handler_filter {
$search_condition = db_and();
if (!$this->options['remove_score']) {
- // Create a new join to relate the 'serach_total' table to our current 'search_index' table.
- $join = new views_join;
+ // Create a new join to relate the 'serach_total' table to our current
+ // 'search_index' table.
+ $join = new views_join();
$join->construct('search_total', $search_index, 'word', 'word');
$search_total = $this->query->add_relationship('search_total', $join, $search_index);
- $this->search_score = $this->query->add_field('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE));
+ $this->search_score = $this->query->add_field('', "$search_index.score * $search_total.count", 'score', array('aggregate' => TRUE, 'function' => 'sum'));
}
if (empty($this->query->relationships[$this->relationship])) {
@@ -164,7 +170,7 @@ class views_handler_filter_search extends views_handler_filter {
$search_dataset = $this->query->add_table('search_dataset');
$conditions = $this->search_query->conditions();
$condition_conditions =& $conditions->conditions();
- foreach ($condition_conditions as $key => &$condition) {
+ foreach ($condition_conditions as $key => &$condition) {
// Take sure we just look at real conditions.
if (is_numeric($key)) {
// Replace the conditions with the table alias of views.
@@ -193,32 +199,53 @@ class views_handler_filter_search extends views_handler_filter {
// Set to NULL to prevent PDO exception when views object is cached.
$this->search_query = NULL;
}
+
}
/**
* Extends the core SearchQuery.
*/
class viewsSearchQuery extends SearchQuery {
+
+ /**
+ * {@inheritdoc}
+ */
public function &conditions() {
return $this->conditions;
}
+
+ /**
+ * {@inheritdoc}
+ */
public function words() {
return $this->words;
}
+ /**
+ * {@inheritdoc}
+ */
public function simple() {
return $this->simple;
}
+ /**
+ * {@inheritdoc}
+ */
public function matches() {
return $this->matches;
}
+ /**
+ * {@inheritdoc}
+ */
public function publicParseSearchExpression() {
return $this->parseSearchExpression();
}
- function condition_replace_string($search, $replace, &$condition) {
+ /**
+ * {@inheritdoc}
+ */
+ public function condition_replace_string($search, $replace, &$condition) {
if ($condition['field'] instanceof DatabaseCondition) {
$conditions =& $condition['field']->conditions();
foreach ($conditions as $key => &$subcondition) {
@@ -231,4 +258,5 @@ class viewsSearchQuery extends SearchQuery {
$condition['field'] = str_replace($search, $replace, $condition['field']);
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_handler_sort_search_score.inc b/sites/all/modules/contrib/views/views/modules/search/views_handler_sort_search_score.inc
index d37fb65..d21c17c 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_handler_sort_search_score.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_handler_sort_search_score.inc
@@ -11,11 +11,15 @@
* @ingroup views_sort_handlers
*/
class views_handler_sort_search_score extends views_handler_sort {
- function query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
// Check to see if the search filter/argument added 'score' to the table.
- // Our filter stores it as $handler->search_score -- and we also
- // need to check its relationship to make sure that we're using the same
- // one or obviously this won't work.
+ // Our filter stores it as $handler->search_score -- and we also need to
+ // check its relationship to make sure that we're using the same one or
+ // obviously this won't work.
foreach (array('filter', 'argument') as $type) {
foreach ($this->view->{$type} as $handler) {
if (isset($handler->search_score) && $handler->relationship == $this->relationship) {
@@ -26,7 +30,8 @@ class views_handler_sort_search_score extends views_handler_sort {
}
}
- // Do absolutely nothing if there is no filter/argument in place; there is no reason to
- // sort on the raw scores with this handler.
+ // Do absolutely nothing if there is no filter/argument in place; there is
+ // no reason to sort on the raw scores with this handler.
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_plugin_row_search_view.inc b/sites/all/modules/contrib/views/views/modules/search/views_plugin_row_search_view.inc
index e4aacdc..0579f0d 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_plugin_row_search_view.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_plugin_row_search_view.inc
@@ -9,7 +9,11 @@
* Plugin which performs a node_view on the resulting object.
*/
class views_plugin_row_search_view extends views_plugin_row {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['score'] = array('default' => TRUE, 'bool' => TRUE);
@@ -17,7 +21,10 @@ class views_plugin_row_search_view extends views_plugin_row {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['score'] = array(
'#type' => 'checkbox',
'#title' => t('Display score'),
@@ -28,12 +35,13 @@ class views_plugin_row_search_view extends views_plugin_row {
/**
* Override the behavior of the render() function.
*/
- function render($row) {
+ public function render($row) {
return theme($this->theme_functions(),
array(
'view' => $this->view,
'options' => $this->options,
- 'row' => $row
+ 'row' => $row,
));
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/statistics.views.inc b/sites/all/modules/contrib/views/views/modules/statistics.views.inc
index d6637f3..3fe0a28 100644
--- a/sites/all/modules/contrib/views/views/modules/statistics.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/statistics.views.inc
@@ -12,29 +12,27 @@
*/
function statistics_views_data() {
// Basic table information.
-
// ----------------------------------------------------------------
- // node_counter table
-
+ // 'node_counter' table.
$data['node_counter']['table']['group'] = t('Content statistics');
+ // Joins to the node table.
$data['node_counter']['table']['join'] = array(
- // ...to the node table
'node' => array(
'left_field' => 'nid',
'field' => 'nid',
),
);
- // totalcount
+ // Total count.
$data['node_counter']['totalcount'] = array(
'title' => t('Total views'),
'help' => t('The total number of times the node has been viewed.'),
'field' => array(
- 'handler' => 'views_handler_field_numeric',
+ 'handler' => 'views_handler_field_statistics_numeric',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -43,15 +41,15 @@ function statistics_views_data() {
),
);
- // daycount
+ // Day count.
$data['node_counter']['daycount'] = array(
'title' => t('Views today'),
'help' => t('The total number of times the node has been viewed today.'),
'field' => array(
- 'handler' => 'views_handler_field_numeric',
+ 'handler' => 'views_handler_field_statistics_numeric',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -60,13 +58,13 @@ function statistics_views_data() {
),
);
- // timestamp
+ // Timestamp.
$data['node_counter']['timestamp'] = array(
'title' => t('Most recent view'),
'help' => t('The most recent time the node has been viewed.'),
'field' => array(
- 'handler' => 'views_handler_field_date',
+ 'handler' => 'views_handler_field_node_counter_timestamp',
'click sortable' => TRUE,
),
'filter' => array(
@@ -77,13 +75,11 @@ function statistics_views_data() {
),
);
-
// ----------------------------------------------------------------
- // accesslog table
-
+ // 'accesslog' table.
$data['accesslog']['table']['group'] = t('Access log');
- // Advertise this table as a possible base table
+ // Advertise this table as a possible base table.
$data['accesslog']['table']['base'] = array(
'field' => 'aid',
'title' => t('Access log'),
@@ -91,15 +87,15 @@ function statistics_views_data() {
'weight' => 10,
);
- // For other base tables, explain how we join
+ // For other base tables, explain how we join.
$data['accesslog']['table']['join'] = array(
'users' => array(
'field' => 'uid',
'left_field' => 'uid',
- ),
+ ),
);
- // accesslog.aid
+ // Access event ID / 'aid'.
$data['accesslog']['aid'] = array(
'title' => t('Aid'),
'help' => t('Unique access event ID.'),
@@ -120,7 +116,7 @@ function statistics_views_data() {
),
);
- // session id
+ // Session ID.
$data['accesslog']['sid'] = array(
'title' => t('Session ID'),
'help' => t('Browser session ID of user that visited page.'),
@@ -128,19 +124,19 @@ function statistics_views_data() {
'field' => array(
'handler' => 'views_handler_field',
'click sortable' => TRUE,
- ),
- 'filter' => array(
+ ),
+ 'filter' => array(
'handler' => 'views_handler_filter_string',
- ),
- 'argument' => array(
- 'handler' => 'views_handler_argument_string',
- ),
- 'sort' => array(
+ ),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_string',
+ ),
+ 'sort' => array(
'handler' => 'views_handler_sort',
- ),
+ ),
);
- // title
+ // Title.
$data['accesslog']['title'] = array(
'title' => t('Page title'),
'help' => t('Title of page visited.'),
@@ -148,62 +144,7 @@ function statistics_views_data() {
'field' => array(
'handler' => 'views_handler_field_accesslog_path',
'click sortable' => TRUE,
- ),
- 'filter' => array(
- 'handler' => 'views_handler_filter_string',
- ),
- 'sort' => array(
- 'handler' => 'views_handler_sort',
- ),
- 'argument' => array(
- 'handler' => 'views_handler_argument_string',
- ),
- );
-
- // path
- $data['accesslog']['path'] = array(
- 'title' => t('Path'),
- 'help' => t('Internal path to page visited (relative to Drupal root.)'),
-
- 'field' => array(
- 'handler' => 'views_handler_field_accesslog_path',
- 'click sortable' => TRUE,
- ),
- 'filter' => array(
- 'handler' => 'views_handler_filter_string',
- ),
- 'sort' => array(
- 'handler' => 'views_handler_sort',
- ),
- //No argument here. Can't send forward slashes as arguments.
- //Can be worked around by node ID.
- //(but what about aliases?)
- );
-
- // referrer
- $data['accesslog']['url'] = array(
- 'title' => t('Referrer'),
- 'help' => t('Referrer URI.'),
- 'field' => array(
- 'handler' => 'views_handler_field_url',
- 'click sortable' => TRUE,
- ),
- 'filter' => array(
- 'handler' => 'views_handler_filter_string',
),
- 'sort' => array(
- 'handler' => 'views_handler_sort',
- ),
- );
-
- // hostname
- $data['accesslog']['hostname'] = array(
- 'title' => t('Hostname'),
- 'help' => t('Hostname of user that visited the page.'),
- 'field' => array(
- 'handler' => 'views_handler_field',
- 'click sortable' => TRUE,
- ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -215,7 +156,61 @@ function statistics_views_data() {
),
);
- // user
+ // Path.
+ $data['accesslog']['path'] = array(
+ 'title' => t('Path'),
+ 'help' => t('Internal path to page visited (relative to Drupal root.)'),
+
+ 'field' => array(
+ 'handler' => 'views_handler_field_accesslog_path',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_string',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ // No argument here. Can't send forward slashes as arguments. Can be
+ // worked around by node ID. (but what about aliases?)
+ );
+
+ // Referrer.
+ $data['accesslog']['url'] = array(
+ 'title' => t('Referrer'),
+ 'help' => t('Referrer URI.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_url',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_string',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ );
+
+ // Hostname.
+ $data['accesslog']['hostname'] = array(
+ 'title' => t('Hostname'),
+ 'help' => t('Hostname of user that visited the page.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_string',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_string',
+ ),
+ );
+
+ // User ID / 'uid'.
$data['accesslog']['uid'] = array(
'title' => t('User'),
'help' => t('The user who visited the site.'),
@@ -223,10 +218,10 @@ function statistics_views_data() {
'handler' => 'views_handler_relationship',
'base' => 'users',
'base field' => 'uid',
- ),
+ ),
);
- // timer
+ // Timer.
$data['accesslog']['timer'] = array(
'title' => t('Timer'),
'help' => t('Time in milliseconds that the page took to load.'),
@@ -242,7 +237,7 @@ function statistics_views_data() {
),
);
- // timestamp
+ // Timestamp.
$data['accesslog']['timestamp'] = array(
'title' => t('Timestamp'),
'help' => t('Timestamp of when the page was visited.'),
@@ -258,6 +253,5 @@ function statistics_views_data() {
),
);
-
return $data;
}
diff --git a/sites/all/modules/contrib/views/views/modules/statistics.views_default.inc b/sites/all/modules/contrib/views/views/modules/statistics.views_default.inc
index 7f527d5..704e033 100644
--- a/sites/all/modules/contrib/views/views/modules/statistics.views_default.inc
+++ b/sites/all/modules/contrib/views/views/modules/statistics.views_default.inc
@@ -6,12 +6,12 @@
*/
/**
- * Implementation of hook_views_default_views()
+ * Implements hook_views_default_views().
*/
function statistics_views_default_views() {
$views = array();
- $view = new view;
+ $view = new view();
$view->name = 'popular';
$view->description = 'Shows the most-viewed nodes on the site. This requires the statistics to be enabled at administer >> reports >> access log settings.';
$view->tag = 'default';
diff --git a/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_accesslog_path.inc b/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_accesslog_path.inc
index 85b2352..a0132a2 100644
--- a/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_accesslog_path.inc
+++ b/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_accesslog_path.inc
@@ -6,22 +6,26 @@
*/
/**
- * Field handler to provide simple renderer that turns a URL into a clickable link.
+ * Provide simple renderer that turns a URL into a clickable link.
*
* @ingroup views_field_handlers
*/
class views_handler_field_accesslog_path extends views_handler_field {
+
/**
* Override init function to provide generic option to link to node.
*/
- function init(&$view, &$options) {
+ public function init(&$view, &$options) {
parent::init($view, $options);
if (!empty($this->options['display_as_link'])) {
$this->additional_fields['path'] = 'path';
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['display_as_link'] = array('default' => TRUE, 'bool' => TRUE);
@@ -32,7 +36,7 @@ class views_handler_field_accesslog_path extends views_handler_field {
/**
* Provide link to the page being visited.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['display_as_link'] = array(
'#title' => t('Display as link'),
'#type' => 'checkbox',
@@ -41,12 +45,18 @@ class views_handler_field_accesslog_path extends views_handler_field {
parent::options_form($form, $form_state);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
if (!empty($this->options['display_as_link'])) {
$this->options['alter']['make_link'] = TRUE;
$this->options['alter']['path'] = $this->get_value($values, 'path');
@@ -55,4 +65,5 @@ class views_handler_field_accesslog_path extends views_handler_field {
return $data;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_node_counter_timestamp.inc b/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_node_counter_timestamp.inc
new file mode 100644
index 0000000..a57c9ff
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_node_counter_timestamp.inc
@@ -0,0 +1,23 @@
+ 'fid',
'title' => t('File'),
'help' => t("Files maintained by Drupal and various modules."),
'defaults' => array(
- 'field' => 'filename'
+ 'field' => 'filename',
),
);
$data['file_managed']['table']['entity type'] = 'file';
- // fid
+ // File ID / 'fid'.
$data['file_managed']['fid'] = array(
'title' => t('File ID'),
'help' => t('The ID of the file.'),
@@ -40,7 +39,8 @@ function system_views_data() {
),
'argument' => array(
'handler' => 'views_handler_argument_file_fid',
- 'name field' => 'filename', // the field to display in the summary.
+ 'name field' => 'filename',
+ // the field to display in the summary.
'numeric' => TRUE,
),
'filter' => array(
@@ -51,14 +51,14 @@ function system_views_data() {
),
);
- // filename
+ // Filename.
$data['file_managed']['filename'] = array(
'title' => t('Name'),
'help' => t('The name of the file.'),
'field' => array(
'handler' => 'views_handler_field_file',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -70,14 +70,14 @@ function system_views_data() {
),
);
- // uri
+ // URI.
$data['file_managed']['uri'] = array(
'title' => t('Path'),
'help' => t('The path of the file.'),
'field' => array(
'handler' => 'views_handler_field_file_uri',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -89,14 +89,14 @@ function system_views_data() {
),
);
- // filemime
+ // The file's MIME Type.
$data['file_managed']['filemime'] = array(
'title' => t('Mime type'),
'help' => t('The mime type of the file.'),
'field' => array(
'handler' => 'views_handler_field_file_filemime',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -108,7 +108,7 @@ function system_views_data() {
),
);
- // extension
+ // Extension.
$data['file_managed']['extension'] = array(
'title' => t('Extension'),
'help' => t('The extension of the file.'),
@@ -116,17 +116,17 @@ function system_views_data() {
'field' => array(
'handler' => 'views_handler_field_file_extension',
'click sortable' => FALSE,
- ),
+ ),
);
- // filesize
+ // Filesize.
$data['file_managed']['filesize'] = array(
'title' => t('Size'),
'help' => t('The size of the file.'),
'field' => array(
'handler' => 'views_handler_field_file_size',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -135,14 +135,14 @@ function system_views_data() {
),
);
- // status
+ // Status.
$data['file_managed']['status'] = array(
'title' => t('Status'),
'help' => t('The status of the file.'),
'field' => array(
'handler' => 'views_handler_field_file_status',
'click sortable' => TRUE,
- ),
+ ),
'sort' => array(
'handler' => 'views_handler_sort',
),
@@ -151,7 +151,7 @@ function system_views_data() {
),
);
- // timestamp field
+ // Timestamp field.
$data['file_managed']['timestamp'] = array(
'title' => t('Upload date'),
'help' => t('The date the file was uploaded.'),
@@ -167,7 +167,7 @@ function system_views_data() {
),
);
- // uid
+ // User ID / 'uid'.
$data['file_managed']['uid'] = array(
'title' => t('User who uploaded'),
'help' => t('The user that uploaded the file.'),
@@ -180,44 +180,50 @@ function system_views_data() {
);
// ----------------------------------------------------------------------
- // file_usage table
-
+ // file_usage table.
$data['file_usage']['table']['group'] = t('File Usage');
- // Provide field-type-things to several base tables; on the core files table ("file_managed") so
- // that we can create relationships from files to entities, and then on each core entity type base
- // table so that we can provide general relationships between entities and files.
+ // Provide field-type-things to several base tables; on the core files table
+ // ("file_managed") so that we can create relationships from files to
+ // entities, and then on each core entity type base table so that we can
+ // provide general relationships between entities and files.
$data['file_usage']['table']['join'] = array(
- // Link ourself to the {file_managed} table so we can provide file->entity relationships.
+ // Link ourself to the {file_managed} table so we can provide file->entity
+ // relationships.
'file_managed' => array(
'field' => 'fid',
'left_field' => 'fid',
),
- // Link ourself to the {node} table so we can provide node->file relationships.
+ // Link ourself to the {node} table so we can provide node->file
+ // relationships.
'node' => array(
'field' => 'id',
'left_field' => 'nid',
'extra' => array(array('field' => 'type', 'value' => 'node')),
),
- // Link ourself to the {users} table so we can provide user->file relationships.
+ // Link ourself to the {users} table so we can provide user->file
+ // relationships.
'users' => array(
'field' => 'id',
'left_field' => 'uid',
'extra' => array(array('field' => 'type', 'value' => 'user')),
),
- // Link ourself to the {comment} table so we can provide comment->file relationships.
+ // Link ourself to the {comment} table so we can provide comment->file
+ // relationships.
'comment' => array(
'field' => 'id',
'left_field' => 'cid',
'extra' => array(array('field' => 'type', 'value' => 'comment')),
),
- // Link ourself to the {taxonomy_term_data} table so we can provide taxonomy_term->file relationships.
+ // Link ourself to the {taxonomy_term_data} table so we can provide
+ // taxonomy_term->file relationships.
'taxonomy_term_data' => array(
'field' => 'id',
'left_field' => 'tid',
'extra' => array(array('field' => 'type', 'value' => 'taxonomy_term')),
),
- // Link ourself to the {taxonomy_vocabulary} table so we can provide taxonomy_vocabulary->file relationships.
+ // Link ourself to the {taxonomy_vocabulary} table so we can provide
+ // taxonomy_vocabulary->file relationships.
'taxonomy_vocabulary' => array(
'field' => 'id',
'left_field' => 'vid',
@@ -225,16 +231,16 @@ function system_views_data() {
),
);
- // Provide a relationship between the files table and each entity type, and between each entity
- // type and the files table. Entity->file relationships are type-restricted in the joins
- // declared above, and file->entity relationships are type-restricted in the relationship
- // declarations below.
-
+ // Provide a relationship between the files table and each entity type, and
+ // between each entity type and the files table. Entity->file relationships
+ // are type-restricted in the joins declared above, and file->entity
+ // relationships are type-restricted in the relationship declarations below.
// Relationships between files and nodes.
$data['file_usage']['file_to_node'] = array(
'title' => t('Content'),
'help' => t('Content that is associated with this file, usually because this file is in a field on the content.'),
- // Only provide this field/relationship/etc. when the 'file_managed' base table is present.
+ // Only provide this field/relationship/etc. when the 'file_managed' base
+ // table is present.
'skip base' => array('node', 'node_revision', 'users', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'id',
'relationship' => array(
@@ -249,7 +255,8 @@ function system_views_data() {
$data['file_usage']['node_to_file'] = array(
'title' => t('File'),
'help' => t('A file that is associated with this node, usually because it is in a field on the node.'),
- // Only provide this field/relationship/etc. when the 'node' base table is present.
+ // Only provide this field/relationship/etc. when the 'node' base table is
+ // present.
'skip base' => array('file_managed', 'users', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'fid',
'relationship' => array(
@@ -265,7 +272,8 @@ function system_views_data() {
$data['file_usage']['file_to_user'] = array(
'title' => t('User'),
'help' => t('A user that is associated with this file, usually because this file is in a field on the user.'),
- // Only provide this field/relationship/etc. when the 'file_managed' base table is present.
+ // Only provide this field/relationship/etc. when the 'file_managed' base
+ // table is present.
'skip base' => array('node', 'node_revision', 'users', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'id',
'relationship' => array(
@@ -280,7 +288,8 @@ function system_views_data() {
$data['file_usage']['user_to_file'] = array(
'title' => t('File'),
'help' => t('A file that is associated with this user, usually because it is in a field on the user.'),
- // Only provide this field/relationship/etc. when the 'users' base table is present.
+ // Only provide this field/relationship/etc. when the 'users' base table is
+ // present.
'skip base' => array('file_managed', 'node', 'node_revision', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'fid',
'relationship' => array(
@@ -296,7 +305,8 @@ function system_views_data() {
$data['file_usage']['file_to_comment'] = array(
'title' => t('Comment'),
'help' => t('A comment that is associated with this file, usually because this file is in a field on the comment.'),
- // Only provide this field/relationship/etc. when the 'file_managed' base table is present.
+ // Only provide this field/relationship/etc. when the 'file_managed' base
+ // table is present.
'skip base' => array('node', 'node_revision', 'users', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'id',
'relationship' => array(
@@ -311,7 +321,8 @@ function system_views_data() {
$data['file_usage']['comment_to_file'] = array(
'title' => t('File'),
'help' => t('A file that is associated with this comment, usually because it is in a field on the comment.'),
- // Only provide this field/relationship/etc. when the 'comment' base table is present.
+ // Only provide this field/relationship/etc. when the 'comment' base table
+ // is present.
'skip base' => array('file_managed', 'node', 'node_revision', 'users', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'fid',
'relationship' => array(
@@ -327,7 +338,8 @@ function system_views_data() {
$data['file_usage']['file_to_taxonomy_term'] = array(
'title' => t('Taxonomy Term'),
'help' => t('A taxonomy term that is associated with this file, usually because this file is in a field on the taxonomy term.'),
- // Only provide this field/relationship/etc. when the 'file_managed' base table is present.
+ // Only provide this field/relationship/etc. when the 'file_managed' base
+ // table is present.
'skip base' => array('node', 'node_revision', 'users', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'id',
'relationship' => array(
@@ -342,7 +354,8 @@ function system_views_data() {
$data['file_usage']['taxonomy_term_to_file'] = array(
'title' => t('File'),
'help' => t('A file that is associated with this taxonomy term, usually because it is in a field on the taxonomy term.'),
- // Only provide this field/relationship/etc. when the 'taxonomy_term_data' base table is present.
+ // Only provide this field/relationship/etc. when the 'taxonomy_term_data'
+ // base table is present.
'skip base' => array('file_managed', 'node', 'node_revision', 'users', 'comment', 'taxonomy_vocabulary'),
'real field' => 'fid',
'relationship' => array(
@@ -358,7 +371,8 @@ function system_views_data() {
$data['file_usage']['file_to_taxonomy_vocabulary'] = array(
'title' => t('Taxonomy Vocabulary'),
'help' => t('A taxonomy vocabulary that is associated with this file, usually because this file is in a field on the taxonomy vocabulary.'),
- // Only provide this field/relationship/etc. when the 'file_managed' base table is present.
+ // Only provide this field/relationship/etc. when the 'file_managed' base
+ // table is present.
'skip base' => array('node', 'node_revision', 'users', 'comment', 'taxonomy_term_data', 'taxonomy_vocabulary'),
'real field' => 'id',
'relationship' => array(
@@ -373,7 +387,8 @@ function system_views_data() {
$data['file_usage']['taxonomy_vocabulary_to_file'] = array(
'title' => t('File'),
'help' => t('A file that is associated with this taxonomy vocabulary, usually because it is in a field on the taxonomy vocabulary.'),
- // Only provide this field/relationship/etc. when the 'taxonomy_vocabulary' base table is present.
+ // Only provide this field/relationship/etc. when the 'taxonomy_vocabulary'
+ // base table is present.
'skip base' => array('file_managed', 'node', 'node_revision', 'users', 'comment', 'taxonomy_term_data'),
'real field' => 'fid',
'relationship' => array(
@@ -385,15 +400,16 @@ function system_views_data() {
),
);
- // Provide basic fields from the {file_usage} table to all of the base tables we've declared
- // joins to (because there is no 'skip base' property on these fields).
+ // Provide basic fields from the {file_usage} table to all of the base tables
+ // we've declared joins to (because there is no 'skip base' property on these
+ // fields).
$data['file_usage']['module'] = array(
'title' => t('Module'),
'help' => t('The module managing this file relationship.'),
'field' => array(
'handler' => 'views_handler_field',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -410,7 +426,7 @@ function system_views_data() {
'field' => array(
'handler' => 'views_handler_field',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -444,7 +460,7 @@ function system_views_data() {
'field' => array(
'handler' => 'views_handler_field_numeric',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -454,18 +470,18 @@ function system_views_data() {
);
// ----------------------------------------------------------------------
- // system table
+ // System table.
$data['system']['table']['group'] = t('System');
- // Advertise this table as a possible base table
+ // Advertise this table as a possible base table.
$data['system']['table']['base'] = array(
'field' => 'filename',
'title' => t('Module/Theme/Theme engine'),
'help' => t('Modules/Themes/Theme engines in your codebase.'),
);
- // fields
- // - filename
+ // Fields.
+ // - filename.
$data['system']['filename'] = array(
'title' => t('Module/Theme/Theme engine filename'),
'help' => t('The path of the primary file for this item, relative to the Drupal root; e.g. modules/node/node.module.'),
@@ -474,8 +490,9 @@ function system_views_data() {
'click sortable' => TRUE,
),
'argument' => array(
+ // The field to display in the summary.
'handler' => 'views_handler_argument_string',
- 'name field' => 'filename', // the field to display in the summary.
+ 'name field' => 'filename',
),
'filter' => array(
'handler' => 'views_handler_filter_string',
@@ -484,7 +501,7 @@ function system_views_data() {
'handler' => 'views_handler_sort',
),
);
- // - name
+ // - name.
$data['system']['name'] = array(
'title' => t('Module/Theme/Theme engine name'),
'help' => t('The name of the item; e.g. node.'),
@@ -493,8 +510,9 @@ function system_views_data() {
'click sortable' => TRUE,
),
'argument' => array(
+ // The field to display in the summary.
'handler' => 'views_handler_argument_string',
- 'name field' => 'name', // the field to display in the summary.
+ 'name field' => 'name',
),
'filter' => array(
'handler' => 'views_handler_filter_string',
@@ -503,7 +521,7 @@ function system_views_data() {
'handler' => 'views_handler_sort',
),
);
- // - type
+ // - type.
$data['system']['type'] = array(
'title' => t('Type'),
'help' => t('The type of the item, either module, theme, or theme_engine.'),
@@ -512,8 +530,9 @@ function system_views_data() {
'click sortable' => TRUE,
),
'argument' => array(
+ // The field to display in the summary.
'handler' => 'views_handler_argument_string',
- 'name field' => 'type', // the field to display in the summary.
+ 'name field' => 'type',
),
'filter' => array(
'handler' => 'views_handler_filter_system_type',
@@ -522,7 +541,7 @@ function system_views_data() {
'handler' => 'views_handler_sort',
),
);
- // - status
+ // - status.
$data['system']['status'] = array(
'title' => t('Status'),
'help' => t('Boolean indicating whether or not this item is enabled.'),
@@ -531,8 +550,9 @@ function system_views_data() {
'click sortable' => TRUE,
),
'argument' => array(
+ // The field to display in the summary.
'handler' => 'views_handler_argument_numeric',
- 'name field' => 'status', // the field to display in the summary.
+ 'name field' => 'status',
),
'filter' => array(
'handler' => 'views_handler_filter_boolean_operator',
@@ -541,7 +561,7 @@ function system_views_data() {
'handler' => 'views_handler_sort',
),
);
- // - schema version
+ // - schema version.
$data['system']['schema_version'] = array(
'title' => t('Schema version'),
'help' => t("The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."),
@@ -550,8 +570,9 @@ function system_views_data() {
'click sortable' => TRUE,
),
'argument' => array(
+ // The field to display in the summary.
'handler' => 'views_handler_argument_numeric',
- 'name field' => 'schema_version', // the field to display in the summary.
+ 'name field' => 'schema_version',
),
'filter' => array(
'handler' => 'views_handler_filter_numeric',
@@ -564,6 +585,17 @@ function system_views_data() {
return $data;
}
+/**
+ * Obtain a human readable label for a file's status.
+ *
+ * @param int $choice
+ * Indicate the file's status, expected to be either '0' for a temporary file
+ * or the value of FILE_STATUS_PERMANENT for a permanent file; any other value
+ * will be indicated as being 'Unknown'.
+ *
+ * @return string
+ * A string representing the file's status.
+ */
function _views_file_status($choice = NULL) {
$status = array(
0 => t('Temporary'),
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_argument_file_fid.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_argument_file_fid.inc
index aa2d947..15860dc 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_argument_file_fid.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_argument_file_fid.inc
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_file_fid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title_query(). Get the filenames.
*/
- function title_query() {
+ public function title_query() {
$titles = db_select('file_managed', 'f')
->fields('f', array('filename'))
->condition('fid', $this->value)
@@ -25,4 +26,5 @@ class views_handler_argument_file_fid extends views_handler_argument_numeric {
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file.inc
index 4168acf..a69bca8 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file.inc
@@ -11,26 +11,30 @@
* @ingroup views_field_handlers
*/
class views_handler_field_file extends views_handler_field {
+
/**
* Constructor to provide additional field to add.
*/
- function init(&$view, &$options) {
+ public function init(&$view, &$options) {
parent::init($view, $options);
if (!empty($options['link_to_file'])) {
$this->additional_fields['uri'] = 'uri';
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_file'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
/**
- * Provide link to file option
+ * Provide link to file option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_file'] = array(
'#title' => t('Link this field to download the file'),
'#description' => t("Enable to override this field's links."),
@@ -45,7 +49,7 @@ class views_handler_field_file extends views_handler_field {
*
* Data should be made XSS safe prior to calling this function.
*/
- function render_link($data, $values) {
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_file']) && $data !== NULL && $data !== '') {
$this->options['alter']['make_link'] = TRUE;
$this->options['alter']['path'] = file_create_url($this->get_value($values, 'uri'));
@@ -54,8 +58,12 @@ class views_handler_field_file extends views_handler_field {
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_extension.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_extension.inc
index b543d8a..55a0db2 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_extension.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_extension.inc
@@ -7,15 +7,23 @@
/**
* Returns a pure file extension of the file, for example 'module'.
+ *
* @ingroup views_field_handlers
*/
class views_handler_field_file_extension extends views_handler_field {
+
+ /**
+ * {@inheritdoc}
+ */
public function option_definition() {
$options = parent::option_definition();
$options['extension_detect_tar'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
+ /**
+ * {@inheritdoc}
+ */
public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['extension_detect_tar'] = array(
@@ -26,7 +34,10 @@ class views_handler_field_file_extension extends views_handler_field {
);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
if (!$this->options['extension_detect_tar']) {
if (preg_match('/\.([^\.]+)$/', $value, $match)) {
@@ -46,4 +57,5 @@ class views_handler_field_file_extension extends views_handler_field {
}
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_filemime.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_filemime.inc
index 318fdcf..9648d0f 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_filemime.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_filemime.inc
@@ -6,18 +6,25 @@
*/
/**
- * Field handler to add rendering MIME type images as an option on the filemime field.
+ * Add rendering MIME type images as an option on the 'filemime' field.
*
* @ingroup views_field_handlers
*/
class views_handler_field_file_filemime extends views_handler_field_file {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['filemime_image'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['filemime_image'] = array(
'#title' => t('Display an icon representing the file type, instead of the MIME text (such as "image/jpeg")'),
'#type' => 'checkbox',
@@ -26,7 +33,10 @@ class views_handler_field_file_filemime extends views_handler_field_file {
parent::options_form($form, $form_state);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$data = $values->{$this->field_alias};
if (!empty($this->options['filemime_image']) && $data !== NULL && $data !== '') {
$fake_file = (object) array('filemime' => $data);
@@ -35,4 +45,5 @@ class views_handler_field_file_filemime extends views_handler_field_file {
return $this->render_link($data, $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_status.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_status.inc
index ac1022c..ecfaf99 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_status.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_status.inc
@@ -11,8 +11,13 @@
* @ingroup views_field_handlers
*/
class views_handler_field_file_status extends views_handler_field {
- function render($values) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return _views_file_status($value);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_uri.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_uri.inc
index 334e505..527fdc7 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_uri.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_field_file_uri.inc
@@ -6,16 +6,24 @@
*/
/**
- * Field handler to add rendering file paths as file URLs instead of as internal file URIs.
+ * Field handler to add rendering file paths as file URLs instead of as internal
+ * file URIs.
*/
class views_handler_field_file_uri extends views_handler_field_file {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['file_download_path'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['file_download_path'] = array(
'#title' => t('Display download path instead of file storage URI'),
'#description' => t('This will provide the full download URL rather than the internal filestream address.'),
@@ -25,11 +33,15 @@ class views_handler_field_file_uri extends views_handler_field_file {
parent::options_form($form, $form_state);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$data = $values->{$this->field_alias};
if (!empty($this->options['file_download_path']) && $data !== NULL && $data !== '') {
$data = file_create_url($data);
}
return $this->render_link($data, $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_file_status.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_file_status.inc
index 6194395..057d1bf 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_file_status.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_file_status.inc
@@ -11,9 +11,14 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_file_status extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_options = _views_file_status();
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_system_type.inc b/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_system_type.inc
index 84d4bcd..ff6b4bd 100644
--- a/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_system_type.inc
+++ b/sites/all/modules/contrib/views/views/modules/system/views_handler_filter_system_type.inc
@@ -9,7 +9,11 @@
* Filter by system type.
*/
class views_handler_filter_system_type extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Type');
// Enable filtering by type.
@@ -18,4 +22,5 @@ class views_handler_filter_system_type extends views_handler_filter_in_operator
$this->value_options = $types;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy.views.inc b/sites/all/modules/contrib/views/views/modules/taxonomy.views.inc
index 58d62d1..ddf91e1 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy.views.inc
@@ -14,13 +14,12 @@ function taxonomy_views_data() {
$data = array();
// ----------------------------------------------------------------------
- // taxonomy_vocabulary table
-
+ // 'taxonomy_vocabulary' table.
$data['vocabulary']['moved to'] = 'taxonomy_vocabulary';
$data['taxonomy_vocabulary']['table']['group'] = t('Taxonomy vocabulary');
$data['taxonomy_vocabulary']['table']['join'] = array(
- // vocabulary links to taxonomy_term_data directly via vid.
+ // Vocabulary links to taxonomy_term_data directly via vid.
'taxonomy_term_data' => array(
'left_field' => 'vid',
'field' => 'vid',
@@ -35,9 +34,10 @@ function taxonomy_views_data() {
),
);
- // vocabulary name
+ // Vocabulary name.
$data['taxonomy_vocabulary']['name'] = array(
- 'title' => t('Name'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Name'),
'field' => array(
'help' => t('Name of the vocabulary a term is a member of. This will be the vocabulary that whichever term the "Taxonomy: Term" field is; and can similarly cause duplicates.'),
'handler' => 'views_handler_field',
@@ -49,7 +49,8 @@ function taxonomy_views_data() {
),
);
$data['taxonomy_vocabulary']['machine_name'] = array(
- 'title' => t('Machine name'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Machine name'),
'field' => array(
'help' => t('Machine-Name of the vocabulary a term is a member of. This will be the vocabulary that whichever term the "Taxonomy: Term" field is; and can similarly cause duplicates.'),
'handler' => 'views_handler_field',
@@ -65,7 +66,8 @@ function taxonomy_views_data() {
),
);
$data['taxonomy_vocabulary']['vid'] = array(
- 'title' => t('Vocabulary ID'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Vocabulary ID'),
'help' => t('The taxonomy vocabulary ID'),
'field' => array(
'handler' => 'views_handler_field_numeric',
@@ -80,7 +82,8 @@ function taxonomy_views_data() {
),
);
$data['taxonomy_vocabulary']['description'] = array(
- 'title' => t('Description'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Description'),
'help' => t('The taxonomy vocabulary description'),
'field' => array(
'handler' => 'views_handler_field',
@@ -106,27 +109,24 @@ function taxonomy_views_data() {
);
// ----------------------------------------------------------------------
- // taxonomy_term_data table
-
+ // 'taxonomy_term_data' table.
$data['term_data']['moved to'] = 'taxonomy_term_data';
$data['taxonomy_term_data']['table']['group'] = t('Taxonomy term');
$data['taxonomy_term_data']['table']['base'] = array(
'field' => 'tid',
'title' => t('Term'),
'help' => t('Taxonomy terms are attached to nodes.'),
- 'access query tag' => 'term_access',
+ 'access query tag' => 'taxonomy_term_access',
);
$data['taxonomy_term_data']['table']['entity type'] = 'taxonomy_term';
-
-
- // The term data table
+ // The term data table.
$data['taxonomy_term_data']['table']['join'] = array(
'taxonomy_vocabulary' => array(
'field' => 'vid',
'left_field' => 'vid',
),
- // This is provided for many_to_one argument
+ // This is provided for many_to_one argument.
'taxonomy_index' => array(
'field' => 'tid',
'left_field' => 'tid',
@@ -141,7 +141,7 @@ function taxonomy_views_data() {
),
);
- // tid field
+ // Term ID / 'tid' field.
$data['taxonomy_term_data']['tid'] = array(
'title' => t('Term ID'),
'help' => t('The tid of a taxonomy term.'),
@@ -166,7 +166,7 @@ function taxonomy_views_data() {
),
);
- // raw tid field
+ // The raw term 'tid' field.
$data['taxonomy_term_data']['tid_raw'] = array(
'title' => t('Term ID'),
'help' => t('The tid of a taxonomy term.'),
@@ -186,13 +186,13 @@ function taxonomy_views_data() {
'relationship field' => 'tid',
'outer field' => 'taxonomy_term_data.tid',
'argument table' => 'taxonomy_term_data',
- 'argument field' => 'tid',
+ 'argument field' => 'tid',
'base' => 'node',
'field' => 'nid',
),
);
- // Term name field
+ // Term name field.
$data['taxonomy_term_data']['name'] = array(
'title' => t('Name'),
'help' => t('The taxonomy term name.'),
@@ -215,7 +215,7 @@ function taxonomy_views_data() {
),
);
- // taxonomy weight
+ // Term weight.
$data['taxonomy_term_data']['weight'] = array(
'title' => t('Weight'),
'help' => t('The term weight field'),
@@ -234,7 +234,7 @@ function taxonomy_views_data() {
),
);
- // Term description
+ // Term description.
$data['taxonomy_term_data']['description'] = array(
'title' => t('Term description'),
'help' => t('The description associated with a taxonomy term.'),
@@ -247,7 +247,7 @@ function taxonomy_views_data() {
),
);
- // Term vocabulary
+ // Term vocabulary.
$data['taxonomy_term_data']['vid'] = array(
'title' => t('Vocabulary'),
'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
@@ -256,7 +256,7 @@ function taxonomy_views_data() {
),
);
- // Link to edit the term
+ // Link to edit the term.
$data['taxonomy_term_data']['edit_term'] = array(
'field' => array(
'title' => t('Term edit link'),
@@ -266,19 +266,18 @@ function taxonomy_views_data() {
);
// ----------------------------------------------------------------------
- // taxonomy_index table
-
+ // 'taxonomy_index' table.
$data['term_node']['moved to'] = 'taxonomy_index';
$data['taxonomy_index']['table']['group'] = t('Taxonomy term');
$data['taxonomy_index']['table']['join'] = array(
'taxonomy_term_data' => array(
- // links directly to taxonomy_term_data via tid
+ // Links directly to taxonomy_term_data via tid.
'left_field' => 'tid',
'field' => 'tid',
),
'node' => array(
- // links directly to node via nid
+ // Links directly to node via nid.
'left_field' => 'nid',
'field' => 'nid',
),
@@ -300,9 +299,8 @@ function taxonomy_views_data() {
),
);
- // @todo This stuff needs to move to a node field since
- // really it's all about nodes.
- // tid field
+ // @todo Should be moved to a node field since really it's all about nodes.
+ // Term ID / 'tid' field.
$data['taxonomy_index']['tid'] = array(
'group' => t('Content'),
'title' => t('Has taxonomy term ID'),
@@ -326,19 +324,18 @@ function taxonomy_views_data() {
);
// ----------------------------------------------------------------------
- // term_hierarchy table
-
+ // 'term_hierarchy' table.
$data['taxonomy_term_hierarchy']['table']['group'] = t('Taxonomy term');
$data['term_hierarchy']['moved to'] = 'taxonomy_term_hierarchy';
$data['taxonomy_term_hierarchy']['table']['join'] = array(
'taxonomy_term_hierarchy' => array(
- // links to self through left.parent = right.tid (going down in depth)
+ // Links to self through left.parent = right.tid (going down in depth).
'left_field' => 'tid',
'field' => 'parent',
),
'taxonomy_term_data' => array(
- // links directly to taxonomy_term_data via tid
+ // Links directly to taxonomy_term_data via tid.
'left_field' => 'tid',
'field' => 'tid',
),
@@ -407,6 +404,20 @@ function taxonomy_views_data_alter(&$data) {
),
);
+ $data['node']['term_node_tid_depth_join'] = array(
+ 'help' => t('Display content if it has the selected taxonomy terms, or children of the selected terms. Due to additional complexity, this has fewer options than the versions without depth.'),
+ 'real field' => 'nid',
+ 'argument' => array(
+ 'title' => t('Has taxonomy term ID with depth (using joins)'),
+ 'handler' => 'views_handler_argument_term_node_tid_depth_join',
+ 'accept depth modifier' => TRUE,
+ ),
+ 'filter' => array(
+ 'title' => t('Has taxonomy terms with depth (using joins)'),
+ 'handler' => 'views_handler_filter_term_node_tid_depth_join',
+ ),
+ );
+
$data['node']['term_node_tid_depth_modifier'] = array(
'title' => t('Has taxonomy term ID depth modifier'),
'help' => t('Allows the "depth" for Taxonomy: Term ID (with depth) to be modified via an additional contextual filter value.'),
@@ -419,8 +430,8 @@ function taxonomy_views_data_alter(&$data) {
/**
* Implements hook_field_views_data().
*
- * Views integration for taxonomy_term_reference fields. Adds a term relationship to the default
- * field data.
+ * Views integration for taxonomy_term_reference fields. Adds a term
+ * relationship to the default field data.
*
* @see field_views_field_default_views_data()
*/
@@ -441,7 +452,6 @@ function taxonomy_field_views_data($field) {
'base field' => 'tid',
'label' => t('term from !field_name', array('!field_name' => $field['field_name'])),
);
-
}
return $data;
@@ -493,12 +503,13 @@ function taxonomy_field_views_data_views_data_alter(&$data, $field) {
*/
function taxonomy_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
+ // This just tells our themes are elsewhere.
+ 'module' => 'views',
'argument validator' => array(
'taxonomy_term' => array(
'title' => t('Taxonomy term'),
'handler' => 'views_plugin_argument_validate_taxonomy_term',
- 'path' => drupal_get_path('module', 'views') . '/modules/taxonomy', // not necessary for most modules
+ 'path' => drupal_get_path('module', 'views') . '/modules/taxonomy',
),
),
'argument default' => array(
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy.views_default.inc b/sites/all/modules/contrib/views/views/modules/taxonomy.views_default.inc
index f43a082..bb6a079 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy.views_default.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy.views_default.inc
@@ -6,12 +6,12 @@
*/
/**
- * Implementation of hook_views_default_views()
+ * Implements hook_views_default_views().
*/
function taxonomy_views_default_views() {
$views = array();
- $view = new view;
+ $view = new view();
$view->name = 'taxonomy_term';
$view->description = 'A view to emulate Drupal core\'s handling of taxonomy/term.';
$view->tag = 'default';
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_taxonomy.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_taxonomy.inc
index 10fc500..0aa04b9 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_taxonomy.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_taxonomy.inc
@@ -15,7 +15,7 @@ class views_handler_argument_taxonomy extends views_handler_argument_numeric {
/**
* Override the behavior of title(). Get the title of the node.
*/
- function title() {
+ public function title() {
// There might be no valid argument.
if ($this->argument) {
$term = taxonomy_term_load($this->argument);
@@ -23,7 +23,8 @@ class views_handler_argument_taxonomy extends views_handler_argument_numeric {
return check_plain($term->name);
}
}
- // TODO review text
+ // @todo review text.
return t('No name');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
index f47f08a..c5c8ada 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
@@ -11,13 +11,20 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_term_node_tid extends views_handler_argument_many_to_one {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['set_breadcrumb'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['set_breadcrumb'] = array(
'#type' => 'checkbox',
@@ -27,7 +34,10 @@ class views_handler_argument_term_node_tid extends views_handler_argument_many_t
);
}
- function set_breadcrumb(&$breadcrumb) {
+ /**
+ * {@inheritdoc}
+ */
+ public function set_breadcrumb(&$breadcrumb) {
if (empty($this->options['set_breadcrumb']) || !is_numeric($this->argument)) {
return;
}
@@ -35,9 +45,13 @@ class views_handler_argument_term_node_tid extends views_handler_argument_many_t
return views_taxonomy_set_breadcrumb($breadcrumb, $this);
}
- function title_query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function title_query() {
$titles = array();
$result = db_select('taxonomy_term_data', 'td')
+ ->addTag('taxonomy_term_access')
->fields('td', array('name'))
->condition('td.tid', $this->value)
->execute();
@@ -46,4 +60,5 @@ class views_handler_argument_term_node_tid extends views_handler_argument_many_t
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
index 116a4de..69f27ab 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
@@ -14,7 +14,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_term_node_tid_depth extends views_handler_argument {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['depth'] = array('default' => 0);
@@ -25,7 +29,10 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['depth'] = array(
'#type' => 'weight',
'#title' => t('Depth'),
@@ -57,7 +64,10 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
parent::options_form($form, $form_state);
}
- function set_breadcrumb(&$breadcrumb) {
+ /**
+ * {@inheritdoc}
+ */
+ public function set_breadcrumb(&$breadcrumb) {
if (empty($this->options['set_breadcrumb']) || !is_numeric($this->argument)) {
return;
}
@@ -68,7 +78,7 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
/**
* Override default_actions() to remove summary actions.
*/
- function default_actions($which = NULL) {
+ public function default_actions($which = NULL) {
if ($which) {
if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
return parent::default_actions($which);
@@ -83,7 +93,10 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
return $actions;
}
- function query($group_by = FALSE) {
+ /**
+ * {@inheritdoc}
+ */
+ public function query($group_by = FALSE) {
$this->ensure_my_table();
if (!empty($this->options['break_phrase'])) {
@@ -134,12 +147,16 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
$this->query->add_where(0, "$this->table_alias.$this->real_field", $subquery, 'IN');
}
- function title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function title() {
$term = taxonomy_term_load($this->argument);
if (!empty($term)) {
return check_plain($term->name);
}
- // TODO review text
+ // @todo review text.
return t('No name');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc
new file mode 100644
index 0000000..220b0c7
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc
@@ -0,0 +1,208 @@
+ 0);
+ $options['break_phrase'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['set_breadcrumb'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['use_taxonomy_term_path'] = array('default' => FALSE, 'bool' => TRUE);
+
+ return $options;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
+ $form['depth'] = array(
+ '#type' => 'weight',
+ '#title' => t('Depth'),
+ '#default_value' => $this->options['depth'],
+ '#description' => t('The depth will match nodes tagged with terms in the hierarchy. For example, if you have the term "fruit" and a child term "apple", with a depth of 1 (or higher) then filtering for the term "fruit" will get nodes that are tagged with "apple" as well as "fruit". If negative, the reverse is true; searching for "apple" will also pick up nodes tagged with "fruit" if depth is -1 (or lower).'),
+ );
+
+ $form['break_phrase'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Allow multiple values'),
+ '#description' => t('If selected, users can enter multiple values in the form of 1+2+3. Due to the number of JOINs it would require, AND will be treated as OR with this filter.'),
+ '#default_value' => !empty($this->options['break_phrase']),
+ );
+
+ $form['set_breadcrumb'] = array(
+ '#type' => 'checkbox',
+ '#title' => t("Set the breadcrumb for the term parents"),
+ '#description' => t('If selected, the breadcrumb trail will include all parent terms, each one linking to this view. Note that this only works if just one term was received.'),
+ '#default_value' => !empty($this->options['set_breadcrumb']),
+ );
+
+ $form['use_taxonomy_term_path'] = array(
+ '#type' => 'checkbox',
+ '#title' => t("Use Drupal's taxonomy term path to create breadcrumb links"),
+ '#description' => t('If selected, the links in the breadcrumb trail will be created using the standard drupal method instead of the custom views method. This is useful if you are using modules like taxonomy redirect to modify your taxonomy term links.'),
+ '#default_value' => !empty($this->options['use_taxonomy_term_path']),
+ '#dependency' => array('edit-options-set-breadcrumb' => array(TRUE)),
+ );
+ parent::options_form($form, $form_state);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function set_breadcrumb(&$breadcrumb) {
+ if (empty($this->options['set_breadcrumb']) || !is_numeric($this->argument)) {
+ return;
+ }
+
+ return views_taxonomy_set_breadcrumb($breadcrumb, $this);
+ }
+
+ /**
+ * Override default_actions() to remove summary actions.
+ */
+ public function default_actions($which = NULL) {
+ if ($which) {
+ if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
+ return parent::default_actions($which);
+ }
+ return;
+ }
+ $actions = parent::default_actions();
+ unset($actions['summary asc']);
+ unset($actions['summary desc']);
+ unset($actions['summary asc by count']);
+ unset($actions['summary desc by count']);
+ return $actions;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query($group_by = FALSE) {
+ $this->ensure_my_table();
+
+ if (!empty($this->options['break_phrase'])) {
+ $tids = new stdClass();
+ $tids->value = $this->argument;
+ $tids = views_break_phrase($this->argument, $tids);
+ if ($tids->value == array(-1)) {
+ return FALSE;
+ }
+
+ if (count($tids->value) > 1) {
+ $operator = 'IN';
+ }
+ else {
+ $operator = '=';
+ }
+
+ $tids = $tids->value;
+ }
+ else {
+ $operator = "=";
+ $tids = $this->argument;
+ }
+
+ // The tids variable can be an integer or an array of integers.
+ $tids = is_array($tids) ? $tids : array($tids);
+
+ if ($this->options['depth'] > 0) {
+ // When the depth is positive search the children.
+ foreach ($tids as $tid) {
+ // The term must be loaded to get vid for use in taxonomy_get_tree().
+ if ($term = taxonomy_term_load($tid)) {
+ // For every tid argument find all the children down to the depth set
+ // in the options and save the tids for the condition.
+ $tree = taxonomy_get_tree($term->vid, $term->tid, (int) $this->options['depth']);
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $tree));
+ }
+ }
+ }
+ elseif ($this->options['depth'] < 0) {
+ // When the depth is negative search the parents.
+ foreach ($tids as $tid) {
+ // For every tid argument find all the parents up to the depth set
+ // in the options and add the tids into the array. Since there is
+ // no taxonomy function to get all parents with a depth limit it
+ // is done here building a multidimensional array.
+ if ($term = taxonomy_term_load($tid)) {
+ // A variable is needed to track the current depth level.
+ $n = 0;
+ // Initialise our depth based parents array with the leaf term.
+ $parents[$n--][] = $term;
+ while ($n >= $this->options['depth']) {
+ // At each depth find the parents of the current terms.
+ // It is important to note that it is possible for a term to have
+ // multiple parents so get the parents of every parent and so on.
+ $parents[$n] = array();
+ foreach ($parents[$n + 1] as $term) {
+ $parents[$n] += taxonomy_get_parents($term->tid);
+ }
+ // Save all the tids for the condition.
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $parents[$n]));
+ $n--;
+ }
+ }
+ }
+ }
+
+ // Check the size of the array and set the operator accordingly.
+ if (count($tids) > 1) {
+ $operator = 'IN';
+ }
+ else {
+ $tids = current($tids);
+ $operator = '=';
+ }
+
+ // Join on taxonomy index table.
+ $join = new views_join();
+ $join->table = 'taxonomy_index';
+ $join->field = 'nid';
+ $join->left_table = $this->table_alias;
+ $join->left_field = $this->real_field;
+ $join->type = 'INNER';
+ $join->extra = array(
+ array(
+ 'field' => 'tid',
+ 'value' => $tids,
+ 'operator' => $operator,
+ ),
+ );
+ $taxonomy_index_alias = $this->query->add_relationship('taxonomy_index', $join, 'node');
+
+ // Distinct is required to prevent duplicate rows.
+ $this->query->distinct = TRUE;
+ }
+
+ /**
+ *
+ */
+ public function title() {
+ $term = taxonomy_term_load($this->argument);
+ if (!empty($term)) {
+ return check_plain($term->name);
+ }
+
+ return t('No name');
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
index 2f9dd4e..b911378 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_argument_term_node_tid_depth_modif.
+ * Definition of views_handler_argument_term_node_tid_depth_modifier.
*/
/**
@@ -14,10 +14,24 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_term_node_tid_depth_modifier extends views_handler_argument {
- function options_form(&$form, &$form_state) { }
- function query($group_by = FALSE) { }
- function pre_query() {
- // We don't know our argument yet, but it's based upon our position:
+
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query($group_by = FALSE) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_query() {
+ // We don't know our argument yet, but it's based upon our position.
$argument = isset($this->view->args[$this->position]) ? $this->view->args[$this->position] : NULL;
if (!is_numeric($argument)) {
return;
@@ -31,7 +45,7 @@ class views_handler_argument_term_node_tid_depth_modifier extends views_handler_
$argument = -10;
}
- // figure out which argument preceded us.
+ // Figure out which argument preceded us.
$keys = array_reverse(array_keys($this->view->argument));
$skip = TRUE;
foreach ($keys as $key) {
@@ -61,4 +75,5 @@ class views_handler_argument_term_node_tid_depth_modifier extends views_handler_
$handler->options['depth'] = $argument;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
index 427cf2b..066ce05 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_vocabulary_machine_name extends views_handler_argument_string {
+
/**
* Override the behavior of title(). Get the name of the vocabulary..
*/
- function title() {
+ public function title() {
$title = db_query("SELECT v.name FROM {taxonomy_vocabulary} v WHERE v.machine_name = :machine_name", array(':machine_name' => $this->argument))->fetchField();
if (empty($title)) {
@@ -23,4 +24,5 @@ class views_handler_argument_vocabulary_machine_name extends views_handler_argum
return check_plain($title);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
index c696640..6030a88 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_vocabulary_vid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title(). Get the name of the vocabulary.
*/
- function title() {
+ public function title() {
$title = db_query("SELECT v.name FROM {taxonomy_vocabulary} v WHERE v.vid = :vid", array(':vid' => $this->argument))->fetchField();
if (empty($title)) {
@@ -23,4 +24,5 @@ class views_handler_argument_vocabulary_vid extends views_handler_argument_numer
return check_plain($title);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_taxonomy.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_taxonomy.inc
index 48da283..9be652e 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_taxonomy.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_taxonomy.inc
@@ -12,23 +12,28 @@
* @ingroup views_field_handlers
*/
class views_handler_field_taxonomy extends views_handler_field {
+
/**
* Constructor to provide additional field to add.
*
* This constructer assumes the taxonomy_term_data table. If using another
* table, we'll need to be more specific.
*/
- function construct() {
+ public function construct() {
parent::construct();
$this->additional_fields['vid'] = 'vid';
$this->additional_fields['tid'] = 'tid';
+ $this->additional_fields['name'] = 'name';
$this->additional_fields['vocabulary_machine_name'] = array(
'table' => 'taxonomy_vocabulary',
'field' => 'machine_name',
);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_taxonomy'] = array('default' => FALSE, 'bool' => TRUE);
$options['convert_spaces'] = array('default' => FALSE, 'bool' => TRUE);
@@ -36,16 +41,16 @@ class views_handler_field_taxonomy extends views_handler_field {
}
/**
- * Provide link to taxonomy option
+ * Provide link to taxonomy option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_taxonomy'] = array(
'#title' => t('Link this field to its taxonomy term page'),
'#description' => t("Enable to override this field's links."),
'#type' => 'checkbox',
'#default_value' => !empty($this->options['link_to_taxonomy']),
);
- $form['convert_spaces'] = array(
+ $form['convert_spaces'] = array(
'#title' => t('Convert spaces in term names to hyphens'),
'#description' => t('This allows links to work with Views taxonomy term arguments.'),
'#type' => 'checkbox',
@@ -59,16 +64,24 @@ class views_handler_field_taxonomy extends views_handler_field {
*
* Data should be made XSS safe prior to calling this function.
*/
- function render_link($data, $values) {
+ public function render_link($data, $values) {
$tid = $this->get_value($values, 'tid');
if (!empty($this->options['link_to_taxonomy']) && !empty($tid) && $data !== NULL && $data !== '') {
$term = new stdClass();
$term->tid = $tid;
$term->vid = $this->get_value($values, 'vid');
+ $term->name = $this->get_value($values, 'name');
$term->vocabulary_machine_name = $values->{$this->aliases['vocabulary_machine_name']};
$this->options['alter']['make_link'] = TRUE;
$uri = entity_uri('taxonomy_term', $term);
+ if (isset($uri['options'])) {
+ $this->options['alter'] = array_merge($this->options['alter'], $uri['options']);
+ }
$this->options['alter']['path'] = $uri['path'];
+ // If entity_uri() returned an options array, use it.
+ if (isset($uri['options'])) {
+ $this->options['alter'] = $uri['options'] + $this->options['alter'];
+ }
}
if (!empty($this->options['convert_spaces'])) {
@@ -78,8 +91,12 @@ class views_handler_field_taxonomy extends views_handler_field {
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_link_edit.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_link_edit.inc
index 2efb4a6..1e238f4 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_link_edit.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_link_edit.inc
@@ -11,7 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_term_link_edit extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['tid'] = 'tid';
$this->additional_fields['vid'] = 'vid';
@@ -21,7 +25,10 @@ class views_handler_field_term_link_edit extends views_handler_field {
);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['text'] = array('default' => '', 'translatable' => TRUE);
@@ -29,7 +36,10 @@ class views_handler_field_term_link_edit extends views_handler_field {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['text'] = array(
'#type' => 'textfield',
'#title' => t('Text to display'),
@@ -38,16 +48,22 @@ class views_handler_field_term_link_edit extends views_handler_field {
parent::options_form($form, $form_state);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
// Check there is an actual value, as on a relationship there may not be.
if ($tid = $this->get_value($values, 'tid')) {
- // Mock a term object for taxonomy_term_edit_access(). Use machine name and
- // vid to ensure compatibility with vid based and machine name based
+ // Mock a term object for taxonomy_term_edit_access(). Use machine name
+ // and vid to ensure compatibility with vid based and machine name based
// access checks. See http://drupal.org/node/995156
$term = new stdClass();
$term->vid = $values->{$this->aliases['vid']};
@@ -55,8 +71,9 @@ class views_handler_field_term_link_edit extends views_handler_field {
if (taxonomy_term_edit_access($term)) {
$text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
$tid = $this->get_value($values, 'tid');
- return l($text, 'taxonomy/term/'. $tid . '/edit', array('query' => drupal_get_destination()));
+ return l($text, 'taxonomy/term/' . $tid . '/edit', array('query' => drupal_get_destination()));
}
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_node_tid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_node_tid.inc
index 4c6362e..67bb2a5 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -11,9 +11,13 @@
* @ingroup views_field_handlers
*/
class views_handler_field_term_node_tid extends views_handler_field_prerender_list {
- function init(&$view, &$options) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
- // @todo: Wouldn't it be possible to use $this->base_table and no if here?
+ // @todo Wouldn't it be possible to use $this->base_table and no if here?
if ($view->base_table == 'node_revision') {
$this->additional_fields['nid'] = array('table' => 'node_revision', 'field' => 'nid');
}
@@ -32,7 +36,10 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_taxonomy'] = array('default' => TRUE, 'bool' => TRUE);
@@ -45,7 +52,7 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
/**
* Provide "link to term" option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_taxonomy'] = array(
'#title' => t('Link this field to its term page'),
'#type' => 'checkbox',
@@ -55,7 +62,7 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
$form['limit'] = array(
'#type' => 'checkbox',
'#title' => t('Limit terms by vocabulary'),
- '#default_value'=> $this->options['limit'],
+ '#default_value' => $this->options['limit'],
);
$options = array();
@@ -78,13 +85,16 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
}
/**
- * Add this term to the query
+ * Add this term to the query.
*/
- function query() {
+ public function query() {
$this->add_additional_fields();
}
- function pre_render(&$values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render(&$values) {
$this->field_alias = $this->aliases['nid'];
$nids = array();
foreach ($values as $result) {
@@ -104,7 +114,7 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
$query->orderby('td.weight');
$query->orderby('td.name');
$query->condition('tn.nid', $nids);
- $query->addTag('term_access');
+ $query->addTag('taxonomy_term_access');
$vocabs = array_filter($this->options['vocabularies']);
if (!empty($this->options['limit']) && !empty($vocabs)) {
$query->condition('tv.machine_name', $vocabs);
@@ -125,21 +135,31 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
}
}
- function render_item($count, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_item($count, $item) {
return $item['name'];
}
- function document_self_tokens(&$tokens) {
+ /**
+ * {@inheritdoc}
+ */
+ public function document_self_tokens(&$tokens) {
$tokens['[' . $this->options['id'] . '-tid' . ']'] = t('The taxonomy term ID for the term.');
$tokens['[' . $this->options['id'] . '-name' . ']'] = t('The taxonomy term name for the term.');
$tokens['[' . $this->options['id'] . '-vocabulary-machine-name' . ']'] = t('The machine name for the vocabulary the term belongs to.');
$tokens['[' . $this->options['id'] . '-vocabulary' . ']'] = t('The name for the vocabulary the term belongs to.');
}
- function add_self_tokens(&$tokens, $item) {
- foreach(array('tid', 'name', 'vocabulary_machine_name', 'vocabulary') as $token) {
+ /**
+ * {@inheritdoc}
+ */
+ public function add_self_tokens(&$tokens, $item) {
+ foreach (array('tid', 'name', 'vocabulary_machine_name', 'vocabulary') as $token) {
// Replace _ with - for the vocabulary machine name.
- $tokens['[' . $this->options['id'] . '-' . str_replace('_', '-', $token). ']'] = isset($item[$token]) ? $item[$token] : '';
+ $tokens['[' . $this->options['id'] . '-' . str_replace('_', '-', $token) . ']'] = isset($item[$token]) ? $item[$token] : '';
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 8938ca9..0b3188a 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -11,10 +11,16 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_term_node_tid extends views_handler_filter_many_to_one {
- // Stores the exposed input for this filter.
- var $validated_exposed_input = NULL;
- function init(&$view, &$options) {
+ /**
+ * Stores the exposed input for this filter.
+ */
+ public $validated_exposed_input = NULL;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
if (!empty($this->definition['vocabulary'])) {
$this->options['vocabulary'] = $this->definition['vocabulary'];
@@ -30,11 +36,24 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
}
}
- function has_extra_options() { return TRUE; }
+ /**
+ * {@inheritdoc}
+ */
+ public function has_extra_options() {
+ return TRUE;
+ }
- function get_value_options() { /* don't overwrite the value options */ }
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
+ // Don't overwrite the value options.
+ }
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['type'] = array('default' => 'textfield');
@@ -46,7 +65,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
return $options;
}
- function extra_options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function extra_options_form(&$form, &$form_state) {
$vocabularies = taxonomy_get_vocabularies();
$options = array();
foreach ($vocabularies as $voc) {
@@ -86,7 +108,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
);
}
- function value_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function value_form(&$form, &$form_state) {
$vocabulary = taxonomy_vocabulary_machine_name_load($this->options['vocabulary']);
if (empty($vocabulary) && $this->options['limit']) {
$form['markup'] = array(
@@ -123,7 +148,8 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$options = array();
if ($tree) {
- // Translation system needs full entity objects, so we have access to label.
+ // Translation system needs full entity objects, so we have access to
+ // label.
foreach ($tree as $term) {
$choice = new stdClass();
$choice->option = array($term->tid => str_repeat('-', $term->depth) . entity_label('taxonomy_term', $term));
@@ -140,7 +166,7 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$query->orderby('tv.name');
$query->orderby('td.weight');
$query->orderby('td.name');
- $query->addTag('term_access');
+ $query->addTag('taxonomy_term_access');
if ($this->options['limit']) {
$query->condition('tv.machine_name', $vocabulary->machine_name);
}
@@ -177,8 +203,8 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$keys = array_keys($options);
$default_value = array_shift($keys);
}
- // Due to #1464174 there is a chance that array('') was saved in the admin ui.
- // Let's choose a safe default value.
+ // Due to #1464174 there is a chance that array('') was saved in the
+ // admin UI. Let's choose a safe default value.
elseif ($default_value == array('')) {
$default_value = 'All';
}
@@ -206,10 +232,16 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
if (empty($form_state['exposed'])) {
// Retain the helper option
$this->helper->options_form($form, $form_state);
+
+ // Show help text if not exposed to end users.
+ $form['value']['#description'] = t('Leave blank for all. Otherwise, the first selected term will be the default instead of "Any".');
}
}
- function value_validate($form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function value_validate($form, &$form_state) {
// We only validate if they've chosen the text field style.
if ($this->options['type'] != 'textfield') {
return;
@@ -223,17 +255,33 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
}
}
- function accept_exposed_input($input) {
+ /**
+ * {@inheritdoc}
+ */
+ public function accept_exposed_input($input) {
if (empty($this->options['exposed'])) {
return TRUE;
}
+ // We need to know the operator, which is normally set in
+ // views_handler_filter::accept_exposed_input(), before we actually call
+ // the parent version of ourselves.
+ if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']) && isset($input[$this->options['expose']['operator_id']])) {
+ $this->operator = $input[$this->options['expose']['operator_id']];
+ }
+
// If view is an attachment and is inheriting exposed filters, then assume
// exposed input has already been validated
if (!empty($this->view->is_attachment) && $this->view->display_handler->uses_exposed()) {
$this->validated_exposed_input = (array) $this->view->exposed_raw_input[$this->options['expose']['identifier']];
}
+ // If we're checking for EMPTY or NOT, we don't need any input, and we can
+ // say that our input conditions are met by just having the right operator.
+ if ($this->operator == 'empty' || $this->operator == 'not empty') {
+ return TRUE;
+ }
+
// If it's non-required and there's no value don't bother filtering.
if (!$this->options['expose']['required'] && empty($this->validated_exposed_input)) {
return FALSE;
@@ -250,7 +298,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
return $rc;
}
- function exposed_validate(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function exposed_validate(&$form, &$form_state) {
if (empty($this->options['exposed'])) {
return;
}
@@ -259,7 +310,7 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
// We only validate if they've chosen the text field style.
if ($this->options['type'] != 'textfield') {
- if ($form_state['values'][$identifier] != 'All') {
+ if (isset($form_state['values'][$identifier]) && $form_state['values'][$identifier] != 'All') {
$this->validated_exposed_input = (array) $form_state['values'][$identifier];
}
return;
@@ -282,15 +333,15 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
* or the exposed filter, this is abstracted out a bit so it can
* handle the multiple input sources.
*
- * @param $form
+ * @param array $form
* The form which is used, either the views ui or the exposed filters.
- * @param $values
+ * @param array $values
* The taxonomy names which will be converted to tids.
*
* @return array
* The taxonomy ids fo all validated terms.
*/
- function validate_term_strings(&$form, $values) {
+ public function validate_term_strings(&$form, $values) {
if (empty($values)) {
return array();
}
@@ -312,7 +363,7 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$query->fields('td');
$query->condition('td.name', $names);
$query->condition('tv.machine_name', $this->options['vocabulary']);
- $query->addTag('term_access');
+ $query->addTag('taxonomy_term_access');
$result = $query->execute();
foreach ($result as $term) {
unset($missing[strtolower($term->name)]);
@@ -329,11 +380,17 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
return $tids;
}
- function value_submit($form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function value_submit($form, &$form_state) {
// prevent array_filter from messing up our arrays in parent submit.
}
- function expose_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function expose_form(&$form, &$form_state) {
parent::expose_form($form, $form_state);
if ($this->options['type'] != 'select') {
unset($form['expose']['reduce']);
@@ -345,7 +402,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
);
}
- function admin_summary() {
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
// set up $this->value_options for the parent summary
$this->value_options = array();
@@ -358,4 +418,5 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
}
return parent::admin_summary();
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
index fe12780..872d90e 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
@@ -14,13 +14,20 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_term_node_tid_depth extends views_handler_filter_term_node_tid {
- function operator_options($which = 'title') {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function operator_options($which = 'title') {
return array(
'or' => t('Is one of'),
);
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['depth'] = array('default' => 0);
@@ -28,7 +35,10 @@ class views_handler_filter_term_node_tid_depth extends views_handler_filter_term
return $options;
}
- function extra_options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function extra_options_form(&$form, &$form_state) {
parent::extra_options_form($form, $form_state);
$form['depth'] = array(
@@ -39,7 +49,10 @@ class views_handler_filter_term_node_tid_depth extends views_handler_filter_term
);
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
// If no filter values are present, then do nothing.
if (count($this->value) == 0) {
return;
@@ -52,7 +65,10 @@ class views_handler_filter_term_node_tid_depth extends views_handler_filter_term
$operator = '=';
}
else {
- $operator = 'IN';# " IN (" . implode(', ', array_fill(0, sizeof($this->value), '%d')) . ")";
+ $operator = 'IN';
+ // " IN ("
+ // . implode(', ', array_fill(0, sizeof($this->value), '%d'))
+ // . ")";
}
// The normal use of ensure_my_table() here breaks Views.
@@ -97,4 +113,5 @@ class views_handler_filter_term_node_tid_depth extends views_handler_filter_term
$subquery->condition($where);
$this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field", $subquery, 'IN');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc
new file mode 100644
index 0000000..043db99
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc
@@ -0,0 +1,159 @@
+ t('Is one of'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
+ $options = parent::option_definition();
+
+ $options['depth'] = array('default' => 0);
+
+ return $options;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function extra_options_form(&$form, &$form_state) {
+ parent::extra_options_form($form, $form_state);
+
+ $form['depth'] = array(
+ '#type' => 'weight',
+ '#title' => t('Depth'),
+ '#default_value' => $this->options['depth'],
+ '#description' => t('The depth will match nodes tagged with terms in the hierarchy. For example, if you have the term "fruit" and a child term "apple", with a depth of 1 (or higher) then filtering for the term "fruit" will get nodes that are tagged with "apple" as well as "fruit". If negative, the reverse is true; searching for "apple" will also pick up nodes tagged with "fruit" if depth is -1 (or lower).'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
+ // If no filter values are present, then do nothing.
+ if (count($this->value) == 0) {
+ return;
+ }
+ elseif (count($this->value) == 1) {
+ // Somethis $this->value is an array with a single element so convert it.
+ if (is_array($this->value)) {
+ $this->value = current($this->value);
+ }
+ $operator = '=';
+ }
+ else {
+ $operator = 'IN';
+ // " IN ("
+ // . implode(', ', array_fill(0, sizeof($this->value), '%d'))
+ // . ")";
+ }
+
+ // The normal use of ensure_my_table() here breaks Views.
+ // So instead we trick the filter into using the alias of the base table.
+ // See http://drupal.org/node/271833
+ // If a relationship is set, we must use the alias it provides.
+ if (!empty($this->relationship)) {
+ $this->table_alias = $this->relationship;
+ }
+ // If no relationship, then use the alias of the base table.
+ elseif (isset($this->query->table_queue[$this->query->base_table]['alias'])) {
+ $this->table_alias = $this->query->table_queue[$this->query->base_table]['alias'];
+ }
+ // This should never happen, but if it does, we fail quietly.
+ else {
+ return;
+ }
+
+ // The tids variable can be an integer or an array of integers.
+ $tids = is_array($this->value) ? $this->value : array($this->value);
+
+ if ($this->options['depth'] > 0) {
+ // When the depth is positive search the children.
+ foreach ($tids as $tid) {
+ // The term must be loaded to get vid for use in taxonomy_get_tree().
+ if ($term = taxonomy_term_load($tid)) {
+ // For every tid argument find all the children down to the depth set
+ // in the options and save the tids for the condition.
+ $tree = taxonomy_get_tree($term->vid, $term->tid, (int) $this->options['depth']);
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $tree));
+ }
+ }
+ }
+ elseif ($this->options['depth'] < 0) {
+ // When the depth is negative search the parents.
+ foreach ($tids as $tid) {
+ // For every tid argument find all the parents up to the depth set
+ // in the options and add the tids into the array. Since there is
+ // no taxonomy function to get all parents with a depth limit it
+ // is done here building a multidimensional array.
+ if ($term = taxonomy_term_load($tid)) {
+ // A variable is needed to track the current depth level.
+ $n = 0;
+ // Initialise our depth based parents array with the leaf term.
+ $parents[$n--][] = $term;
+ while ($n >= $this->options['depth']) {
+ // At each depth find the parents of the current terms.
+ // It is important to note that it is possible for a term to have
+ // multiple parents so get the parents of every parent and so on.
+ $parents[$n] = array();
+ foreach ($parents[$n + 1] as $term) {
+ $parents[$n] += taxonomy_get_parents($term->tid);
+ }
+ // Save all the tids for the condition.
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $parents[$n]));
+ $n--;
+ }
+ }
+ }
+ }
+
+ // Check the size of the array and set the operator accordingly.
+ if (count($tids) > 1) {
+ $operator = 'IN';
+ }
+ else {
+ $tids = current($tids);
+ $operator = '=';
+ }
+
+ // Join on taxonomy index table.
+ $join = new views_join();
+ $join->table = 'taxonomy_index';
+ $join->field = 'nid';
+ $join->left_table = $this->table_alias;
+ $join->left_field = $this->real_field;
+ $join->type = 'INNER';
+ $join->extra = array(
+ array(
+ 'field' => 'tid',
+ 'value' => $tids,
+ 'operator' => $operator,
+ ),
+ );
+ $taxonomy_index_alias = $this->query->add_relationship('taxonomy_index', $join, 'node');
+ }
+
+}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
index 062450c..09c92fc 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_vocabulary_machine_name extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (isset($this->value_options)) {
return;
}
@@ -22,4 +26,5 @@ class views_handler_filter_vocabulary_machine_name extends views_handler_filter_
$this->value_options[$voc->machine_name] = $voc->name;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
index 2759ee1..0b77599 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_vocabulary_vid extends views_handler_filter_in_operator {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
if (isset($this->value_options)) {
return;
}
@@ -22,4 +26,5 @@ class views_handler_filter_vocabulary_vid extends views_handler_filter_in_operat
$this->value_options[$voc->vid] = $voc->name;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_relationship_node_term_data.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
index cf72288..ba05487 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -10,8 +10,12 @@
*
* @ingroup views_relationship_handlers
*/
-class views_handler_relationship_node_term_data extends views_handler_relationship {
- function init(&$view, &$options) {
+class views_handler_relationship_node_term_data extends views_handler_relationship {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$options) {
parent::init($view, $options);
// Convert legacy vids option to machine name vocabularies.
@@ -25,13 +29,19 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['vocabularies'] = array('default' => array());
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$vocabularies = taxonomy_get_vocabularies();
$options = array();
foreach ($vocabularies as $voc) {
@@ -51,7 +61,7 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
/**
* Called to implement a relationship in a query.
*/
- function query() {
+ public function query() {
$this->ensure_my_table();
$def = $this->definition;
@@ -65,7 +75,7 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
$def['type'] = empty($this->options['required']) ? 'LEFT' : 'INNER';
}
else {
- // If vocabularies are supplied join a subselect instead
+ // If vocabularies are supplied join a subselect instead.
$def['left_table'] = $this->table_alias;
$def['left_field'] = 'nid';
$def['field'] = 'nid';
@@ -76,7 +86,7 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
$query->addJoin($def['type'], 'taxonomy_index', 'tn', 'tn.tid = td.tid');
$query->condition('tv.machine_name', array_filter($this->options['vocabularies']));
if (empty($this->query->options['disable_sql_rewrite'])) {
- $query->addTag('term_access');
+ $query->addTag('taxonomy_term_access');
}
$query->fields('td');
$query->fields('tn', array('nid'));
@@ -89,9 +99,10 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
$join->construct();
$join->adjusted = TRUE;
- // use a short alias for this:
+ // Use a short alias for this.
$alias = $def['table'] . '_' . $this->table;
$this->alias = $this->query->add_relationship($alias, $join, 'taxonomy_term_data', $this->relationship);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index 9c1d81f..27a484b 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -9,7 +9,11 @@
* Taxonomy tid default argument.
*/
class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_default {
- function init(&$view, &$argument, $options) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$argument, $options) {
parent::init($view, $argument, $options);
// Convert legacy vids option to machine name vocabularies.
@@ -23,7 +27,10 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['term_page'] = array('default' => TRUE, 'bool' => TRUE);
@@ -35,7 +42,10 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['term_page'] = array(
'#type' => 'checkbox',
'#title' => t('Load default filter from term page'),
@@ -92,12 +102,18 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
);
}
- function options_submit(&$form, &$form_state, &$options = array()) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_submit(&$form, &$form_state, &$options = array()) {
// Filter unselected items so we don't unnecessarily store giant arrays.
$options['vocabularies'] = array_filter($options['vocabularies']);
}
- function get_argument() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_argument() {
// Load default argument from taxonomy page.
if (!empty($this->options['term_page'])) {
if (arg(0) == 'taxonomy' && arg(1) == 'term' && is_numeric(arg(2))) {
@@ -151,4 +167,5 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
return $views_page->argument['tid']->argument;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
index 435db0d..343af3c 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
@@ -2,14 +2,18 @@
/**
* @file
- * Contains the 'taxonomy term' argument validator plugin.
+ * Definition of views_plugin_argument_validate_taxonomy_term.
*/
/**
* Validate whether an argument is an acceptable node.
*/
class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument_validate {
- function init(&$view, &$argument, $options) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$argument, $options) {
parent::init($view, $argument, $options);
// Convert legacy vids option to machine name vocabularies.
@@ -23,7 +27,10 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['vocabularies'] = array('default' => array());
$options['type'] = array('default' => 'tid');
@@ -32,7 +39,10 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$vocabularies = taxonomy_get_vocabularies();
$options = array();
foreach ($vocabularies as $voc) {
@@ -69,12 +79,18 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
);
}
- function options_submit(&$form, &$form_state, &$options = array()) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_submit(&$form, &$form_state, &$options = array()) {
// Filter unselected items so we don't unnecessarily store giant arrays.
$options['vocabularies'] = array_filter($options['vocabularies']);
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['vocabularies']) && !empty($this->argument->options['validate_argument_vocabulary'])) {
$options['vocabularies'] = $this->argument->options['validate_argument_vocabulary'];
$options['type'] = $this->argument->options['validate_argument_type'];
@@ -82,7 +98,10 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
}
}
- function validate_argument($argument) {
+ /**
+ * {@inheritdoc}
+ */
+ public function validate_argument($argument) {
$vocabularies = array_filter($this->options['vocabularies']);
$type = $this->options['type'];
$transform = $this->options['transform'];
@@ -97,7 +116,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
$query->leftJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
$query->fields('td');
$query->condition('td.tid', $argument);
- $query->addTag('term_access');
+ $query->addTag('taxonomy_term_access');
$term = $query->execute()->fetchObject();
if (!$term) {
return FALSE;
@@ -122,7 +141,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
$test = drupal_map_assoc($tids->value);
$titles = array();
- // check, if some tids already verified
+ // check, if some tids already verified.
static $validated_cache = array();
foreach ($test as $tid) {
if (isset($validated_cache[$tid])) {
@@ -136,9 +155,10 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
}
}
- // if unverified tids left - verify them and cache results
+ // if unverified tids left - verify them and cache results.
if (count($test)) {
$query = db_select('taxonomy_term_data', 'td');
+ $query->addTag('taxonomy_term_access');
$query->leftJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
$query->fields('td');
$query->fields('tv', array('machine_name'));
@@ -157,7 +177,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
}
}
- // Remove duplicate titles
+ // Remove duplicate titles.
$titles = array_unique($titles);
$this->argument->validated_title = implode($tids->operator == 'or' ? ' + ' : ', ', $titles);
@@ -167,6 +187,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
case 'name':
case 'convert':
$query = db_select('taxonomy_term_data', 'td');
+ $query->addTag('taxonomy_term_access');
$query->leftJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
$query->fields('td');
$query->fields('tv', array('machine_name'));
@@ -193,7 +214,10 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
}
}
- function process_summary_arguments(&$args) {
+ /**
+ * {@inheritdoc}
+ */
+ public function process_summary_arguments(&$args) {
$type = $this->options['type'];
$transform = $this->options['transform'];
$vocabularies = array_filter($this->options['vocabularies']);
@@ -202,6 +226,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
$arg_keys = array_flip($args);
$query = db_select('taxonomy_term_data', 'td');
+ $query->addTag('taxonomy_term_access');
$query->condition('tid', $args);
$query->addField('td', 'tid', 'tid');
if (!empty($vocabularies)) {
@@ -220,4 +245,5 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
}
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/tracker.views.inc b/sites/all/modules/contrib/views/views/modules/tracker.views.inc
index ee14589..b7b3748 100644
--- a/sites/all/modules/contrib/views/views/modules/tracker.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/tracker.views.inc
@@ -6,8 +6,9 @@
*
* @ingroup views_module_handlers
*/
+
/**
- * Implementation of hook_views_data().
+ * Implements hook_views_data().
*/
function tracker_views_data() {
$data = array();
@@ -158,10 +159,10 @@ function tracker_views_data() {
}
/**
- * Implementation of hook_views_data_alter().
+ * Implements hook_views_data_alter().
*/
function tracker_views_data_alter(&$data) {
- // Provide additional uid_touch handlers which are handled by tracker
+ // Provide additional uid_touch handlers which are handled by tracker.
$data['node']['uid_touch_tracker'] = array(
'group' => t('Tracker - User'),
'title' => t('User posted or commented'),
@@ -177,7 +178,7 @@ function tracker_views_data_alter(&$data) {
'field' => 'uid',
'name table' => 'users',
'name field' => 'name',
- 'handler' => 'views_handler_filter_tracker_comment_user_uid'
+ 'handler' => 'views_handler_filter_tracker_comment_user_uid',
),
);
}
diff --git a/sites/all/modules/contrib/views/views/modules/tracker/views_handler_argument_tracker_comment_user_uid.inc b/sites/all/modules/contrib/views/views/modules/tracker/views_handler_argument_tracker_comment_user_uid.inc
index e614482..5fad996 100644
--- a/sites/all/modules/contrib/views/views/modules/tracker/views_handler_argument_tracker_comment_user_uid.inc
+++ b/sites/all/modules/contrib/views/views/modules/tracker/views_handler_argument_tracker_comment_user_uid.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains views_handler_argument_tracker_comment_user_uid
+ * Definition of views_handler_argument_tracker_comment_user_uid.
*/
/**
@@ -13,9 +13,9 @@
class views_handler_argument_tracker_comment_user_uid extends views_handler_argument_comment_user_uid {
/**
- * Overrides views_handler_argument_comment_user_uid::query().
+ * {@inheritdoc}
*/
- function query($group_by = FALSE) {
+ public function query($group_by = FALSE) {
// Because this handler thinks it's an argument for a field on the {node}
// table, we need to make sure {tracker_user} is JOINed and use its alias
// for the WHERE clause.
diff --git a/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_boolean_operator.inc b/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_boolean_operator.inc
index 455e824..923ab06 100644
--- a/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_boolean_operator.inc
+++ b/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_boolean_operator.inc
@@ -2,18 +2,18 @@
/**
* @file
- * Contains views_handler_filter_tracker_boolean_operator
+ * Definition of views_handler_filter_tracker_boolean_operator.
*/
- /**
- * Filter handler for boolean values to use = 1 instead of <> 0.
- */
+/**
+ * Filter handler for boolean values to use = 1 instead of <> 0.
+ */
class views_handler_filter_tracker_boolean_operator extends views_handler_filter_boolean_operator {
/**
- * Overrides views_handler_filter_boolean_operator::query().
+ * {@inheritdoc}
*/
- function query() {
+ public function query() {
$this->ensure_my_table();
$where = "$this->table_alias.$this->real_field ";
if (empty($this->value)) {
diff --git a/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_comment_user_uid.inc b/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_comment_user_uid.inc
index da6f65b..b813237 100644
--- a/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_comment_user_uid.inc
+++ b/sites/all/modules/contrib/views/views/modules/tracker/views_handler_filter_tracker_comment_user_uid.inc
@@ -1,7 +1,8 @@
'tnid',
'field' => 'tnid',
);
- // The translation ID (nid of the "source" translation)
+ // The translation ID (nid of the "source" translation).
$data['node']['tnid'] = array(
'group' => t('Content translation'),
'title' => t('Translation set node ID'),
@@ -34,7 +33,8 @@ function translation_views_data_alter(&$data) {
),
'argument' => array(
'handler' => 'views_handler_argument_node_tnid',
- 'name field' => 'title', // the field to display in the summary.
+ // The field to display in the summary.
+ 'name field' => 'title',
'numeric' => TRUE,
'validate type' => 'tnid',
),
@@ -51,7 +51,7 @@ function translation_views_data_alter(&$data) {
),
);
- // The source translation.
+ // All translations.
$data['node']['translation'] = array(
'group' => t('Content translation'),
'title' => t('Translations'),
@@ -62,7 +62,7 @@ function translation_views_data_alter(&$data) {
'base' => 'node',
'base field' => 'tnid',
'relationship table' => 'node',
- 'relationship field' => 'nid',
+ 'relationship field' => 'tnid',
'handler' => 'views_handler_relationship_translation',
'label' => t('Translations'),
),
@@ -78,7 +78,7 @@ function translation_views_data_alter(&$data) {
),
);
- // The source translation.
+ // Child translation.
$data['node']['child_translation'] = array(
'group' => t('Node translation'),
'title' => t('Child translation'),
@@ -88,7 +88,7 @@ function translation_views_data_alter(&$data) {
),
);
- // Translation status
+ // Translation status.
$data['node']['translate'] = array(
'group' => t('Content translation'),
'title' => t('Translation status'),
@@ -117,5 +117,4 @@ function translation_views_data_alter(&$data) {
),
);
-
}
diff --git a/sites/all/modules/contrib/views/views/modules/translation/views_handler_argument_node_tnid.inc b/sites/all/modules/contrib/views/views/modules/translation/views_handler_argument_node_tnid.inc
index 61e9eba..f88cafa 100644
--- a/sites/all/modules/contrib/views/views/modules/translation/views_handler_argument_node_tnid.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation/views_handler_argument_node_tnid.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Provide node tnid argument handler.
+ * Definition of views_handler_argument_node_tnid.
*/
/**
@@ -11,10 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_node_tnid extends views_handler_argument_numeric {
+
/**
- * Override the behavior of title(). Get the title of the node.
+ * {@inheritdoc}
*/
- function title_query() {
+ public function title_query() {
$titles = array();
$result = db_query("SELECT n.title FROM {node} n WHERE n.tnid IN (:tnids)", array(':tnids' => $this->value));
@@ -23,4 +24,5 @@ class views_handler_argument_node_tnid extends views_handler_argument_numeric {
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_link_translate.inc b/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_link_translate.inc
index 3e30725..aedbb83 100644
--- a/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_link_translate.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_link_translate.inc
@@ -11,10 +11,15 @@
* @ingroup views_field_handlers
*/
class views_handler_field_node_link_translate extends views_handler_field_node_link {
- function render_link($data, $values) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
// ensure user has access to edit this node.
$node = $this->get_value($values);
- $node->status = 1; // unpublished nodes ignore access control
+ $node->status = 1;
+ // unpublished nodes ignore access control.
if (empty($node->language) || !translation_supported_type($node->type) || !node_access('view', $node) || !user_access('translate content')) {
return;
}
@@ -26,4 +31,5 @@ class views_handler_field_node_link_translate extends views_handler_field_node_l
$text = !empty($this->options['text']) ? $this->options['text'] : t('translate');
return $text;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_translation_link.inc b/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_translation_link.inc
index 9d50369..38e6c31 100644
--- a/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_translation_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation/views_handler_field_node_translation_link.inc
@@ -11,7 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_node_translation_link extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['nid'] = 'nid';
$this->additional_fields['tnid'] = 'tnid';
@@ -19,17 +23,26 @@ class views_handler_field_node_translation_link extends views_handler_field {
$this->additional_fields['language'] = 'language';
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values, 'tnid');
return $this->render_link($this->sanitize_value($value), $values);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
global $language;
$tnid = $this->get_value($values, 'tnid');
@@ -46,4 +59,5 @@ class views_handler_field_node_translation_link extends views_handler_field {
$this->options['alter']['path'] = "node/" . $this->get_value($values, 'nid');
return $this->get_value($values, 'title');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid.inc b/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid.inc
index ed4d6a9..5bff048 100644
--- a/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid.inc
@@ -11,8 +11,17 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_tnid extends views_handler_filter {
- function admin_summary() { }
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['operator']['default'] = 1;
@@ -21,9 +30,9 @@ class views_handler_filter_node_tnid extends views_handler_filter {
}
/**
- * Provide simple boolean operator
+ * Provide simple boolean operator.
*/
- function operator_form(&$form, &$form_state) {
+ public function operator_form(&$form, &$form_state) {
$form['operator'] = array(
'#type' => 'radios',
'#title' => t('Include untranslated content'),
@@ -35,11 +44,25 @@ class views_handler_filter_node_tnid extends views_handler_filter {
);
}
- function can_expose() { return FALSE; }
-
- function query() {
- $table = $this->ensure_my_table();
- // Select for source translations (tnid = nid). Conditionally, also accept either untranslated nodes (tnid = 0).
- $this->query->add_where_expression($this->options['group'], "$table.tnid = $table.nid" . ($this->operator ? " OR $table.tnid = 0" : ''));
+ /**
+ * {@inheritdoc}
+ */
+ public function can_expose() {
+ return FALSE;
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
+ $table = $this->ensure_my_table();
+ // Select for source translations (tnid = nid). Conditionally, also accept
+ // either untranslated nodes (tnid = 0).
+ $expression = "$table.tnid = $table.nid";
+ if ($this->operator) {
+ $expression .= " OR $table.tnid = 0";
+ }
+ $this->query->add_where_expression($this->options['group'], $expression);
+ }
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid_child.inc b/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid_child.inc
index 51316eb..a2f3e38 100644
--- a/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid_child.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation/views_handler_filter_node_tnid_child.inc
@@ -11,12 +11,32 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_node_tnid_child extends views_handler_filter {
- function admin_summary() { }
- function operator_form(&$form, &$form_state) { }
- function can_expose() { return FALSE; }
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function operator_form(&$form, &$form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function can_expose() {
+ return FALSE;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$table = $this->ensure_my_table();
$this->query->add_where_expression($this->options['group'], "$table.tnid <> $table.nid AND $table.tnid > 0");
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/translation/views_handler_relationship_translation.inc b/sites/all/modules/contrib/views/views/modules/translation/views_handler_relationship_translation.inc
index 509a935..7601c25 100644
--- a/sites/all/modules/contrib/views/views/modules/translation/views_handler_relationship_translation.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation/views_handler_relationship_translation.inc
@@ -12,7 +12,11 @@
* @ingroup views_relationship_handlers
*/
class views_handler_relationship_translation extends views_handler_relationship {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['language'] = array('default' => 'current');
@@ -22,7 +26,7 @@ class views_handler_relationship_translation extends views_handler_relationship
/**
* Add a translation selector.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$options = array(
@@ -43,7 +47,7 @@ class views_handler_relationship_translation extends views_handler_relationship
/**
* Called to implement a relationship in a query.
*/
- function query() {
+ public function query() {
// Figure out what base table this relationship brings to the party.
$table_data = views_fetch_data($this->definition['base']);
$base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
@@ -68,12 +72,14 @@ class views_handler_relationship_translation extends views_handler_relationship
'value' => '***CURRENT_LANGUAGE***',
);
break;
+
case 'default':
$def['extra'][] = array(
'field' => 'language',
'value' => '***DEFAULT_LANGUAGE***',
);
break;
+
// Other values will be the language codes.
default:
$def['extra'][] = array(
@@ -92,12 +98,14 @@ class views_handler_relationship_translation extends views_handler_relationship
}
$join->definition = $def;
+ $join->extra = "(%alias.tnid != 0 OR ({$def['left_table']}.tnid = 0 AND %alias.nid = {$def['left_table']}.nid))";
$join->construct();
$join->adjusted = TRUE;
- // use a short alias for this:
+ // Use a short alias for this.
$alias = $def['table'] . '_' . $this->table;
$this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user.views.inc b/sites/all/modules/contrib/views/views/modules/user.views.inc
index 7077104..97abd27 100644
--- a/sites/all/modules/contrib/views/views/modules/user.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/user.views.inc
@@ -12,10 +12,9 @@
*/
function user_views_data() {
// ----------------------------------------------------------------
- // users table
-
- // Define the base group of this table. Fields that don't
- // have a group defined will go into this field by default.
+ // 'users' table.
+ // Define the base group of this table. Fields that don't have a group
+ // defined will go into this field by default.
$data['users']['table']['group'] = t('User');
$data['users']['table']['base'] = array(
@@ -26,7 +25,6 @@ function user_views_data() {
);
$data['users']['table']['entity type'] = 'user';
-
$data['users']['table']['default_relationship'] = array(
'node' => array(
'table' => 'node',
@@ -42,17 +40,20 @@ function user_views_data() {
),
);
- // uid
+ // User ID / 'uid'.
$data['users']['uid'] = array(
+ // The item it appears as on the UI,
'title' => t('Uid'),
- 'help' => t('The user ID'), // The help that appears on the UI,
+ // The help that appears on the UI,
+ 'help' => t('The user ID'),
'field' => array(
'handler' => 'views_handler_field_user',
'click sortable' => TRUE,
),
'argument' => array(
'handler' => 'views_handler_argument_user_uid',
- 'name field' => 'name', // display this field in the summary
+ // Display this field in the summary.
+ 'name field' => 'name',
),
'filter' => array(
'title' => t('Name'),
@@ -72,7 +73,7 @@ function user_views_data() {
),
);
- // uid_raw
+ // The raw user ID / 'uid_raw'.
$data['users']['uid_raw'] = array(
'help' => t('The raw numeric user ID.'),
'real field' => 'uid',
@@ -82,7 +83,7 @@ function user_views_data() {
),
);
- // uid
+ // Representative node for the user.
$data['users']['uid_representative'] = array(
'relationship' => array(
'title' => t('Representative node'),
@@ -92,13 +93,13 @@ function user_views_data() {
'relationship field' => 'uid',
'outer field' => 'users.uid',
'argument table' => 'users',
- 'argument field' => 'uid',
+ 'argument field' => 'uid',
'base' => 'node',
'field' => 'nid',
),
);
- // uid
+ // Current user's ID / 'uid'.
$data['users']['uid_current'] = array(
'real field' => 'uid',
'title' => t('Current'),
@@ -109,10 +110,12 @@ function user_views_data() {
),
);
- // name
+ // User name.
$data['users']['name'] = array(
- 'title' => t('Name'), // The item it appears as on the UI,
- 'help' => t('The user or author name.'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Name'),
+ // The help that appears on the UI,
+ 'help' => t('The user or author name.'),
'field' => array(
'handler' => 'views_handler_field_user_name',
'click sortable' => TRUE,
@@ -126,15 +129,17 @@ function user_views_data() {
'filter' => array(
'handler' => 'views_handler_filter_string',
'title' => t('Name (raw)'),
- 'help' => t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not utilize autocomplete.')
+ 'help' => t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not utilize autocomplete.'),
),
);
- // mail
+ // Email address.
// Note that this field implements field level access control.
$data['users']['mail'] = array(
- 'title' => t('E-mail'), // The item it appears as on the UI,
- 'help' => t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('E-mail'),
+ // The help that appears on the UI,
+ 'help' => t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.'),
'field' => array(
'handler' => 'views_handler_field_user_mail',
'click sortable' => TRUE,
@@ -150,9 +155,10 @@ function user_views_data() {
),
);
- // language
+ // Language.
$data['users']['language'] = array(
- 'title' => t('Language'), // The item it appears as on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Language'),
'help' => t('Language of the user'),
'field' => array(
'handler' => 'views_handler_field_user_language',
@@ -169,12 +175,14 @@ function user_views_data() {
),
);
- // picture
+ // Picture.
$data['users']['picture_fid']['moved to'] = array('users', 'picture');
$data['users']['picture'] = array(
+ // The item it appears as on the UI,
'title' => t('Picture'),
- 'help' => t("The user's picture, if allowed."), // The help that appears on the UI,
- // Information for displaying the uid
+ // The help that appears on the UI,
+ 'help' => t("The user's picture, if allowed."),
+ // Information for displaying the uid.
'field' => array(
'handler' => 'views_handler_field_user_picture',
'click sortable' => TRUE,
@@ -189,7 +197,7 @@ function user_views_data() {
),
);
- // link
+ // Link.
$data['users']['view_user'] = array(
'field' => array(
'title' => t('Link'),
@@ -198,10 +206,12 @@ function user_views_data() {
),
);
- // created field
+ // Created field.
$data['users']['created'] = array(
- 'title' => t('Created date'), // The item it appears as on the UI,
- 'help' => t('The date the user was created.'), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Created date'),
+ // The help that appears on the UI,
+ 'help' => t('The date the user was created.'),
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
@@ -269,10 +279,12 @@ function user_views_data() {
),
);
- // access field
+ // Access field.
$data['users']['access'] = array(
- 'title' => t('Last access'), // The item it appears as on the UI,
- 'help' => t("The user's last access date."), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Last access'),
+ // The help that appears on the UI,
+ 'help' => t("The user's last access date."),
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
@@ -285,10 +297,12 @@ function user_views_data() {
),
);
- // login field
+ // Login field.
$data['users']['login'] = array(
- 'title' => t('Last login'), // The item it appears as on the UI,
- 'help' => t("The user's last login date."), // The help that appears on the UI,
+ // The item it appears as on the UI,
+ 'title' => t('Last login'),
+ // The help that appears on the UI,
+ 'help' => t("The user's last login date."),
'field' => array(
'handler' => 'views_handler_field_date',
'click sortable' => TRUE,
@@ -301,11 +315,13 @@ function user_views_data() {
),
);
- // active status
+ // Active status.
$data['users']['status'] = array(
- 'title' => t('Active'), // The item it appears as on the UI,
- 'help' => t('Whether a user is active or blocked.'), // The help that appears on the UI,
- // Information for displaying a title as a field
+ // The item it appears as on the UI,
+ 'title' => t('Active'),
+ // The help that appears on the UI,
+ 'help' => t('Whether a user is active or blocked.'),
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_boolean',
'click sortable' => TRUE,
@@ -323,11 +339,13 @@ function user_views_data() {
),
);
- // log field
+ // Log field.
$data['users']['signature'] = array(
- 'title' => t('Signature'), // The item it appears as on the UI,
- 'help' => t("The user's signature."), // The help that appears on the UI,
- // Information for displaying a title as a field
+ // The item it appears as on the UI,
+ 'title' => t('Signature'),
+ // The help that appears on the UI,
+ 'help' => t("The user's signature."),
+ // Information for displaying a title as a field.
'field' => array(
'handler' => 'views_handler_field_markup',
'format' => filter_fallback_format(),
@@ -362,8 +380,7 @@ function user_views_data() {
);
// ----------------------------------------------------------------------
- // users_roles table
-
+ // 'users_roles' table.
$data['users_roles']['table']['group'] = t('User');
// Explain how this table joins to others.
@@ -409,8 +426,7 @@ function user_views_data() {
);
// ----------------------------------------------------------------------
- // role table
-
+ // 'role' table.
$data['role']['table']['join'] = array(
// Directly links to users table.
'users' => array(
@@ -418,7 +434,7 @@ function user_views_data() {
'left_field' => 'rid',
'field' => 'rid',
),
- // needed for many to one helper sometimes
+ // Needed for many to one helper sometimes.
'users_roles' => array(
'left_field' => 'rid',
'field' => 'rid',
@@ -436,7 +452,7 @@ function user_views_data() {
),
);
- // permission table
+ // 'permission' table.
$data['role_permission']['table']['group'] = t('User');
$data['role_permission']['table']['join'] = array(
// Directly links to users table.
@@ -460,8 +476,7 @@ function user_views_data() {
);
// ----------------------------------------------------------------------
- // authmap table
-
+ // 'authmap' table.
$data['authmap']['table']['group'] = t('User');
$data['authmap']['table']['join'] = array(
// Directly links to users table.
@@ -532,13 +547,15 @@ function user_views_data() {
*/
function user_views_plugins() {
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
+ // This just tells our themes are elsewhere.
+ 'module' => 'views',
'row' => array(
'user' => array(
'title' => t('User'),
'help' => t('Display the user with standard user view.'),
'handler' => 'views_plugin_row_user_view',
- 'base' => array('users'), // only works with 'users' as base.
+ // Only works with 'users' as base.
+ 'base' => array('users'),
'uses options' => TRUE,
'type' => 'normal',
'help topic' => 'style-users',
@@ -548,26 +565,29 @@ function user_views_plugins() {
'user' => array(
'title' => t('User ID from URL'),
'handler' => 'views_plugin_argument_default_user',
- 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules
+ // Not necessary for most modules.
+ 'path' => drupal_get_path('module', 'views') . '/modules/user',
),
'current_user' => array(
'title' => t('User ID from logged in user'),
'handler' => 'views_plugin_argument_default_current_user',
- 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules
+ // Not necessary for most modules.
+ 'path' => drupal_get_path('module', 'views') . '/modules/user',
),
),
'argument validator' => array(
'user' => array(
'title' => t('User'),
'handler' => 'views_plugin_argument_validate_user',
- 'path' => drupal_get_path('module', 'views') . '/modules/user', // not necessary for most modules
+ // Not necessary for most modules.
+ 'path' => drupal_get_path('module', 'views') . '/modules/user',
),
),
);
}
/**
- * Allow replacement of current userid so we can cache these queries
+ * Allow replacement of current userid so we can cache these queries.
*/
function user_views_query_substitutions($view) {
global $user;
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_user_uid.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_user_uid.inc
index 6ab9167..8cf20d9 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_user_uid.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_user_uid.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_handler_argument_user_uid.
+ * Contains .
*/
/**
@@ -11,13 +11,14 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_user_uid extends views_handler_argument_numeric {
+
/**
* Override the behavior of title(). Get the name of the user.
*
* @return array
* A list of usernames.
*/
- function title_query() {
+ public function title_query() {
if (!$this->argument) {
return array(variable_get('anonymous', t('Anonymous')));
}
@@ -30,4 +31,5 @@ class views_handler_argument_user_uid extends views_handler_argument_numeric {
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_users_roles_rid.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_users_roles_rid.inc
index 31c5814..e7457c9 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_users_roles_rid.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_argument_users_roles_rid.inc
@@ -11,7 +11,11 @@
* @ingroup views_argument_handlers
*/
class views_handler_argument_users_roles_rid extends views_handler_argument_many_to_one {
- function title_query() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function title_query() {
$titles = array();
$result = db_query("SELECT name FROM {role} WHERE rid IN (:rids)", array(':rids' => $this->value));
@@ -20,4 +24,5 @@ class views_handler_argument_users_roles_rid extends views_handler_argument_many
}
return $titles;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user.inc
index f6b15b5..7939612 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user.inc
@@ -11,26 +11,30 @@
* @ingroup views_field_handlers
*/
class views_handler_field_user extends views_handler_field {
+
/**
* Override init function to provide generic option to link to user.
*/
- function init(&$view, &$data) {
+ public function init(&$view, &$data) {
parent::init($view, $data);
if (!empty($this->options['link_to_user'])) {
$this->additional_fields['uid'] = 'uid';
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_user'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
/**
- * Provide link to node option
+ * Provide link to node option.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
$form['link_to_user'] = array(
'#title' => t('Link this field to its user'),
'#description' => t("Enable to override this field's links."),
@@ -40,7 +44,10 @@ class views_handler_field_user extends views_handler_field {
parent::options_form($form, $form_state);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
if (!empty($this->options['link_to_user']) && user_access('access user profiles') && ($uid = $this->get_value($values, 'uid')) && $data !== NULL && $data !== '') {
$this->options['alter']['make_link'] = TRUE;
$this->options['alter']['path'] = "user/" . $uid;
@@ -48,8 +55,12 @@ class views_handler_field_user extends views_handler_field {
return $data;
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_language.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_language.inc
index e29da31..b96963d 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_language.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_language.inc
@@ -12,7 +12,10 @@
*/
class views_handler_field_user_language extends views_handler_field_user {
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$uid = $this->get_value($values, 'uid');
if (!empty($this->options['link_to_user'])) {
$uid = $this->get_value($values, 'uid');
@@ -32,8 +35,12 @@ class views_handler_field_user_language extends views_handler_field_user {
return $this->sanitize_value($lang->name);
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values);
return $this->render_link($this->sanitize_value($value), $values);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link.inc
index 03b5e0d..103e554 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link.inc
@@ -11,18 +11,28 @@
* @ingroup views_field_handlers
*/
class views_handler_field_user_link extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['uid'] = 'uid';
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['text'] = array('default' => '', 'translatable' => TRUE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['text'] = array(
'#type' => 'textfield',
'#title' => t('Text to display'),
@@ -31,22 +41,33 @@ class views_handler_field_user_link extends views_handler_field {
parent::options_form($form, $form_state);
}
- // An example of field level access control.
- function access() {
+ /**
+ * An example of field level access control.
+ */
+ public function access() {
return user_access('access user profiles');
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$this->add_additional_fields();
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
$value = $this->get_value($values, 'uid');
return $this->render_link($this->sanitize_value($value), $values);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$text = !empty($this->options['text']) ? $this->options['text'] : t('view');
$this->options['alter']['make_link'] = TRUE;
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_cancel.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_cancel.inc
index fe038da..607caa7 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_cancel.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_cancel.inc
@@ -12,7 +12,10 @@
*/
class views_handler_field_user_link_cancel extends views_handler_field_user_link {
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$uid = $values->{$this->aliases['uid']};
// Build a pseudo account object to be able to check the access.
@@ -30,4 +33,5 @@ class views_handler_field_user_link_cancel extends views_handler_field_user_link
return $text;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_edit.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_edit.inc
index e37feae..b7122d8 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_edit.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_link_edit.inc
@@ -11,7 +11,11 @@
* @ingroup views_field_handlers
*/
class views_handler_field_user_link_edit extends views_handler_field_user_link {
- function render_link($data, $values) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
// Build a pseudo account object to be able to check the access.
$account = new stdClass();
$account->uid = $data;
@@ -27,4 +31,5 @@ class views_handler_field_user_link_edit extends views_handler_field_user_link {
return $text;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_mail.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_mail.inc
index 82d1933..d71bdc5 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_mail.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_mail.inc
@@ -11,13 +11,20 @@
* @ingroup views_field_handlers
*/
class views_handler_field_user_mail extends views_handler_field_user {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_to_user'] = array('default' => 'mailto');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['link_to_user'] = array(
'#title' => t('Link this field'),
@@ -31,7 +38,10 @@ class views_handler_field_user_mail extends views_handler_field_user {
);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
parent::render_link($data, $values);
if ($this->options['link_to_user'] == 'mailto') {
@@ -41,4 +51,5 @@ class views_handler_field_user_mail extends views_handler_field_user {
return $data;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_name.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_name.inc
index 4551451..7043718 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_name.inc
@@ -6,22 +6,26 @@
*/
/**
- * Field handler to provide simple renderer that allows using a themed user link.
+ * Field handler for a simple renderer that allows using a themed user link.
*
* @ingroup views_field_handlers
*/
class views_handler_field_user_name extends views_handler_field_user {
+
/**
* Add uid in the query so we can test for anonymous if needed.
*/
- function init(&$view, &$data) {
+ public function init(&$view, &$data) {
parent::init($view, $data);
if (!empty($this->options['overwrite_anonymous']) || !empty($this->options['format_username'])) {
$this->additional_fields['uid'] = 'uid';
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['overwrite_anonymous'] = array('default' => FALSE, 'bool' => TRUE);
@@ -31,7 +35,10 @@ class views_handler_field_user_name extends views_handler_field_user {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['format_username'] = array(
'#title' => t('Use formatted username'),
'#type' => 'checkbox',
@@ -59,7 +66,10 @@ class views_handler_field_user_name extends views_handler_field_user {
parent::options_form($form, $form_state);
}
- function render_link($data, $values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_link($data, $values) {
$account = new stdClass();
$account->uid = $this->get_value($values, 'uid');
$account->name = $this->get_value($values);
@@ -74,10 +84,11 @@ class views_handler_field_user_name extends views_handler_field_user {
}
}
// If we want a formatted username, do that.
- if (!empty($this->options['format_username'])) {
+ if (!empty($this->options['format_username']) && !is_null($account->uid)) {
return format_username($account);
}
// Otherwise, there's no special handling, so return the data directly.
return $data;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_permissions.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_permissions.inc
index edc9c44..1bf2934 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_permissions.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_permissions.inc
@@ -11,17 +11,27 @@
* @ingroup views_field_handlers
*/
class views_handler_field_user_permissions extends views_handler_field_prerender_list {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid');
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->add_additional_fields();
$this->field_alias = $this->aliases['uid'];
}
- function pre_render(&$values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render(&$values) {
$uids = array();
$this->items = array();
@@ -30,8 +40,8 @@ class views_handler_field_user_permissions extends views_handler_field_prerender
}
if ($uids) {
- // Get a list of all the modules implementing a hook_permission() and sort by
- // display name.
+ // Get a list of all the modules implementing a hook_permission() and
+ // sort by display name.
$module_info = system_get_info('module');
$modules = array();
foreach (module_implements('permission') as $module) {
@@ -50,19 +60,27 @@ class views_handler_field_user_permissions extends views_handler_field_prerender
}
}
- function render_item($count, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_item($count, $item) {
return $item['permission'];
}
- /*
- function document_self_tokens(&$tokens) {
- $tokens['[' . $this->options['id'] . '-role' . ']'] = t('The name of the role.');
- $tokens['[' . $this->options['id'] . '-rid' . ']'] = t('The role ID of the role.');
- }
+ /**
+ *
+ */
+ // function document_self_tokens(&$tokens) {
+ // $tokens['[' . $this->options['id'] . '-role' . ']'] = t('The name of the role.');
+ // $tokens['[' . $this->options['id'] . '-rid' . ']'] = t('The role ID of the role.');
+ // }
+
+ /**
+ *
+ */
+ // function add_self_tokens(&$tokens, $item) {
+ // $tokens['[' . $this->options['id'] . '-role' . ']'] = $item['role'];
+ // $tokens['[' . $this->options['id'] . '-rid' . ']'] = $item['rid'];
+ // }
- function add_self_tokens(&$tokens, $item) {
- $tokens['[' . $this->options['id'] . '-role' . ']'] = $item['role'];
- $tokens['[' . $this->options['id'] . '-rid' . ']'] = $item['rid'];
- }
- */
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_picture.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_picture.inc
index babbae5..7769900 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_picture.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_picture.inc
@@ -6,19 +6,26 @@
*/
/**
- * Field handler to provide simple renderer that allows using a themed user link.
+ * Field handler for a simple renderer that allows using a themed user link.
*
* @ingroup views_field_handlers
*/
class views_handler_field_user_picture extends views_handler_field {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['uid'] = 'uid';
$this->additional_fields['name'] = 'name';
$this->additional_fields['mail'] = 'mail';
}
- function element_type($none_supported = FALSE, $default_empty = FALSE, $inline = FALSE) {
+ /**
+ * {@inheritdoc}
+ */
+ public function element_type($none_supported = FALSE, $default_empty = FALSE, $inline = FALSE) {
if ($inline) {
return 'span';
}
@@ -40,14 +47,20 @@ class views_handler_field_user_picture extends views_handler_field {
return 'div';
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['link_photo_to_profile'] = array('default' => TRUE, 'bool' => TRUE);
$options['image_style'] = array('default' => '');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['link_photo_to_profile'] = array(
'#title' => t("Link to user's profile"),
@@ -73,19 +86,29 @@ class views_handler_field_user_picture extends views_handler_field {
}
}
- function render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($values) {
if ($this->options['image_style'] && module_exists('image')) {
- // @todo: Switch to always using theme('user_picture') when it starts
+ // @todo Switch to always using theme('user_picture') when it starts
// supporting image styles. See http://drupal.org/node/1021564
if ($picture_fid = $this->get_value($values)) {
$picture = file_load($picture_fid);
- $picture_filepath = $picture->uri;
+ if (!empty($picture)) {
+ $picture_filepath = $picture->uri;
+ }
+ else {
+ $picture_filepath = variable_get('user_picture_default', '');
+ }
}
else {
$picture_filepath = variable_get('user_picture_default', '');
}
if (file_valid_uri($picture_filepath)) {
- $output = theme('image_style', array('style_name' => $this->options['image_style'], 'path' => $picture_filepath));
+ $account = user_load($this->get_value($values, 'uid'));
+ $alt = t("@user's picture", array('@user' => format_username($account)));
+ $output = theme('image_style', array('style_name' => $this->options['image_style'], 'path' => $picture_filepath, 'alt' => $alt));
if ($this->options['link_photo_to_profile'] && user_access('access user profiles')) {
$uid = $this->get_value($values, 'uid');
$output = l($output, "user/$uid", array('html' => TRUE));
@@ -111,4 +134,5 @@ class views_handler_field_user_picture extends views_handler_field {
return $output;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_roles.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_roles.inc
index e6571cd..86a0b7a 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_roles.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_field_user_roles.inc
@@ -11,17 +11,27 @@
* @ingroup views_field_handlers
*/
class views_handler_field_user_roles extends views_handler_field_prerender_list {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid');
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->add_additional_fields();
$this->field_alias = $this->aliases['uid'];
}
- function pre_render(&$values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render(&$values) {
$uids = array();
$this->items = array();
@@ -39,19 +49,29 @@ class views_handler_field_user_roles extends views_handler_field_prerender_list
}
}
- function render_item($count, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render_item($count, $item) {
return $item['role'];
}
- function document_self_tokens(&$tokens) {
+ /**
+ * {@inheritdoc}
+ */
+ public function document_self_tokens(&$tokens) {
$tokens['[' . $this->options['id'] . '-role' . ']'] = t('The name of the role.');
$tokens['[' . $this->options['id'] . '-rid' . ']'] = t('The role ID of the role.');
}
- function add_self_tokens(&$tokens, $item) {
+ /**
+ * {@inheritdoc}
+ */
+ public function add_self_tokens(&$tokens, $item) {
if (!empty($item['role'])) {
$tokens['[' . $this->options['id'] . '-role' . ']'] = $item['role'];
$tokens['[' . $this->options['id'] . '-rid' . ']'] = $item['rid'];
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_current.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_current.inc
index 5f8fe4c..320d5cd 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_current.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_current.inc
@@ -11,12 +11,19 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_user_current extends views_handler_filter_boolean_operator {
- function construct() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function construct() {
parent::construct();
$this->value_value = t('Is the logged in user');
}
- function query() {
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
$this->ensure_my_table();
$field = $this->table_alias . '.' . $this->real_field . ' ';
@@ -33,4 +40,5 @@ class views_handler_filter_user_current extends views_handler_filter_boolean_ope
}
$this->query->add_where($this->options['group'], $or);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_name.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_name.inc
index 300607f..fa40989 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_name.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_name.inc
@@ -11,9 +11,16 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_user_name extends views_handler_filter_in_operator {
- var $always_multiple = TRUE;
- function value_form(&$form, &$form_state) {
+ /**
+ *
+ */
+ public $always_multiple = TRUE;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function value_form(&$form, &$form_state) {
$values = array();
if ($this->value) {
$result = db_query("SELECT * FROM {users} u WHERE uid IN (:uids)", array(':uids' => $this->value));
@@ -22,7 +29,8 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
$values[] = $account->name;
}
else {
- $values[] = 'Anonymous'; // Intentionally NOT translated.
+ // Intentionally NOT translated.
+ $values[] = 'Anonymous';
}
}
}
@@ -42,7 +50,10 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
}
}
- function value_validate($form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function value_validate($form, &$form_state) {
$values = drupal_explode_tags($form_state['values']['options']['value']);
$uids = $this->validate_user_strings($form['value'], $values);
@@ -51,7 +62,10 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
}
}
- function accept_exposed_input($input) {
+ /**
+ * {@inheritdoc}
+ */
+ public function accept_exposed_input($input) {
$rc = parent::accept_exposed_input($input);
if ($rc) {
@@ -64,7 +78,10 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
return $rc;
}
- function exposed_validate(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function exposed_validate(&$form, &$form_state) {
if (empty($this->options['exposed'])) {
return;
}
@@ -96,11 +113,12 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
}
/**
- * Validate the user string. Since this can come from either the form
- * or the exposed filter, this is abstracted out a bit so it can
- * handle the multiple input sources.
+ * Validate the user string.
+ *
+ * Since this can come from either the form or the exposed filter, this is
+ * abstracted out a bit so it can handle the multiple input sources.
*/
- function validate_user_strings(&$form, $values) {
+ public function validate_user_strings(&$form, $values) {
$uids = array();
$placeholders = array();
$args = array();
@@ -133,15 +151,24 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
return $uids;
}
- function value_submit($form, &$form_state) {
- // prevent array filter from removing our anonymous user.
+ /**
+ * {@inheritdoc}
+ */
+ public function value_submit($form, &$form_state) {
+ // Prevent array filter from removing our anonymous user.
}
- // Override to do nothing.
- function get_value_options() { }
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
+ }
- function admin_summary() {
- // set up $this->value_options for the parent summary
+ /**
+ * {@inheritdoc}
+ */
+ public function admin_summary() {
+ // Set up $this->value_options for the parent summary.
$this->value_options = array();
if ($this->value) {
@@ -152,11 +179,13 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
$this->value_options[$account->uid] = $account->name;
}
else {
- $this->value_options[$account->uid] = 'Anonymous'; // Intentionally NOT translated.
+ // Intentionally NOT translated.
+ $this->value_options[$account->uid] = 'Anonymous';
}
}
}
return parent::admin_summary();
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_permissions.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_permissions.inc
index f999045..ee63818 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_permissions.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_permissions.inc
@@ -11,11 +11,15 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_user_permissions extends views_handler_filter_many_to_one {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
$module_info = system_get_info('module');
- // Get a list of all the modules implementing a hook_permission() and sort by
- // display name.
+ // Get a list of all the modules implementing a hook_permission() and sort
+ // by display name.
$modules = array();
foreach (module_implements('permission') as $module) {
$modules[$module] = $module_info[$module]['name'];
@@ -26,10 +30,11 @@ class views_handler_filter_user_permissions extends views_handler_filter_many_to
foreach ($modules as $module => $display_name) {
if ($permissions = module_invoke($module, 'permission')) {
foreach ($permissions as $perm => $perm_item) {
- // @todo: group by module but views_handler_filter_many_to_one does not support this.
+ // @todo group by module but views_handler_filter_many_to_one does not support this.
$this->value_options[$perm] = check_plain(strip_tags($perm_item['title']));
}
}
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_roles.inc b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_roles.inc
index ab9b8a2..d717230 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_roles.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_handler_filter_user_roles.inc
@@ -11,7 +11,11 @@
* @ingroup views_filter_handlers
*/
class views_handler_filter_user_roles extends views_handler_filter_many_to_one {
- function get_value_options() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_value_options() {
$this->value_options = user_roles(TRUE);
unset($this->value_options[DRUPAL_AUTHENTICATED_RID]);
}
@@ -19,10 +23,11 @@ class views_handler_filter_user_roles extends views_handler_filter_many_to_one {
/**
* Override empty and not empty operator labels to be clearer for user roles.
*/
- function operators() {
+ public function operators() {
$operators = parent::operators();
$operators['empty']['title'] = t("Only has the 'authenticated user' role");
$operators['not empty']['title'] = t("Has roles in addition to 'authenticated user'");
return $operators;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_current_user.inc b/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_current_user.inc
index e11c702..b4f25dd 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_current_user.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_current_user.inc
@@ -2,17 +2,22 @@
/**
* @file
- * Contains the current user argument default plugin.
+ * Definition of views_plugin_argument_default_current_user.
*/
/**
- * Default argument plugin to extract the global $user
+ * Default argument plugin to extract the global $user.
*
* This plugin actually has no options so it odes not need to do a great deal.
*/
class views_plugin_argument_default_current_user extends views_plugin_argument_default {
- function get_argument() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function get_argument() {
global $user;
return $user->uid;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_user.inc b/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_user.inc
index bb10429..128286e 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_user.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_default_user.inc
@@ -2,21 +2,28 @@
/**
* @file
- * Contains the user from URL argument default plugin.
+ * Definition of views_plugin_argument_default_user.
*/
/**
* Default argument plugin to extract a user via menu_get_object.
*/
class views_plugin_argument_default_user extends views_plugin_argument_default {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['user'] = array('default' => '', 'bool' => TRUE, 'translatable' => FALSE);
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['user'] = array(
'#type' => 'checkbox',
'#title' => t('Also look for a node and use the node author'),
@@ -24,13 +31,19 @@ class views_plugin_argument_default_user extends views_plugin_argument_default {
);
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['user']) && isset($this->argument->options['default_argument_user'])) {
$options['user'] = $this->argument->options['default_argument_user'];
}
}
- function get_argument() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_argument() {
foreach (range(1, 3) as $i) {
$user = menu_get_object('user', $i);
if (!empty($user)) {
@@ -67,11 +80,13 @@ class views_plugin_argument_default_user extends views_plugin_argument_default {
}
}
- // If the current page is a view that takes uid as an argument, return the uid.
+ // If the current page is a view that takes uid as an argument, return the
+ // uid.
$view = views_get_page_view();
if ($view && isset($view->argument['uid'])) {
return $view->argument['uid']->argument;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_validate_user.inc b/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_validate_user.inc
index b727094..37064e6 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_validate_user.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_plugin_argument_validate_user.inc
@@ -13,7 +13,11 @@
* argument's title to the username.
*/
class views_plugin_argument_validate_user extends views_plugin_argument_validate {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['type'] = array('default' => 'uid');
$options['restrict_roles'] = array('default' => FALSE, 'bool' => TRUE);
@@ -22,7 +26,10 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
$form['type'] = array(
'#type' => 'radios',
'#title' => t('Type of user filter value to allow'),
@@ -54,12 +61,19 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
);
}
- function options_submit(&$form, &$form_state, &$options = array()) {
- // filter trash out of the options so we don't store giant unnecessary arrays
+ /**
+ * {@inheritdoc}
+ */
+ public function options_submit(&$form, &$form_state, &$options = array()) {
+ // Filter trash out of the options so we don't store giant unnecessary
+ // arrays.
$options['roles'] = array_filter($options['roles']);
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['type']) && isset($this->argument->options['validate_user_argument_type'])) {
$options['type'] = $this->argument->options['validate_user_argument_type'];
$options['restrict_roles'] = $this->argument->options['validate_user_restrict_roles'];
@@ -67,11 +81,14 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
}
}
- function validate_argument($argument) {
+ /**
+ * {@inheritdoc}
+ */
+ public function validate_argument($argument) {
$type = $this->options['type'];
// is_numeric() can return false positives, so we ensure it's an integer.
// However, is_integer() will always fail, since $argument is a string.
- if (is_numeric($argument) && $argument == (int)$argument) {
+ if (is_numeric($argument) && $argument == (int) $argument) {
if ($type == 'uid' || $type == 'either') {
if ($argument == $GLOBALS['user']->uid) {
// If you assign an object to a variable in PHP, the variable
@@ -126,7 +143,10 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
return TRUE;
}
- function process_summary_arguments(&$args) {
+ /**
+ * {@inheritdoc}
+ */
+ public function process_summary_arguments(&$args) {
// If the validation says the input is an username, we should reverse the
// argument so it works for example for generation summary urls.
$uids_arg_keys = array_flip($args);
@@ -137,4 +157,5 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
}
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/user/views_plugin_row_user_view.inc b/sites/all/modules/contrib/views/views/modules/user/views_plugin_row_user_view.inc
index b48f459..3ce818a 100644
--- a/sites/all/modules/contrib/views/views/modules/user/views_plugin_row_user_view.inc
+++ b/sites/all/modules/contrib/views/views/modules/user/views_plugin_row_user_view.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the user view row plugin.
+ * Definition of views_plugin_row_user_view.
*/
/**
@@ -11,20 +11,34 @@
* @ingroup views_row_plugins
*/
class views_plugin_row_user_view extends views_plugin_row {
- var $base_table = 'users';
- var $base_field = 'uid';
+
+ /**
+ *
+ */
+ public $base_table = 'users';
+
+ /**
+ *
+ */
+ public $base_field = 'uid';
// Store the users to be used for pre_render.
- var $users = array();
+ public $users = array();
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['view_mode'] = array('default' => 'full');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$options = $this->options_form_summary_options();
@@ -33,37 +47,42 @@ class views_plugin_row_user_view extends views_plugin_row {
'#options' => $options,
'#title' => t('View mode'),
'#default_value' => $this->options['view_mode'],
- );
- $form['help']['#markup'] = t("Display the user with standard user view. It might be necessary to add a user-profile.tpl.php in your themes template folder, because the default user-profilee template don't show the username per default.", array('@user-profile-api-link' => url('http://api.drupal.org/api/drupal/modules--user--user-profile.tpl.php/7')));
+ );
+ $form['help']['#markup'] = t("Display the user with standard user view. It might be necessary to add a user-profile.tpl.php in your theme's template folder, because the default user-profile template doesn't show the username by default.", array('@user-profile-api-link' => url('http://api.drupal.org/api/drupal/modules--user--user-profile.tpl.php/7')));
}
-
- /**
- * Return the main options, which are shown in the summary title.
- */
- function options_form_summary_options() {
- $entity_info = entity_get_info('user');
- $options = array();
- if (!empty($entity_info['view modes'])) {
- foreach ($entity_info['view modes'] as $mode => $settings) {
- $options[$mode] = $settings['label'];
- }
+ /**
+ * Return the main options, which are shown in the summary title.
+ */
+ public function options_form_summary_options() {
+ $entity_info = entity_get_info('user');
+ $options = array();
+ if (!empty($entity_info['view modes'])) {
+ foreach ($entity_info['view modes'] as $mode => $settings) {
+ $options[$mode] = $settings['label'];
}
- if (empty($options)) {
- $options = array(
- 'full' => t('User account')
- );
- }
-
- return $options;
+ }
+ if (empty($options)) {
+ $options = array(
+ 'full' => t('User account'),
+ );
}
- function summary_title() {
- $options = $this->options_form_summary_options();
- return check_plain($options[$this->options['view_mode']]);
- }
+ return $options;
+ }
- function pre_render($values) {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
+ $options = $this->options_form_summary_options();
+ return check_plain($options[$this->options['view_mode']]);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function pre_render($values) {
$uids = array();
foreach ($values as $row) {
$uids[] = $row->{$this->field_alias};
@@ -71,11 +90,15 @@ class views_plugin_row_user_view extends views_plugin_row {
$this->users = user_load_multiple($uids);
}
- function render($row) {
+ /**
+ * {@inheritdoc}
+ */
+ public function render($row) {
$account = $this->users[$row->{$this->field_alias}];
$account->view = $this->view;
$build = user_view($account, $this->options['view_mode']);
return drupal_render($build);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/modules/views.views.inc b/sites/all/modules/contrib/views/views/modules/views.views.inc
index 7c3f4db..b9a1275 100644
--- a/sites/all/modules/contrib/views/views/modules/views.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/views.views.inc
@@ -13,7 +13,7 @@
function views_views_data() {
$data['views']['table']['group'] = t('Global');
$data['views']['table']['join'] = array(
- // #global is a special flag which let's a table appear all the time.
+ // '#global' is a special flag which let's a table appear all the time.
'#global' => array(),
);
@@ -99,9 +99,17 @@ function views_views_data() {
);
}
+ $data['views']['ctools_dropdown'] = array(
+ 'title' => t('Dropdown links'),
+ 'help' => t('Displays fields in a dropdown list, like on the views listing page.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_ctools_dropdown',
+ ),
+ );
+
$data['views']['combine'] = array(
- 'title' => t('Combine fields filter'),
- 'help' => t('Combine two fields together and search by them.'),
+ 'title' => t('Combine fields filter'),
+ 'help' => t('Combine multiple fields together and search by them.'),
'filter' => array(
'handler' => 'views_handler_filter_combine',
),
@@ -124,7 +132,7 @@ function views_views_data() {
'filter' => array(
'help' => t('Use fields comparison to filter the result of the view.'),
'handler' => 'views_handler_filter_fields_compare',
- )
+ ),
);
return $data;
diff --git a/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php b/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php
index 9d80138..97a69a1 100644
--- a/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php
+++ b/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php
@@ -12,10 +12,12 @@
*/
class views_ui extends ctools_export_ui {
+ /**
+ *
+ */
function init($plugin) {
- // We modify the plugin info here so that we take the defaults and
- // twiddle, rather than completely override them.
-
+ // We modify the plugin info here so that we take the defaults and twiddle,
+ // rather than completely override them.
// Reset the edit path to match what we're really using.
$plugin['menu']['items']['edit']['path'] = 'view/%ctools_export_ui/edit';
$plugin['menu']['items']['clone']['path'] = 'view/%ctools_export_ui/clone';
@@ -44,12 +46,13 @@ class views_ui extends ctools_export_ui {
return parent::init($plugin);
}
+ /**
+ *
+ */
function hook_menu(&$items) {
// We are using our own 'edit' still, rather than having edit on this
- // object (maybe in the future) so unset the edit callbacks:
-
- // Store this so we can put them back as sometimes they're needed
- // again laster:
+ // object (maybe in the future) so unset the edit callbacks. Store this so
+ // we can put them back as sometimes they're needed again laster.
$stored_items = $this->plugin['menu']['items'];
// We leave these to make sure the operations still exist in the plugin so
// that the path finder.
@@ -63,10 +66,16 @@ class views_ui extends ctools_export_ui {
$this->plugin['menu']['items'] = $stored_items;
}
+ /**
+ *
+ */
function load_item($item_name) {
return views_ui_cache_load($item_name);
}
+ /**
+ *
+ */
function list_form(&$form, &$form_state) {
$row_class = 'container-inline';
if (!variable_get('views_ui_show_listing_filters', FALSE)) {
@@ -77,8 +86,8 @@ class views_ui extends ctools_export_ui {
parent::list_form($form, $form_state);
- // ctools only has two rows. We want four.
- // That's why we create our own structure.
+ // CTools only has two rows. We want four. That's why we create our own
+ // structure.
$form['bottom row']['submit']['#attributes']['class'][] = 'js-hide';
$form['first row'] = array(
'#prefix' => '',
@@ -164,6 +173,9 @@ class views_ui extends ctools_export_ui {
);
}
+ /**
+ *
+ */
function list_filter($form_state, $view) {
// Don't filter by tags if all is set up.
if ($form_state['values']['tag'] != 'all') {
@@ -183,6 +195,9 @@ class views_ui extends ctools_export_ui {
return parent::list_filter($form_state, $view);
}
+ /**
+ *
+ */
function list_sort_options() {
return array(
'disabled' => t('Enabled, name'),
@@ -193,7 +208,9 @@ class views_ui extends ctools_export_ui {
);
}
-
+ /**
+ *
+ */
function list_build_row($view, &$form_state, $operations) {
if (!empty($view->human_name)) {
$title = $view->human_name;
@@ -212,45 +229,79 @@ class views_ui extends ctools_export_ui {
$info = theme('views_ui_view_info', array('view' => $view, 'base' => $base));
- // Reorder the operations so that enable is the default action for a templatic views
+ // Reorder the operations so that enable is the default action for a
+ // templatic views.
if (!empty($operations['enable'])) {
$operations = array('enable' => $operations['enable']) + $operations;
}
- // Set up sorting
+ // Set up sorting.
switch ($form_state['values']['order']) {
case 'disabled':
$this->sorts[$view->name] = strtolower(empty($view->disabled) . $title);
break;
+
case 'name':
$this->sorts[$view->name] = strtolower($title);
break;
+
case 'path':
$this->sorts[$view->name] = strtolower($paths);
break;
+
case 'tag':
$this->sorts[$view->name] = strtolower($view->tag);
break;
+
case 'storage':
$this->sorts[$view->name] = strtolower($view->type . $title);
break;
}
- $ops = theme('links__ctools_dropbutton', array('links' => $operations, 'attributes' => array('class' => array('links', 'inline'))));
+ $theme_args = array(
+ 'links' => $operations,
+ 'attributes' => array(
+ 'class' => array(
+ 'links',
+ 'inline',
+ ),
+ ),
+ );
+ $ops = theme('links__ctools_dropbutton', $theme_args);
$this->rows[$view->name] = array(
'data' => array(
- array('data' => $info, 'class' => array('views-ui-name')),
- array('data' => check_plain($view->description), 'class' => array('views-ui-description')),
- array('data' => check_plain($view->tag), 'class' => array('views-ui-tag')),
- array('data' => $paths, 'class' => array('views-ui-path')),
- array('data' => $ops, 'class' => array('views-ui-operations')),
+ array(
+ 'data' => $info,
+ 'class' => array('views-ui-name'),
+ ),
+ array(
+ 'data' => check_plain($view->description),
+ 'class' => array('views-ui-description'),
+ ),
+ array(
+ 'data' => check_plain($view->tag),
+ 'class' => array('views-ui-tag'),
+ ),
+ array(
+ 'data' => $paths,
+ 'class' => array('views-ui-path'),
+ ),
+ array(
+ 'data' => $ops,
+ 'class' => array('views-ui-operations'),
+ ),
),
'title' => t('Machine name: ') . check_plain($view->name),
- 'class' => array(!empty($view->disabled) ? 'ctools-export-ui-disabled' : 'ctools-export-ui-enabled'),
+ 'class' => array(
+ !empty($view->disabled) ? 'ctools-export-ui-disabled' : 'ctools-export-ui-enabled',
+ ),
);
}
+ /**
+ *
+ */
function list_render(&$form_state) {
views_include('admin');
views_ui_add_admin_css();
@@ -263,7 +314,7 @@ class views_ui extends ctools_export_ui {
$this->active = $form_state['values']['order'];
$this->order = $form_state['values']['sort'];
- $query = tablesort_get_query_parameters();
+ $query = tablesort_get_query_parameters();
$header = array(
$this->tablesort_link(t('View name'), 'name', 'views-ui-name'),
@@ -282,6 +333,9 @@ class views_ui extends ctools_export_ui {
return theme('table', $table);
}
+ /**
+ *
+ */
function tablesort_link($label, $field, $class) {
$title = t('sort by @s', array('@s' => $label));
$initial = 'asc';
@@ -306,6 +360,9 @@ class views_ui extends ctools_export_ui {
return array('data' => $link, 'class' => $class);
}
+ /**
+ *
+ */
function clone_page($js, $input, $item, $step = NULL) {
drupal_set_title($this->get_page_title('clone', $item));
@@ -339,6 +396,9 @@ class views_ui extends ctools_export_ui {
return $output;
}
+ /**
+ *
+ */
function add_template_page($js, $input, $name, $step = NULL) {
$templates = views_get_all_templates();
@@ -348,9 +408,8 @@ class views_ui extends ctools_export_ui {
$template = $templates[$name];
- // The template description probably describes the template, not the
- // view that will be created from it, but users aren't that likely to
- // touch it.
+ // The template description probably describes the template, not the view
+ // that will be created from it, but users aren't that likely to touch it.
if (!empty($template->description)) {
unset($template->description);
}
@@ -363,6 +422,9 @@ class views_ui extends ctools_export_ui {
return $output;
}
+ /**
+ *
+ */
function set_item_state($state, $js, $input, $item) {
ctools_export_set_object_status($item, $state);
menu_rebuild();
@@ -375,23 +437,27 @@ class views_ui extends ctools_export_ui {
}
}
+ /**
+ *
+ */
function list_page($js, $input) {
// Remove filters values from session if filters are hidden.
if (!variable_get('views_ui_show_listing_filters', FALSE) && isset($_SESSION['ctools_export_ui'][$this->plugin['name']])) {
unset($_SESSION['ctools_export_ui'][$this->plugin['name']]);
}
- // wrap output in a div for CSS
+ // Wrap output in a div for CSS.
$output = parent::list_page($js, $input);
if (is_string($output)) {
$output = '' . $output . '';
- return $output;
}
+ return $output;
}
+
}
/**
- * Form callback to edit an exportable item using the wizard
+ * Form callback to edit an exportable item using the wizard.
*
* This simply loads the object defined in the plugin and hands it off.
*/
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_access.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_access.inc
index 7f80d9b..0a47d7c 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_access.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_access.inc
@@ -17,59 +17,63 @@
* The base plugin to handle access control.
*/
class views_plugin_access extends views_plugin {
+
/**
* Initialize the plugin.
*
- * @param $view
+ * @param view $view
* The view object.
- * @param $display
+ * @param object $display
* The display handler.
*/
- function init(&$view, &$display) {
+ public function init(&$view, &$display) {
$this->view = &$view;
$this->display = &$display;
if (is_object($display->handler)) {
$options = $display->handler->get_option('access');
- // Overlay incoming options on top of defaults
+ // Overlay incoming options on top of defaults.
$this->unpack_options($this->options, $options);
}
}
/**
- * Retrieve the options when this is a new access
- * control plugin
+ * Retrieve the options when this is a new access control plugin.
*/
- function option_definition() { return array(); }
+ public function option_definition() {
+ return array();
+ }
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) { }
+ public function options_form(&$form, &$form_state) {
+ }
/**
- * Provide the default form form for validating options
+ * Provide the default form form for validating options.
*/
- function options_validate(&$form, &$form_state) { }
+ public function options_validate(&$form, &$form_state) {
+ }
/**
- * Provide the default form form for submitting options
+ * Provide the default form form for submitting options.
*/
- function options_submit(&$form, &$form_state) { }
+ public function options_submit(&$form, &$form_state) {
+ }
/**
- * Return a string to display as the clickable title for the
- * access control.
+ * Return a string to display as the clickable title for the access control.
*/
- function summary_title() {
+ public function summary_title() {
return t('Unknown');
}
/**
* Determine if the current user has access or not.
*/
- function access($account) {
- // default to no access control.
+ public function access($account) {
+ // Default to no access control.
return TRUE;
}
@@ -80,15 +84,16 @@ class views_plugin_access extends views_plugin {
* performance hits during menu item access testing, which happens
* a lot.
*
- * @return an array; the first item should be the function to call,
- * and the second item should be an array of arguments. The first
- * item may also be TRUE (bool only) which will indicate no
- * access control.)
+ * @return array
+ * The first item should be the function to call, and the second item should
+ * be an array of arguments. The first item may also be TRUE (bool only)
+ * which will indicate no access control.
*/
- function get_access_callback() {
- // default to no access control.
+ public function get_access_callback() {
+ // Default to no access control.
return TRUE;
}
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_access_none.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_access_none.inc
index d69fe8e..af2a7c9 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_access_none.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_access_none.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of views_plugin_access_none.
+ * Contains .
*/
/**
@@ -11,7 +11,12 @@
* @ingroup views_access_plugins
*/
class views_plugin_access_none extends views_plugin_access {
- function summary_title() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
return t('Unrestricted');
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_access_perm.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_access_perm.inc
index 7279d7d..4c39309 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_access_perm.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_access_perm.inc
@@ -11,15 +11,25 @@
* @ingroup views_access_plugins
*/
class views_plugin_access_perm extends views_plugin_access {
- function access($account) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function access($account) {
return views_check_perm($this->options['perm'], $account);
}
- function get_access_callback() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_access_callback() {
return array('views_check_perm', array($this->options['perm']));
}
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
$permissions = module_invoke_all('permission');
if (isset($permissions[$this->options['perm']])) {
return $permissions[$this->options['perm']]['title'];
@@ -29,19 +39,25 @@ class views_plugin_access_perm extends views_plugin_access {
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['perm'] = array('default' => 'access content');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$perms = array();
$module_info = system_get_info('module');
- // Get list of permissions
+ // Get list of permissions.
foreach (module_implements('permission') as $module) {
$permissions = module_invoke($module, 'permission');
foreach ($permissions as $name => $perm) {
@@ -59,4 +75,5 @@ class views_plugin_access_perm extends views_plugin_access {
'#description' => t('Only users with the selected permission flag will be able to access this display. Note that users with "access all views" can see any view, regardless of other permissions.'),
);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_access_role.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_access_role.inc
index b06812e..21ae181 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_access_role.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_access_role.inc
@@ -11,15 +11,25 @@
* @ingroup views_access_plugins
*/
class views_plugin_access_role extends views_plugin_access {
- function access($account) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function access($account) {
return views_check_roles(array_filter($this->options['role']), $account);
}
- function get_access_callback() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_access_callback() {
return array('views_check_roles', array(array_filter($this->options['role'])));
}
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
$count = count($this->options['role']);
if ($count < 1) {
return t('No role(s) selected');
@@ -34,15 +44,20 @@ class views_plugin_access_role extends views_plugin_access {
}
}
-
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['role'] = array('default' => array());
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['role'] = array(
'#type' => 'checkboxes',
@@ -53,14 +68,21 @@ class views_plugin_access_role extends views_plugin_access {
);
}
- function options_validate(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_validate(&$form, &$form_state) {
if (!array_filter($form_state['values']['access_options']['role'])) {
form_error($form['role'], t('You must select at least one role if type is "by role"'));
}
}
- function options_submit(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_submit(&$form, &$form_state) {
// I hate checkboxes.
$form_state['values']['access_options']['role'] = array_filter($form_state['values']['access_options']['role']);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default.inc
index 2b87730..f686151 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default.inc
@@ -17,18 +17,20 @@
* The fixed argument default handler; also used as the base.
*/
class views_plugin_argument_default extends views_plugin {
+
/**
* Return the default argument.
*
- * This needs to be overridden by every default argument handler to properly do what is needed.
+ * This needs to be overridden by every default argument handler to properly
+ * do what is needed.
*/
- function get_argument() { }
+ public function get_argument() {
+ }
/**
- * Initialize this plugin with the view and the argument
- * it is linked to.
+ * Initialize this plugin with the view and the argument it is linked to.
*/
- function init(&$view, &$argument, $options) {
+ public function init(&$view, &$argument, $options) {
$this->view = &$view;
$this->argument = &$argument;
@@ -37,31 +39,36 @@ class views_plugin_argument_default extends views_plugin {
}
/**
- * Retrieve the options when this is a new access
- * control plugin
+ * Retrieve the options when this is a new access control plugin.
*/
- function option_definition() { return array(); }
+ public function option_definition() {
+ return array();
+ }
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) { }
+ public function options_form(&$form, &$form_state) {
+ }
/**
- * Provide the default form form for validating options
+ * Provide the default form form for validating options.
*/
- function options_validate(&$form, &$form_state) { }
+ public function options_validate(&$form, &$form_state) {
+ }
/**
- * Provide the default form form for submitting options
+ * Provide the default form form for submitting options.
*/
- function options_submit(&$form, &$form_state, &$options = array()) { }
+ public function options_submit(&$form, &$form_state, &$options = array()) {
+ }
/**
- * Determine if the administrator has the privileges to use this
- * plugin
+ * Determine if the administrator has the privileges to use this plugin.
*/
- function access() { return TRUE; }
+ public function access() {
+ return TRUE;
+ }
/**
* If we don't have access to the form but are showing it anyway, ensure that
@@ -70,7 +77,7 @@ class views_plugin_argument_default extends views_plugin {
* This is only called by child objects if specified in the options_form(),
* so it will not always be used.
*/
- function check_access(&$form, $option_name) {
+ public function check_access(&$form, $option_name) {
if (!$this->access()) {
$form[$option_name]['#disabled'] = TRUE;
$form[$option_name]['#value'] = $form[$this->option_name]['#default_value'];
@@ -86,7 +93,9 @@ class views_plugin_argument_default extends views_plugin {
* move arguments from the old style to the new style. See
* views_plugin_argument_default_fixed for a good example of this method.
*/
- function convert_options(&$options) { }
+ public function convert_options(&$options) {
+ }
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_fixed.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_fixed.inc
index 38ede34..f5c056d 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_fixed.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_fixed.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the fixed argument default plugin.
+ * Definition of views_plugin_argument_default_fixed.
*/
/**
@@ -11,14 +11,21 @@
* @ingroup views_argument_default_plugins
*/
class views_plugin_argument_default_fixed extends views_plugin_argument_default {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['argument'] = array('default' => '');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['argument'] = array(
'#type' => 'textfield',
@@ -30,15 +37,19 @@ class views_plugin_argument_default_fixed extends views_plugin_argument_default
/**
* Return the default argument.
*/
- function get_argument() {
+ public function get_argument() {
return $this->options['argument'];
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['argument']) && isset($this->argument->options['default_argument_fixed'])) {
$options['argument'] = $this->argument->options['default_argument_fixed'];
}
}
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_php.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_php.inc
index c2fb14f..9ae8600 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_php.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_php.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the php code argument default plugin.
+ * Definition of views_plugin_argument_default_php.
*/
/**
@@ -11,14 +11,21 @@
* @ingroup views_argument_default_plugins
*/
class views_plugin_argument_default_php extends views_plugin_argument_default {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['code'] = array('default' => '');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['code'] = array(
'#type' => 'textarea',
@@ -27,11 +34,14 @@ class views_plugin_argument_default_php extends views_plugin_argument_default {
'#description' => t('Enter PHP code that returns a value to use for this filter. Do not use <?php ?>. You must return only a single value for just this filter. Some variables are available: the view object will be "$view". The argument handler will be "$argument", for example you may change the title used for substitutions for this argument by setting "argument->validated_title"".'),
);
- // Only do this if using one simple standard form gadget
+ // Only do this if using one simple standard form gadget.
$this->check_access($form, 'code');
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['code']) && isset($this->argument->options['default_argument_php'])) {
$options['code'] = $this->argument->options['default_argument_php'];
}
@@ -41,11 +51,14 @@ class views_plugin_argument_default_php extends views_plugin_argument_default {
* Only let users with PHP block visibility permissions set/modify this
* default plugin.
*/
- function access() {
+ public function access() {
return user_access('use PHP for settings');
}
- function get_argument() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_argument() {
// set up variables to make it easier to reference during the argument.
$view = &$this->view;
$argument = &$this->argument;
@@ -54,4 +67,5 @@ class views_plugin_argument_default_php extends views_plugin_argument_default {
ob_end_clean();
return $result;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_raw.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_raw.inc
index 385ca91..4d42a89 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_raw.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_default_raw.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the raw value argument default plugin.
+ * Definition of views_plugin_argument_default_raw.
*/
/**
@@ -11,7 +11,11 @@
* @ingroup views_argument_default_plugins
*/
class views_plugin_argument_default_raw extends views_plugin_argument_default {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['index'] = array('default' => '');
$options['use_alias'] = array('default' => FALSE, 'bool' => TRUE);
@@ -19,7 +23,10 @@ class views_plugin_argument_default_raw extends views_plugin_argument_default {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
// Using range(1, 10) will create an array keyed 0-9, which allows arg() to
// properly function since it is also zero-based.
@@ -38,7 +45,10 @@ class views_plugin_argument_default_raw extends views_plugin_argument_default {
);
}
- function get_argument() {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_argument() {
$path = NULL;
if ($this->options['use_alias']) {
$path = drupal_get_path_alias();
@@ -47,4 +57,5 @@ class views_plugin_argument_default_raw extends views_plugin_argument_default {
return $arg;
}
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc
index 07b49ee..19aebc7 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the base argument validator plugin.
+ * Definition of views_plugin_argument_validate.
*/
/**
@@ -19,10 +19,9 @@
class views_plugin_argument_validate extends views_plugin {
/**
- * Initialize this plugin with the view and the argument
- * it is linked to.
+ * Initialize this plugin with the view and the argument it is linked to.
*/
- function init(&$view, &$argument, $options) {
+ public function init(&$view, &$argument, $options) {
$this->view = &$view;
$this->argument = &$argument;
@@ -31,25 +30,29 @@ class views_plugin_argument_validate extends views_plugin {
}
/**
- * Retrieve the options when this is a new access
- * control plugin
+ * Retrieve the options when this is a new access control plugin.
*/
- function option_definition() { return array(); }
+ public function option_definition() {
+ return array();
+ }
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) { }
+ public function options_form(&$form, &$form_state) {
+ }
/**
- * Provide the default form form for validating options
+ * Provide the default form form for validating options.
*/
- function options_validate(&$form, &$form_state) { }
+ public function options_validate(&$form, &$form_state) {
+ }
/**
* Provide the default form form for submitting options
*/
- function options_submit(&$form, &$form_state, &$options = array()) { }
+ public function options_submit(&$form, &$form_state, &$options = array()) {
+ }
/**
* Convert options from the older style.
@@ -59,12 +62,15 @@ class views_plugin_argument_validate extends views_plugin {
* move arguments from the old style to the new style. See
* views_plugin_argument_default_fixed for a good example of this method.
*/
- function convert_options(&$options) { }
+ public function convert_options(&$options) {
+ }
/**
- * Determine if the administrator has the privileges to use this plugin
+ * Determine if the administrator has the privileges to use this plugin.
*/
- function access() { return TRUE; }
+ public function access() {
+ return TRUE;
+ }
/**
* If we don't have access to the form but are showing it anyway, ensure that
@@ -73,7 +79,7 @@ class views_plugin_argument_validate extends views_plugin {
* This is only called by child objects if specified in the options_form(),
* so it will not always be used.
*/
- function check_access(&$form, $option_name) {
+ public function check_access(&$form, $option_name) {
if (!$this->access()) {
$form[$option_name]['#disabled'] = TRUE;
$form[$option_name]['#value'] = $form[$this->option_name]['#default_value'];
@@ -81,17 +87,24 @@ class views_plugin_argument_validate extends views_plugin {
}
}
- function validate_argument($arg) { return TRUE; }
+ /**
+ * {@inheritdoc}
+ */
+ public function validate_argument($arg) {
+ return TRUE;
+ }
/**
* Process the summary arguments for displaying.
*
- * Some plugins alter the argument so it uses something else interal.
+ * Some plugins alter the argument so it uses something else internally.
* For example the user validation set's the argument to the uid,
* for a faster query. But there are use cases where you want to use
* the old value again, for example the summary.
*/
- function process_summary_arguments(&$args) { }
+ public function process_summary_arguments(&$args) {
+ }
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_numeric.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_numeric.inc
index 049531b..bb0abcb 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_numeric.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_numeric.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the numeric argument validator plugin.
+ * Definition of views_plugin_argument_validate_numeric.
*/
/**
@@ -11,7 +11,12 @@
* @ingroup views_argument_validate_plugins
*/
class views_plugin_argument_validate_numeric extends views_plugin_argument_validate {
- function validate_argument($argument) {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate_argument($argument) {
return is_numeric($argument);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_php.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_php.inc
index 83b22b4..1d6a137 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_php.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate_php.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the php code argument validator plugin.
+ * Definition of views_plugin_argument_validate_php.
*/
/**
@@ -11,14 +11,21 @@
* @ingroup views_argument_validate_plugins
*/
class views_plugin_argument_validate_php extends views_plugin_argument_validate {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['code'] = array('default' => '');
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$form['code'] = array(
'#type' => 'textarea',
@@ -34,17 +41,23 @@ class views_plugin_argument_validate_php extends views_plugin_argument_validate
* Only let users with PHP block visibility permissions set/modify this
* validate plugin.
*/
- function access() {
+ public function access() {
return user_access('use PHP for settings');
}
- function convert_options(&$options) {
+ /**
+ * {@inheritdoc}
+ */
+ public function convert_options(&$options) {
if (!isset($options['code']) && isset($this->argument->options['validate_argument_php'])) {
$options['code'] = $this->argument->options['validate_argument_php'];
}
}
- function validate_argument($argument) {
+ /**
+ * {@inheritdoc}
+ */
+ public function validate_argument($argument) {
// set up variables to make it easier to reference during the argument.
$view = &$this->view;
$handler = &$this->argument;
@@ -54,4 +67,5 @@ class views_plugin_argument_validate_php extends views_plugin_argument_validate
ob_end_clean();
return $result;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc
index 81f71bf..6fdc5bb 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc
@@ -17,31 +17,32 @@
* The base plugin to handle caching.
*/
class views_plugin_cache extends views_plugin {
+
/**
* Contains all data that should be written/read from cache.
*/
- var $storage = array();
+ public $storage = array();
/**
* What table to store data in.
*/
- var $table = 'cache_views_data';
+ public $table = 'cache_views_data';
/**
* Initialize the plugin.
*
- * @param $view
+ * @param view $view
* The view object.
- * @param $display
+ * @param object $display
* The display handler.
*/
- function init(&$view, &$display) {
+ public function init(&$view, &$display) {
$this->view = &$view;
$this->display = &$display;
if (is_object($display->handler)) {
$options = $display->handler->get_option('cache');
- // Overlay incoming options on top of defaults
+ // Overlay incoming options on top of defaults.
$this->unpack_options($this->options, $options);
}
}
@@ -50,7 +51,7 @@ class views_plugin_cache extends views_plugin {
* Return a string to display as the clickable title for the
* access control.
*/
- function summary_title() {
+ public function summary_title() {
return t('Unknown');
}
@@ -59,35 +60,37 @@ class views_plugin_cache extends views_plugin {
*
* Plugins must override this to implement expiration.
*
- * @param $type
+ * @param string $type
* The cache type, either 'query', 'result' or 'output'.
*/
- function cache_expire($type) { }
-
- /**
- * Determine expiration time in the cache table of the cache type
- * or CACHE_PERMANENT if item shouldn't be removed automatically from cache.
- *
- * Plugins must override this to implement expiration in the cache table.
- *
- * @param $type
- * The cache type, either 'query', 'result' or 'output'.
- */
- function cache_set_expire($type) {
- return CACHE_PERMANENT;
+ public function cache_expire($type) {
}
+ /**
+ * Determine expiration time in the cache table of the cache type.
+ *
+ * Or CACHE_PERMANENT if item shouldn't be removed automatically from cache.
+ *
+ * Plugins must override this to implement expiration in the cache table.
+ *
+ * @param string $type
+ * The cache type, either 'query', 'result' or 'output'.
+ */
+ public function cache_set_expire($type) {
+ return CACHE_PERMANENT;
+ }
/**
* Save data to the cache.
*
* A plugin should override this to provide specialized caching behavior.
*/
- function cache_set($type) {
+ public function cache_set($type) {
switch ($type) {
case 'query':
// Not supported currently, but this is certainly where we'd put it.
break;
+
case 'results':
$data = array(
'result' => $this->view->result,
@@ -96,6 +99,7 @@ class views_plugin_cache extends views_plugin {
);
cache_set($this->get_results_key(), $data, $this->table, $this->cache_set_expire($type));
break;
+
case 'output':
$this->gather_headers();
$this->storage['output'] = $this->view->display_handler->output;
@@ -104,18 +108,18 @@ class views_plugin_cache extends views_plugin {
}
}
-
/**
* Retrieve data from the cache.
*
* A plugin should override this to provide specialized caching behavior.
*/
- function cache_get($type) {
+ public function cache_get($type) {
$cutoff = $this->cache_expire($type);
switch ($type) {
case 'query':
// Not supported currently, but this is certainly where we'd put it.
return FALSE;
+
case 'results':
// Values to set: $view->result, $view->total_rows, $view->execute_time,
// $view->current_page.
@@ -129,6 +133,7 @@ class views_plugin_cache extends views_plugin {
}
}
return FALSE;
+
case 'output':
if ($cache = cache_get($this->get_output_key(), $this->table)) {
if (!$cutoff || $cache->created > $cutoff) {
@@ -145,18 +150,18 @@ class views_plugin_cache extends views_plugin {
/**
* Clear out cached data for a view.
*
- * We're just going to nuke anything related to the view, regardless of display,
- * to be sure that we catch everything. Maybe that's a bad idea.
+ * We're just going to nuke anything related to the view, regardless of
+ * display, to be sure that we catch everything. Maybe that's a bad idea.
*/
- function cache_flush() {
+ public function cache_flush() {
cache_clear_all($this->view->name . ':', $this->table, TRUE);
}
/**
* Post process any rendered data.
*
- * This can be valuable to be able to cache a view and still have some level of
- * dynamic output. In an ideal world, the actual output will include HTML
+ * This can be valuable to be able to cache a view and still have some level
+ * of dynamic output. In an ideal world, the actual output will include HTML
* comment based tokens, and then the post process can replace those tokens.
*
* Example usage. If it is known that the view is a node view and that the
@@ -172,7 +177,8 @@ class views_plugin_cache extends views_plugin {
* All of the cached result data will be available in $view->result, as well,
* so all ids used in the query should be discoverable.
*/
- function post_render(&$output) { }
+ public function post_render(&$output) {
+ }
/**
* Start caching javascript, css and other out of band info.
@@ -181,7 +187,7 @@ class views_plugin_cache extends views_plugin {
* duplicate it. Later on, when gather_headers() is run, this information
* will be removed so that we don't hold onto it.
*/
- function cache_start() {
+ public function cache_start() {
$this->storage['head'] = drupal_add_html_head();
$this->storage['css'] = drupal_add_css();
$this->storage['js'] = drupal_add_js();
@@ -189,10 +195,10 @@ class views_plugin_cache extends views_plugin {
}
/**
- * Gather out of band data, compare it to what we started with and store the difference.
+ * Gather out of band data, compare it to the start data and store the diff.
*/
- function gather_headers() {
- // Simple replacement for head
+ public function gather_headers() {
+ // Simple replacement for head.
if (isset($this->storage['head'])) {
$this->storage['head'] = str_replace($this->storage['head'], '', drupal_add_html_head());
}
@@ -203,17 +209,17 @@ class views_plugin_cache extends views_plugin {
// Check if the advanced mapping function of D 7.23 is available.
$array_mapping_func = function_exists('drupal_array_diff_assoc_recursive') ? 'drupal_array_diff_assoc_recursive' : 'array_diff_assoc';
- // Slightly less simple for CSS:
+ // Slightly less simple for CSS.
$css = drupal_add_css();
$css_start = isset($this->storage['css']) ? $this->storage['css'] : array();
- $this->storage['css'] = $array_mapping_func($css, $css_start);
+ $this->storage['css'] = $this->assetDiff($css, $css_start, $array_mapping_func);
// Get javascript after/before views renders.
$js = drupal_add_js();
$js_start = isset($this->storage['js']) ? $this->storage['js'] : array();
// If there are any differences between the old and the new javascript then
// store them to be added later.
- $this->storage['js'] = $array_mapping_func($js, $js_start);
+ $this->storage['js'] = $this->assetDiff($js, $js_start, $array_mapping_func);
// Special case the settings key and get the difference of the data.
$settings = isset($js['settings']['data']) ? $js['settings']['data'] : array();
@@ -224,10 +230,42 @@ class views_plugin_cache extends views_plugin {
$this->storage['headers'] = $array_mapping_func(drupal_get_http_header(), $this->storage['headers']);
}
+ /**
+ * Computes the differences between two JS/CSS asset arrays.
+ *
+ * @param array $assets
+ * The current asset array.
+ * @param array $start_assets
+ * The original asset array.
+ * @param string $diff_function
+ * The function that should be used for computing the diff.
+ *
+ * @return array
+ * A CSS or JS asset array that contains all entries that are new/different
+ * in $assets.
+ */
+ protected function assetDiff(array $assets, array $start_assets, $diff_function) {
+ $diff = $diff_function($assets, $start_assets);
+
+ // Cleanup the resulting array since drupal_array_diff_assoc_recursive() can
+ // leave half populated arrays behind.
+ foreach ($diff as $key => $entry) {
+ // If only the weight was different we can remove this entry.
+ if (count($entry) == 1 && isset($entry['weight'])) {
+ unset($diff[$key]);
+ }
+ // If there are other differences we override with the latest entry.
+ elseif ($entry != $assets[$key]) {
+ $diff[$key] = $assets[$key];
+ }
+ }
+ return $diff;
+ }
+
/**
* Restore out of band data saved to cache. Copied from Panels.
*/
- function restore_headers() {
+ public function restore_headers() {
if (!empty($this->storage['head'])) {
drupal_add_html_head($this->storage['head']);
}
@@ -255,17 +293,31 @@ class views_plugin_cache extends views_plugin {
}
}
- function get_results_key() {
+ /**
+ *
+ */
+ public function get_results_key() {
if (!isset($this->_results_key)) {
- $this->_results_key = $this->view->name . ':' . $this->display->id . ':results:' . $this->get_cache_key();
+ $key_data = array();
+ foreach (array('exposed_info', 'page', 'sort', 'order', 'items_per_page', 'offset') as $key) {
+ if (isset($_GET[$key])) {
+ $key_data[$key] = $_GET[$key];
+ }
+ }
+
+ $this->_results_key = $this->view->name . ':' . $this->display->id . ':results:' . $this->get_cache_key($key_data);
}
return $this->_results_key;
}
- function get_output_key() {
+ /**
+ *
+ */
+ public function get_output_key() {
if (!isset($this->_output_key)) {
$key_data = array(
+ 'result' => $this->view->result,
'theme' => $GLOBALS['theme'],
);
$this->_output_key = $this->view->name . ':' . $this->display->id . ':output:' . $this->get_cache_key($key_data);
@@ -283,19 +335,21 @@ class views_plugin_cache extends views_plugin {
*
* @return string
*/
- function get_cache_key($key_data = array()) {
+ public function get_cache_key($key_data = array()) {
global $user;
$key_data += array(
'roles' => array_keys($user->roles),
- 'super-user' => $user->uid == 1, // special caching for super user.
+ 'super-user' => $user->uid == 1,
+ // special caching for super user.
'language' => $GLOBALS['language']->language,
+ 'language_content' => $GLOBALS['language_content']->language,
'base_url' => $GLOBALS['base_url'],
);
if (empty($key_data['build_info'])) {
$build_info = $this->view->build_info;
- foreach (array('query','count_query') as $index) {
+ foreach (array('query', 'count_query') as $index) {
// If the default query back-end is used generate SQL query strings from
// the query objects.
if ($build_info[$index] instanceof SelectQueryInterface) {
@@ -308,9 +362,9 @@ class views_plugin_cache extends views_plugin {
}
}
}
- $key = md5(serialize($key_data));
- return $key;
+ return md5(serialize($key_data));
}
+
}
/**
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_none.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_none.inc
index 9927a9d..ae57404 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_none.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_none.inc
@@ -11,15 +11,32 @@
* @ingroup views_cache_plugins
*/
class views_plugin_cache_none extends views_plugin_cache {
- function cache_start() { /* do nothing */ }
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_start() {
+ // Do nothing.
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
return t('None');
}
- function cache_get($type) {
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_get($type) {
return FALSE;
}
- function cache_set($type) { }
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_set($type) {
+ }
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc
index 25245ea..efd717e 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc
@@ -11,7 +11,11 @@
* @ingroup views_cache_plugins
*/
class views_plugin_cache_time extends views_plugin_cache {
- function option_definition() {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = parent::option_definition();
$options['results_lifespan'] = array('default' => 3600);
$options['results_lifespan_custom'] = array('default' => 0);
@@ -21,7 +25,10 @@ class views_plugin_cache_time extends views_plugin_cache {
return $options;
}
- function options_form(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$options = array(60, 300, 1800, 3600, 21600, 518400);
$options = drupal_map_assoc($options, 'format_interval');
@@ -41,7 +48,7 @@ class views_plugin_cache_time extends views_plugin_cache {
'#maxlength' => '30',
'#description' => t('Length of time in seconds raw query results should be cached.'),
'#default_value' => $this->options['results_lifespan_custom'],
- '#process' => array('form_process_select','ctools_dependent_process'),
+ '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-cache-options-results-lifespan' => array('custom'),
),
@@ -60,34 +67,46 @@ class views_plugin_cache_time extends views_plugin_cache {
'#maxlength' => '30',
'#description' => t('Length of time in seconds rendered HTML output should be cached.'),
'#default_value' => $this->options['output_lifespan_custom'],
- '#process' => array('form_process_select','ctools_dependent_process'),
+ '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-cache-options-output-lifespan' => array('custom'),
),
);
}
- function options_validate(&$form, &$form_state) {
+ /**
+ * {@inheritdoc}
+ */
+ public function options_validate(&$form, &$form_state) {
$custom_fields = array('output_lifespan', 'results_lifespan');
foreach ($custom_fields as $field) {
if ($form_state['values']['cache_options'][$field] == 'custom' && !is_numeric($form_state['values']['cache_options'][$field . '_custom'])) {
- form_error($form[$field .'_custom'], t('Custom time values must be numeric.'));
+ form_error($form[$field . '_custom'], t('Custom time values must be numeric.'));
}
}
}
- function summary_title() {
+ /**
+ * {@inheritdoc}
+ */
+ public function summary_title() {
$results_lifespan = $this->get_lifespan('results');
$output_lifespan = $this->get_lifespan('output');
return format_interval($results_lifespan, 1) . '/' . format_interval($output_lifespan, 1);
}
- function get_lifespan($type) {
+ /**
+ * {@inheritdoc}
+ */
+ public function get_lifespan($type) {
$lifespan = $this->options[$type . '_lifespan'] == 'custom' ? $this->options[$type . '_lifespan_custom'] : $this->options[$type . '_lifespan'];
return $lifespan;
}
- function cache_expire($type) {
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_expire($type) {
$lifespan = $this->get_lifespan($type);
if ($lifespan) {
$cutoff = REQUEST_TIME - $lifespan;
@@ -98,7 +117,10 @@ class views_plugin_cache_time extends views_plugin_cache {
}
}
- function cache_set_expire($type) {
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_set_expire($type) {
$lifespan = $this->get_lifespan($type);
if ($lifespan) {
return time() + $lifespan;
@@ -107,4 +129,28 @@ class views_plugin_cache_time extends views_plugin_cache {
return CACHE_PERMANENT;
}
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_set($type) {
+ $lifespan = $this->get_lifespan($type);
+ if ($lifespan >= 0) {
+ parent::cache_set($type);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function cache_get($type) {
+ $lifespan = $this->get_lifespan($type);
+ if ($lifespan >= 0) {
+ return parent::cache_get($type);
+ }
+ else {
+ return FALSE;
+ }
+ }
+
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc
index db124de..fd8de19 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Contains the base display plugin.
+ * Definition of views_plugin_display.
*/
/**
@@ -23,21 +23,28 @@
* basic mechanisms for different output methods.
*/
class views_plugin_display extends views_plugin {
+
/**
* The top object of a view.
*
* @var view
*/
- var $view = NULL;
+ public $view = NULL;
- var $handlers = array();
+ /**
+ *
+ */
+ public $handlers = array();
/**
* Stores all available display extenders.
*/
- var $extender = array();
+ public $extender = array();
- function init(&$view, &$display, $options = NULL) {
+ /**
+ * {@inheritdoc}
+ */
+ public function init(&$view, &$display, $options = NULL) {
$this->view = &$view;
$this->display = &$display;
@@ -53,7 +60,7 @@ class views_plugin_display extends views_plugin {
$this->extender[$extender] = $plugin;
}
else {
- vpr('Invalid display extender @extender', array('@handler' => $extender));
+ vpr('Invalid display extender @extender', array('@extender' => $extender));
}
}
}
@@ -61,7 +68,7 @@ class views_plugin_display extends views_plugin {
// Track changes that the user should know about.
$changed = FALSE;
- // Make some modifications:
+ // Make some modifications.
if (!isset($options) && isset($display->display_options)) {
$options = $display->display_options;
}
@@ -93,7 +100,7 @@ class views_plugin_display extends views_plugin {
$this->unpack_options($this->options, $options);
}
- // Translate changed settings:
+ // Translate changed settings.
$items_per_page = $this->get_option('items_per_page');
$offset = $this->get_option('offset');
$use_pager = $this->get_option('use_pager');
@@ -106,7 +113,7 @@ class views_plugin_display extends views_plugin {
// for exported Views as it's not stored in the database.
// If you would like to change this code, really take care that you thought
// of every possibility.
- // @TODO: Provide a way to convert the database views as well.
+ // @todo Provide a way to convert the database views as well.
if (((!empty($items_per_page) && $items_per_page != 10) || !empty($offset) || !empty($use_pager))
|| (!empty($view->api_version) && $view->api_version == 2)) {
// Find out the right pager type.
@@ -209,7 +216,8 @@ class views_plugin_display extends views_plugin {
// Convert filter groups.
$filter_groups = $this->get_option('filter_groups');
- // Only convert if it wasn't converted yet, which is the case if there is a 0 group.
+ // Only convert if it wasn't converted yet, which is the case if there is a
+ // 0 group.
if (isset($filter_groups['groups'][0])) {
// Update filter groups.
$filter_groups ['groups'] = views_array_key_plus($filter_groups['groups']);
@@ -253,7 +261,10 @@ class views_plugin_display extends views_plugin {
}
}
- function destroy() {
+ /**
+ * {@inheritdoc}
+ */
+ public function destroy() {
parent::destroy();
foreach ($this->handlers as $type => $handlers) {
@@ -277,13 +288,15 @@ class views_plugin_display extends views_plugin {
* Determine if this display is the 'default' display which contains
* fallback settings
*/
- function is_default_display() { return FALSE; }
+ public function is_default_display() {
+ return FALSE;
+ }
/**
* Determine if this display uses exposed filters, so the view
* will know whether or not to build them.
*/
- function uses_exposed() {
+ public function uses_exposed() {
if (!isset($this->has_exposed)) {
foreach ($this->handlers as $type => $value) {
foreach ($this->view->$type as $id => $handler) {
@@ -314,14 +327,14 @@ class views_plugin_display extends views_plugin {
* returns, exposed filters will not be used nor
* displayed unless uses_exposed() returns TRUE.
*/
- function displays_exposed() {
+ public function displays_exposed() {
return TRUE;
}
/**
* Does the display use AJAX?
*/
- function use_ajax() {
+ public function use_ajax() {
if (!empty($this->definition['use ajax'])) {
return $this->get_option('use_ajax');
}
@@ -331,7 +344,7 @@ class views_plugin_display extends views_plugin {
/**
* Does the display have a pager enabled?
*/
- function use_pager() {
+ public function use_pager() {
$pager = $this->get_plugin('pager');
if ($pager) {
return $pager->use_pager();
@@ -341,7 +354,7 @@ class views_plugin_display extends views_plugin {
/**
* Does the display have a more link enabled?
*/
- function use_more() {
+ public function use_more() {
if (!empty($this->definition['use more'])) {
return $this->get_option('use_more');
}
@@ -351,24 +364,34 @@ class views_plugin_display extends views_plugin {
/**
* Does the display have groupby enabled?
*/
- function use_group_by() {
+ public function use_group_by() {
return $this->get_option('group_by');
}
/**
* Should the enabled display more link be shown when no more items?
*/
- function use_more_always() {
+ public function use_more_always() {
if (!empty($this->definition['use more'])) {
return $this->get_option('use_more_always');
}
return FALSE;
}
+ /**
+ * Should the enabled display more link being opened in an new window?
+ */
+ public function use_more_open_new_window() {
+ if (!empty($this->definition['use more'])) {
+ return $this->get_option('open_new_window');
+ }
+ return FALSE;
+ }
+
/**
* Does the display have custom link text?
*/
- function use_more_text() {
+ public function use_more_text() {
if (!empty($this->definition['use more'])) {
return $this->get_option('use_more_text');
}
@@ -378,7 +401,7 @@ class views_plugin_display extends views_plugin {
/**
* Can this display accept attachments?
*/
- function accept_attachments() {
+ public function accept_attachments() {
if (empty($this->definition['accept attachments'])) {
return FALSE;
}
@@ -395,13 +418,14 @@ class views_plugin_display extends views_plugin {
/**
* Allow displays to attach to other views.
*/
- function attach_to($display_id) { }
+ public function attach_to($display_id) {
+ }
/**
* Static member function to list which sections are defaultable
* and what items each section contains.
*/
- function defaultable_sections($section = NULL) {
+ public function defaultable_sections($section = NULL) {
$sections = array(
'access' => array('access', 'access_options'),
'access_options' => array('access', 'access_options'),
@@ -414,9 +438,29 @@ class views_plugin_display extends views_plugin {
'hide_admin_links' => array('hide_admin_links'),
'group_by' => array('group_by'),
'query' => array('query'),
- 'use_more' => array('use_more', 'use_more_always', 'use_more_text'),
- 'use_more_always' => array('use_more', 'use_more_always', 'use_more_text'),
- 'use_more_text' => array('use_more', 'use_more_always', 'use_more_text'),
+ 'use_more' => array('use_more',
+ 'use_more_always',
+ 'open_new_window',
+ 'use_more_text',
+ ),
+ 'use_more_always' => array(
+ 'use_more',
+ 'use_more_always',
+ 'open_new_window',
+ 'use_more_text',
+ ),
+ 'use_more_text' => array(
+ 'use_more',
+ 'use_more_always',
+ 'open_new_window',
+ 'use_more_text',
+ ),
+ 'open_new_window' => array(
+ 'use_more',
+ 'use_more_always',
+ 'open_new_window',
+ 'use_more_text',
+ ),
'link_display' => array('link_display', 'link_url'),
// Force these to cascade properly.
@@ -463,7 +507,10 @@ class views_plugin_display extends views_plugin {
}
}
- function option_definition() {
+ /**
+ * {@inheritdoc}
+ */
+ public function option_definition() {
$options = array(
'defaults' => array(
'default' => array(
@@ -481,6 +528,7 @@ class views_plugin_display extends views_plugin {
'pager_options' => TRUE,
'use_more' => TRUE,
'use_more_always' => TRUE,
+ 'open_new_window' => FALSE,
'use_more_text' => TRUE,
'exposed_form' => TRUE,
'exposed_form_options' => TRUE,
@@ -540,9 +588,9 @@ class views_plugin_display extends views_plugin {
'default' => FALSE,
'bool' => TRUE,
),
- // This is legacy code:
- // Items_per/offset/use_pager is moved to the pager plugin
- // but the automatic update path needs this items defined, so don't remove it.
+ // This is legacy code.
+ // Items_per/offset/use_pager is moved to the pager plugin but the
+ // automatic update path needs this items defined, so don't remove it.
// @see views_plugin_display::init()
'items_per_page' => array(
'default' => 10,
@@ -584,8 +632,8 @@ class views_plugin_display extends views_plugin {
'default' => 1,
),
- // These types are all plugins that can have individual settings
- // and therefore need special handling.
+ // These types are all plugins that can have individual settings and
+ // therefore need special handling.
'access' => array(
'contains' => array(
'type' => array('default' => 'none', 'export' => 'export_plugin', 'unpack_translatable' => 'unpack_plugin'),
@@ -727,32 +775,36 @@ class views_plugin_display extends views_plugin {
*
* By default, displays do not have a path.
*/
- function has_path() { return FALSE; }
+ public function has_path() {
+ return FALSE;
+ }
/**
* Check to see if the display has some need to link to another display.
*
- * For the most part, displays without a path will use a link display. However,
- * sometimes displays that have a path might also need to link to another display.
- * This is true for feeds.
+ * For the most part, displays without a path will use a link display.
+ * However, sometimes displays that have a path might also need to link to
+ * another display. This is true for feeds.
*/
- function uses_link_display() { return !$this->has_path(); }
+ public function uses_link_display() {
+ return !$this->has_path();
+ }
/**
- * Check to see if the display can put the exposed formin a block.
+ * Check to see if the display can put the exposed form in a block.
*
- * By default, displays that do not have a path cannot disconnect
- * the exposed form and put it in a block, because the form has no
- * place to go and Views really wants the forms to go to a specific
- * page.
+ * By default, displays that do not have a path cannot disconnect the exposed
+ * form and put it in a block, because the form has no place to go and Views
+ * really wants the forms to go to a specific page.
*/
- function uses_exposed_form_in_block() { return $this->has_path(); }
+ public function uses_exposed_form_in_block() {
+ return $this->has_path();
+ }
/**
- * Check to see which display to use when creating links within
- * a view using this display.
+ * Check to see which display to use when creating links.
*/
- function get_link_display() {
+ public function get_link_display() {
$display_id = $this->get_option('link_display');
// If unknown, pick the first one.
if (empty($display_id) || empty($this->view->display[$display_id])) {
@@ -771,10 +823,9 @@ class views_plugin_display extends views_plugin {
/**
* Return the base path to use for this display.
*
- * This can be overridden for displays that do strange things
- * with the path.
+ * This can be overridden for displays that do strange things with the path.
*/
- function get_path() {
+ public function get_path() {
if ($this->has_path()) {
return $this->get_option('path');
}
@@ -789,38 +840,41 @@ class views_plugin_display extends views_plugin {
}
}
- function get_url() {
+ /**
+ *
+ */
+ public function get_url() {
return $this->view->get_url();
}
/**
- * Check to see if the display needs a breadcrumb
+ * Check to see if the display needs a breadcrumb.
*
- * By default, displays do not need breadcrumbs
+ * By default, displays do not need breadcrumbs.
*/
- function uses_breadcrumb() { return FALSE; }
+ public function uses_breadcrumb() {
+ return FALSE;
+ }
/**
- * Determine if a given option is set to use the default display or the
- * current display
+ * Determine if a given option is set to use the default or current display.
*
* @return
- * TRUE for the default display
+ * TRUE for the default display.
*/
- function is_defaulted($option) {
+ public function is_defaulted($option) {
return !$this->is_default_display() && !empty($this->default_display) && !empty($this->options['defaults'][$option]);
}
/**
- * Intelligently get an option either from this display or from the
- * default display, if directed to do so.
+ * Intelligently get an option either from this or default display.
*/
- function get_option($option) {
+ public function get_option($option) {
if ($this->is_defaulted($option)) {
return $this->default_display->get_option($option);
}
- if (array_key_exists($option, $this->options)) {
+ if (isset($this->options[$option]) || array_key_exists($option, $this->options)) {
return $this->options[$option];
}
}
@@ -828,7 +882,7 @@ class views_plugin_display extends views_plugin {
/**
* Determine if the display's style uses fields.
*/
- function uses_fields() {
+ public function uses_fields() {
$plugin = $this->get_plugin();
if ($plugin) {
return $plugin->uses_fields();
@@ -845,7 +899,7 @@ class views_plugin_display extends views_plugin {
*
* @return views_plugin|FALSE
*/
- function get_plugin($type = 'style', $name = NULL) {
+ public function get_plugin($type = 'style', $name = NULL) {
static $cache = array();
if (!isset($cache[$type][$name])) {
switch ($type) {
@@ -856,8 +910,8 @@ class views_plugin_display extends views_plugin {
if (!$name) {
$name = $this->get_option($option_name);
}
-
break;
+
case 'query':
$views_data = views_fetch_data($this->view->base_table);
$name = !empty($views_data['table']['base']['query class']) ? $views_data['table']['base']['query class'] : 'views_query';
@@ -868,8 +922,8 @@ class views_plugin_display extends views_plugin {
$name = $options['type'];
}
- // access & cache store their options as siblings with the
- // type; all others use an 'options' array.
+ // Access & cache store their options as siblings with the type; all
+ // others use an 'options' array.
if ($type != 'access' && $type != 'cache') {
$options = $options['options'];
}
@@ -901,7 +955,7 @@ class views_plugin_display extends views_plugin {
/**
* Get the handler object for a single handler.
*/
- function &get_handler($type, $id) {
+ public function &get_handler($type, $id) {
if (!isset($this->handlers[$type])) {
$this->get_handlers($type);
}
@@ -918,7 +972,7 @@ class views_plugin_display extends views_plugin {
/**
* Get a full array of handlers for $type. This caches them.
*/
- function &get_handlers($type) {
+ public function &get_handlers($type) {
if (!isset($this->handlers[$type])) {
$this->handlers[$type] = array();
$types = views_object_types();
@@ -977,17 +1031,15 @@ class views_plugin_display extends views_plugin {
}
/**
- * Retrieve a list of fields for the current display with the
- * relationship associated if it exists.
+ * List of fields for the current display with the associated relationship.
*
- * @param $groupable_only
+ * @param $groupable_only
* Return only an array of field labels from handler that return TRUE
* from use_string_group_by method.
*/
- function get_field_labels() {
- // Use func_get_arg so the function signature isn't amended
- // but we can still pass TRUE into the function to filter
- // by groupable handlers.
+ public function get_field_labels() {
+ // Use func_get_arg so the function signature isn't amended but we can
+ // still pass TRUE into the function to filter by groupable handlers.
$args = func_get_args();
$groupable_only = isset($args[0]) ? $args[0] : FALSE;
@@ -1023,7 +1075,7 @@ class views_plugin_display extends views_plugin {
* Intelligently set an option either from this display or from the
* default display, if directed to do so.
*/
- function set_option($option, $value) {
+ public function set_option($option, $value) {
if ($this->is_defaulted($option)) {
return $this->default_display->set_option($option, $value);
}
@@ -1038,7 +1090,7 @@ class views_plugin_display extends views_plugin {
/**
* Set an option and force it to be an override.
*/
- function override_option($option, $value) {
+ public function override_option($option, $value) {
$this->set_override($option, FALSE);
$this->set_option($option, $value);
}
@@ -1047,7 +1099,7 @@ class views_plugin_display extends views_plugin {
* Because forms may be split up into sections, this provides
* an easy URL to exactly the right section. Don't override this.
*/
- function option_link($text, $section, $class = '', $title = '') {
+ public function option_link($text, $section, $class = '', $title = '') {
views_add_js('ajax');
if (!empty($class)) {
$text = '' . $text . '';
@@ -1061,6 +1113,11 @@ class views_plugin_display extends views_plugin {
$title = $text;
}
+ // Truncate the path as it is displayed as a link.
+ if ($section == 'path') {
+ $text = views_ui_truncate($text, 24);
+ }
+
return l($text, 'admin/structure/views/nojs/display/' . $this->view->name . '/' . $this->display->id . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display->id . '-' . $section)), 'html' => TRUE));
}
@@ -1070,7 +1127,7 @@ class views_plugin_display extends views_plugin {
* This function is similar to views_handler_field::get_render_tokens()
* but without fields tokens.
*/
- function get_arguments_tokens() {
+ public function get_arguments_tokens() {
$tokens = array();
if (!empty($this->view->build_info['substitutions'])) {
$tokens = $this->view->build_info['substitutions'];
@@ -1096,7 +1153,7 @@ class views_plugin_display extends views_plugin {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function options_summary(&$categories, &$options) {
$categories = array(
'title' => array(
'title' => t('Title'),
@@ -1150,7 +1207,7 @@ class views_plugin_display extends views_plugin {
);
}
- $display_comment = check_plain(drupal_substr($this->get_option('display_comment'), 0, 10));
+ $display_comment = check_plain(views_ui_truncate($this->get_option('display_comment'), 80));
$options['display_comment'] = array(
'category' => 'other',
'title' => t('Comment'),
@@ -1185,7 +1242,8 @@ class views_plugin_display extends views_plugin {
'desc' => t('Change the way content is formatted.'),
);
- // This adds a 'Settings' link to the style_options setting if the style has options.
+ // This adds a 'Settings' link to the style_options setting if the style
+ // has options.
if (!empty($style_plugin['uses options'])) {
$options['style_plugin']['links']['style_options'] = t('Change settings for this format');
}
@@ -1203,7 +1261,8 @@ class views_plugin_display extends views_plugin {
'setting' => $row_summary,
'desc' => t('Change the way each row in the view is styled.'),
);
- // This adds a 'Settings' link to the row_options setting if the row style has options.
+ // This adds a 'Settings' link to the row_options setting if the row
+ // style has options.
if (!empty($row_plugin['uses options'])) {
$options['row_plugin']['links']['row_options'] = t('Change settings for this style');
}
@@ -1235,7 +1294,7 @@ class views_plugin_display extends views_plugin {
$pager_plugin = $this->get_plugin('pager');
if (!$pager_plugin) {
- // default to the no pager plugin.
+ // Default to the no pager plugin.
$pager_plugin = views_get_plugin('pager', 'none');
}
@@ -1249,7 +1308,7 @@ class views_plugin_display extends views_plugin {
'desc' => t("Change this display's pager setting."),
);
- // If pagers aren't allowed, change the text of the item:
+ // If pagers aren't allowed, change the text of the item.
if (empty($this->definition['use pager'])) {
$options['pager']['title'] = t('Items to display');
}
@@ -1367,7 +1426,7 @@ class views_plugin_display extends views_plugin {
$exposed_form_plugin = $this->get_plugin('exposed_form');
if (!$exposed_form_plugin) {
- // default to the no cache control plugin.
+ // Default to the no cache control plugin.
$exposed_form_plugin = views_get_plugin('exposed_form', 'basic');
}
@@ -1412,14 +1471,14 @@ class views_plugin_display extends views_plugin {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
if ($this->defaultable_sections($form_state['section'])) {
views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
}
$form['#title'] = check_plain($this->display->display_title) . ': ';
- // Set the 'section' to hilite on the form.
+ // Set the 'section' to highlight on the form.
// If it's the item we're looking at is pulling from the default display,
// reflect that. Don't use is_defaulted since we want it to show up even
// on the default display.
@@ -1441,6 +1500,7 @@ class views_plugin_display extends views_plugin {
'#size' => 64,
);
break;
+
case 'display_title':
$form['#title'] .= t('The name and the description of this display');
$form['display_title'] = array(
@@ -1456,6 +1516,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $this->get_option('display_description'),
);
break;
+
case 'display_comment':
$form['#title'] .= t("This display's comments");
$form['display_comment'] = array(
@@ -1464,14 +1525,16 @@ class views_plugin_display extends views_plugin {
'#default_value' => $this->get_option('display_comment'),
);
break;
+
case 'title':
$form['#title'] .= t('The title of this view');
$form['title'] = array(
'#type' => 'textfield',
- '#description' => t('This title will be displayed with the view, wherever titles are normally displayed; i.e, as the page title, block title, etc.'),
+ '#description' => t('This title will be displayed with the view, wherever titles are normally displayed; i.e, as the page title, block title, etc. Use <none> to not assign a title; this can allow other modules to control the page title.'),
'#default_value' => $this->get_option('title'),
);
break;
+
case 'css_class':
$form['#title'] .= t('CSS class');
$form['css_class'] = array(
@@ -1480,6 +1543,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $this->get_option('css_class'),
);
break;
+
case 'use_ajax':
$form['#title'] .= t('Use AJAX when available to load this view');
$form['description'] = array(
@@ -1491,6 +1555,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $this->get_option('use_ajax') ? 1 : 0,
);
break;
+
case 'hide_attachment_summary':
$form['#title'] .= t('Hide attachments when displaying a contextual filter summary');
$form['hide_attachment_summary'] = array(
@@ -1499,6 +1564,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $this->get_option('hide_attachment_summary') ? 1 : 0,
);
break;
+
case 'hide_admin_links':
$form['#title'] .= t('Hide contextual links on this view.');
$form['hide_admin_links'] = array(
@@ -1506,7 +1572,8 @@ class views_plugin_display extends views_plugin {
'#options' => array(1 => t('Yes'), 0 => t('No')),
'#default_value' => $this->get_option('hide_admin_links') ? 1 : 0,
);
- break;
+ break;
+
case 'use_more':
$form['#title'] .= t('Add a more link to the bottom of the display.');
$form['use_more'] = array(
@@ -1524,6 +1591,15 @@ class views_plugin_display extends views_plugin {
'edit-use-more' => array(TRUE),
),
);
+ $form['open_new_window'] = array(
+ '#type' => 'checkbox',
+ '#title' => t("Open 'more' link in new window (target='blank')"),
+ '#description' => t("Leave this unchecked to open the more link in the same window."),
+ '#default_value' => $this->get_option('open_new_window'),
+ '#dependency' => array(
+ 'edit-use-more' => array(TRUE),
+ ),
+ );
$form['use_more_text'] = array(
'#type' => 'textfield',
'#title' => t('More link text'),
@@ -1534,6 +1610,7 @@ class views_plugin_display extends views_plugin {
),
);
break;
+
case 'group_by':
$form['#title'] .= t('Allow grouping and aggregation (calculation) of fields.');
$form['group_by'] = array(
@@ -1543,6 +1620,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $this->get_option('group_by'),
);
break;
+
case 'access':
$form['#title'] .= t('Access restrictions');
$form['access'] = array(
@@ -1550,14 +1628,12 @@ class views_plugin_display extends views_plugin {
'#suffix' => '',
'#tree' => TRUE,
);
-
$access = $this->get_option('access');
$form['access']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('access', NULL, array($this->view->base_table)),
'#default_value' => $access['type'],
);
-
$access_plugin = views_fetch_plugin_data('access', $access['type']);
if (!empty($access_plugin['uses options'])) {
$form['markup'] = array(
@@ -1566,16 +1642,19 @@ class views_plugin_display extends views_plugin {
'#suffix' => 'The following tokens are available for this link.
'); @@ -1813,6 +1898,7 @@ class views_plugin_display extends views_plugin { '#dependency' => array('radio:link_display' => array('custom_url')), ); break; + case 'analyze-theme': $form['#title'] .= t('Theming information'); $form['#help_topic'] = 'analyze-theme'; @@ -1843,7 +1929,7 @@ class views_plugin_display extends views_plugin { // The base themes should be initialized in the right order. $base_theme = array_reverse($base_theme); - // This code is copied directly from _drupal_theme_initialize() + // This code is copied directly from _drupal_theme_initialize(). $theme_engine = NULL; // Initialize the theme. @@ -1875,8 +1961,8 @@ class views_plugin_display extends views_plugin { $this->theme_registry = _theme_load_registry($theme, $base_theme, $theme_engine); } - // If there's a theme engine involved, we also need to know its extension - // so we can give the proper filename. + // If there's a theme engine involved, we also need to know its + // extension so we can give the proper filename. $this->theme_extension = '.tpl.php'; if (isset($theme_engine)) { $extension_function = $theme_engine . '_extension'; @@ -1983,6 +2069,7 @@ class views_plugin_display extends views_plugin { $form_state['ok_button'] = TRUE; break; + case 'analyze-theme-display': $form['#title'] .= t('Theming information (display)'); $output = '' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '
'; @@ -2008,6 +2095,7 @@ class views_plugin_display extends views_plugin { $form_state['ok_button'] = TRUE; break; + case 'analyze-theme-style': $form['#title'] .= t('Theming information (style)'); $output = '' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '
'; @@ -2035,6 +2123,7 @@ class views_plugin_display extends views_plugin { $form_state['ok_button'] = TRUE; break; + case 'analyze-theme-row': $form['#title'] .= t('Theming information (row style)'); $output = '' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '
'; @@ -2062,6 +2151,7 @@ class views_plugin_display extends views_plugin { $form_state['ok_button'] = TRUE; break; + case 'analyze-theme-field': $form['#title'] .= t('Theming information (row style)'); $output = '' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '
'; @@ -2089,6 +2179,7 @@ class views_plugin_display extends views_plugin { '#default_value' => $this->get_option('exposed_block') ? 1 : 0, ); break; + case 'exposed_form': $form['#title'] .= t('Exposed Form'); $form['exposed_form'] = array( @@ -2113,11 +2204,17 @@ class views_plugin_display extends views_plugin { ); } break; + case 'exposed_form_options': $plugin = $this->get_plugin('exposed_form'); $form['#title'] .= t('Exposed form options'); if ($plugin) { - $form['#help_topic'] = $plugin->definition['help topic']; + if (!empty($plugin->definition['help topic'])) { + $form['#help_topic'] = $plugin->definition['help topic']; + } + if (!empty($plugin->definition['module'])) { + $form['#help_module'] = $plugin->definition['module']; + } $form['exposed_form_options'] = array( '#tree' => TRUE, @@ -2125,6 +2222,7 @@ class views_plugin_display extends views_plugin { $plugin->options_form($form['exposed_form_options'], $form_state); } break; + case 'pager': $form['#title'] .= t('Select which pager, if any, to use for this view'); $form['pager'] = array( @@ -2140,7 +2238,7 @@ class views_plugin_display extends views_plugin { '#default_value' => $pager['type'], ); - $pager_plugin = views_fetch_plugin_data('pager', $pager['type'], array($this->view->base_table)); + $pager_plugin = views_fetch_plugin_data('pager', $pager['type']); if (!empty($pager_plugin['uses options'])) { $form['markup'] = array( '#prefix' => '' . check_plain($this->view->render()) . ''; } @@ -53,11 +74,14 @@ class views_plugin_display_feed extends views_plugin_display_page { * Instead of going through the standard views_view.tpl.php, delegate this * to the style handler. */ - function render() { + public function render() { return $this->view->style_plugin->render($this->view->result); } - function defaultable_sections($section = NULL) { + /** + * {@inheritdoc} + */ + public function defaultable_sections($section = NULL) { if (in_array($section, array('style_options', 'style_plugin', 'row_options', 'row_plugin',))) { return FALSE; } @@ -74,12 +98,15 @@ class views_plugin_display_feed extends views_plugin_display_page { return $sections; } - function option_definition() { + /** + * {@inheritdoc} + */ + public function option_definition() { $options = parent::option_definition(); $options['displays'] = array('default' => array()); - // Overrides for standard stuff: + // Overrides for standard stuff. $options['style_plugin']['default'] = 'rss'; $options['style_options']['default'] = array('description' => ''); $options['sitename_title']['default'] = FALSE; @@ -92,8 +119,11 @@ class views_plugin_display_feed extends views_plugin_display_page { return $options; } - function options_summary(&$categories, &$options) { - // It is very important to call the parent function here: + /** + * {@inheritdoc} + */ + public function options_summary(&$categories, &$options) { + // It is very important to call the parent function here. parent::options_summary($categories, $options); // Since we're childing off the 'page' type, we'll still *call* our @@ -138,7 +168,7 @@ class views_plugin_display_feed extends views_plugin_display_page { /** * 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); @@ -155,6 +185,7 @@ class views_plugin_display_feed extends views_plugin_display_page { $form['title'] = $title; $form['title']['#dependency'] = array('edit-sitename-title' => array(FALSE)); break; + case 'displays': $form['#title'] .= t('Attach to'); $displays = array(); @@ -170,8 +201,10 @@ class views_plugin_display_feed extends views_plugin_display_page { '#default_value' => $this->get_option('displays'), ); break; + case 'path': $form['path']['#description'] = t('This view will be displayed by visiting this path on your site. It is recommended that the path be something like "path/%/%/feed" or "path/%/%/rss.xml", putting one % in the path for each contextual filter you have defined in the view.'); + break; } } @@ -179,13 +212,14 @@ class views_plugin_display_feed extends views_plugin_display_page { * 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) { - // It is very important to call the parent function here: + 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']) { case 'title': $this->set_option('sitename_title', $form_state['values']['sitename_title']); break; + case 'displays': $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]); break; @@ -195,7 +229,7 @@ class views_plugin_display_feed extends views_plugin_display_page { /** * Attach to another view. */ - function attach_to($display_id) { + public function attach_to($display_id) { $displays = $this->get_option('displays'); if (empty($displays[$display_id])) { return; @@ -216,7 +250,11 @@ class views_plugin_display_feed extends views_plugin_display_page { } } - function uses_link_display() { + /** + * {@inheritdoc} + */ + public function uses_link_display() { return TRUE; } + } diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc index 4bcec0b..e2cc017 100644 --- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc +++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc @@ -2,7 +2,7 @@ /** * @file - * Contains the page display plugin. + * Definition of views_plugin_display_page. */ /** @@ -11,13 +11,25 @@ * @ingroup views_display_plugins */ class views_plugin_display_page extends views_plugin_display { + /** * The page display has a path. */ - function has_path() { return TRUE; } - function uses_breadcrumb() { return TRUE; } + public function has_path() { + return TRUE; + } - function option_definition() { + /** + * {@inheritdoc} + */ + public function uses_breadcrumb() { + return TRUE; + } + + /** + * {@inheritdoc} + */ + public function option_definition() { $options = parent::option_definition(); $options['path'] = array('default' => ''); @@ -50,7 +62,7 @@ class views_plugin_display_page extends views_plugin_display { /** * Add this display's path information to Drupal's menu system. */ - function execute_hook_menu($callbacks) { + public function execute_hook_menu($callbacks) { $items = array(); // Replace % with the link to our standard views argument loader // views_arg_load -- which lives in views.module @@ -79,7 +91,8 @@ class views_plugin_display_page extends views_plugin_display { $access_plugin = views_get_plugin('access', 'none'); } - // Get access callback might return an array of the callback + the dynamic arguments. + // Get access callback might return an array of the callback + the dynamic + // arguments. $access_plugin_callback = $access_plugin->get_access_callback(); if (is_array($access_plugin_callback)) { @@ -118,6 +131,8 @@ class views_plugin_display_page extends views_plugin_display { 'access arguments' => $access_arguments, // Identify URL embedded arguments and correlate them to a handler 'load arguments' => array($this->view->name, $this->display->id, '%index'), + // Make sure the menu router knows where views_page is. + 'module' => 'views', ); $menu = $this->get_option('menu'); if (empty($menu)) { @@ -138,14 +153,17 @@ class views_plugin_display_page extends views_plugin_display { default: $items[$path]['type'] = MENU_CALLBACK; break; + case 'normal': $items[$path]['type'] = MENU_NORMAL_ITEM; // Insert item into the proper menu $items[$path]['menu_name'] = $menu['name']; break; + case 'tab': $items[$path]['type'] = MENU_LOCAL_TASK; break; + case 'default tab': $items[$path]['type'] = MENU_DEFAULT_LOCAL_TASK; break; @@ -167,7 +185,7 @@ class views_plugin_display_page extends views_plugin_display { $bit = array_pop($bits); // we can't do this if they tried to make the last path bit variable. - // @todo: We can validate this. + // @todo We can validate this. if ($bit != '%views_arg' && !empty($bits)) { $default_path = implode('/', $bits); $items[$default_path] = array( @@ -182,12 +200,15 @@ class views_plugin_display_page extends views_plugin_display { 'title' => $tab_options['title'], 'description' => $tab_options['description'], 'menu_name' => $tab_options['name'], + // Make sure the menu router knows where views_page is. + 'module' => 'views', ); switch ($tab_options['type']) { default: case 'normal': $items[$default_path]['type'] = MENU_NORMAL_ITEM; break; + case 'tab': $items[$default_path]['type'] = MENU_LOCAL_TASK; break; @@ -208,7 +229,7 @@ class views_plugin_display_page extends views_plugin_display { * a drupal_set_title for the page, and does a views_set_page_view * on the view. */ - function execute() { + public function execute() { // Let the world know that this is the page view we're using. views_set_page_view($this->view); @@ -231,7 +252,13 @@ class views_plugin_display_page extends views_plugin_display { // First execute the view so it's possible to get tokens for the title. // And the title, which is much easier. - drupal_set_title(filter_xss_admin($this->view->get_title()), PASS_THROUGH); + $title = $this->view->get_title(); + // Support the core method of using '
Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: ". print_r($expected_result, TRUE));
+ $this->verbose('Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: " . print_r($expected_result, TRUE));
// Do the actual comparison.
return $this->$assert_method($result, $expected_result, $message);
}
/**
- * Helper function: order an array of array based on a column.
+ * Order an array of array based on a column.
*/
protected function orderResultSet($result_set, $column, $reverse = FALSE) {
$this->sort_column = $column;
@@ -87,9 +103,6 @@ abstract class ViewsTestCase extends DrupalWebTestCase {
return $result_set;
}
- protected $sort_column = NULL;
- protected $sort_order = 1;
-
/**
* Helper comparison function for orderResultSet().
*/
@@ -97,20 +110,20 @@ abstract class ViewsTestCase extends DrupalWebTestCase {
$value1 = $a[$this->sort_column];
$value2 = $b[$this->sort_column];
if ($value1 == $value2) {
- return 0;
+ return 0;
}
return $this->sort_order * (($value1 < $value2) ? -1 : 1);
}
/**
- * Helper function to check whether a button with a certain id exists and has a certain label.
+ * Check whether a button with a certain id exists and has a certain label.
*/
protected function helperButtonHasLabel($id, $expected_label, $message = 'Label has the expected value: %label.') {
return $this->assertFieldById($id, $expected_label, t($message, array('%label' => $expected_label)));
}
/**
- * Helper function to execute a view with debugging.
+ * Execute a view with debugging.
*
* @param view $view
* @param array $args
@@ -121,18 +134,42 @@ abstract class ViewsTestCase extends DrupalWebTestCase {
$view->execute();
$this->verbose('Executed view: ' . ((string) $view->build_info['query']) . '
');
}
+
+ /**
+ * Log in as user 1.
+ */
+ protected function loginUser1() {
+ $password = user_password();
+ // Reset the user 1 password.
+ $account = user_load(1);
+ $edit = array(
+ 'pass' => $password,
+ );
+ $account = user_save($account, $edit);
+ $account->pass_raw = $password;
+
+ // Log in as user 1.
+ $this->drupalLogin($account);
+ }
+
}
+/**
+ *
+ */
abstract class ViewsSqlTest extends ViewsTestCase {
+ /**
+ * {@inheritdoc}
+ */
protected function setUp() {
parent::setUp('views', 'views_ui');
- // Define the schema and views data variable before enabling the test module.
+ // Define the schema and views data variable before enabling the test
+ // module.
variable_set('views_test_schema', $this->schemaDefinition());
variable_set('views_test_views_data', $this->viewsData());
variable_set('views_test_views_plugins', $this->viewsPlugins());
-
module_enable(array('views_test'));
$this->resetAll();
@@ -148,14 +185,32 @@ abstract class ViewsSqlTest extends ViewsTestCase {
}
/**
- * This function allows to enable views ui from a higher class which can't change the setup function anymore.
+ * Create a term.
*
- * @TODO
- * Convert existing setUp functions.
+ * @param int $vid
+ * The vocabulary ID that the term is to be added to.
+ *
+ * @return object
+ * A full term object with a random name.
+ */
+ protected function drupalCreateTerm($vid) {
+ $term = new stdClass();
+ $term->name = $this->randomName();
+ $term->description = $this->randomName();
+ $term->vid = $vid;
+ taxonomy_term_save($term);
+ return $term;
+ }
+
+ /**
+ * This function allows to enable views ui from a higher class which can't
+ * change the setup function anymore.
+ *
+ * @todo Convert existing setUp functions.
*/
function enableViewsUi() {
module_enable(array('views_ui'));
- // @TODO Figure out why it's required to clear the cache here.
+ // @todo Figure out why it's required to clear the cache here.
views_module_include('views_default', TRUE);
views_get_all_views(TRUE);
menu_rebuild();
@@ -203,7 +258,7 @@ abstract class ViewsSqlTest extends ViewsTestCase {
),
'primary key' => array('id'),
'unique keys' => array(
- 'name' => array('name')
+ 'name' => array('name'),
),
'indexes' => array(
'ages' => array('age'),
@@ -315,6 +370,9 @@ abstract class ViewsSqlTest extends ViewsTestCase {
return $data;
}
+ /**
+ *
+ */
protected function viewsPlugins() {
return array();
}
@@ -423,11 +481,12 @@ abstract class ViewsSqlTest extends ViewsTestCase {
views_include('view');
$view = $this->getBasicView();
- // In order to test exposed filters, we have to disable
- // the exposed forms cache.
+ // In order to test exposed filters, we have to disable the exposed forms
+ // cache.
drupal_static_reset('views_exposed_form_cache');
$display = $view->new_display('page', 'Page', 'page_1');
return $view;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/tests/views_test.info b/sites/all/modules/contrib/views/views/tests/views_test.info
index b090daa..5095b7f 100644
--- a/sites/all/modules/contrib/views/views/tests/views_test.info
+++ b/sites/all/modules/contrib/views/views/tests/views_test.info
@@ -5,9 +5,8 @@ core = 7.x
dependencies[] = views
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2019-04-03
+version = "7.x-3.22"
core = "7.x"
project = "views"
-datestamp = "1423648085"
-
+datestamp = "1554307093"
diff --git a/sites/all/modules/contrib/views/views/tests/views_test.module b/sites/all/modules/contrib/views/views/tests/views_test.module
index a746069..caa87b9 100644
--- a/sites/all/modules/contrib/views/views/tests/views_test.module
+++ b/sites/all/modules/contrib/views/views/tests/views_test.module
@@ -23,7 +23,7 @@ function views_test_permission() {
function views_test_views_api() {
return array(
'api' => 3.0,
- 'template path' => drupal_get_path('module', 'views_test') . '/templates',
+ 'template path' => drupal_get_path('module', 'views') . '/test_templates',
);
}
@@ -35,7 +35,7 @@ function views_test_views_data() {
$count = variable_get('views_test_views_data_count', 0);
$count++;
variable_set('views_test_views_data_count', $count);
- return variable_get('views_test_views_data', array());
+ return variable_get('views_test_views_data', array());
}
/**
diff --git a/sites/all/modules/contrib/views/views/tests/views_test.views_default.inc b/sites/all/modules/contrib/views/views/tests/views_test.views_default.inc
index 0448705..a494a4e 100644
--- a/sites/all/modules/contrib/views/views/tests/views_test.views_default.inc
+++ b/sites/all/modules/contrib/views/views/tests/views_test.views_default.inc
@@ -9,7 +9,7 @@
* Implements hook_views_default_views().
*/
function views_test_views_default_views() {
- $view = new view;
+ $view = new view();
$view->name = 'test_views_groupby_save';
$view->description = '';
$view->tag = '';
@@ -31,7 +31,7 @@ function views_test_views_default_views() {
$views[$view->name] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'test_rename_reset_button';
$view->description = '';
$view->tag = '';
@@ -70,7 +70,7 @@ function views_test_views_default_views() {
$views[$view->name] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'test_exposed_admin_ui';
$view->description = '';
$view->tag = '';
@@ -110,7 +110,7 @@ function views_test_views_default_views() {
$views[$view->name] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'test_filter_in_operator_ui';
$view->description = '';
$view->tag = '';
@@ -142,7 +142,7 @@ function views_test_views_default_views() {
$views[$view->name] = $view;
- $view = new view;
+ $view = new view();
$view->name = 'test_argument_default_current_user';
$view->description = '';
$view->tag = '';
@@ -218,5 +218,113 @@ function views_test_views_default_views() {
$views[$view->name] = $view;
+ $view = new view();
+ $view->name = 'test_exposed_remember';
+ $view->description = '';
+ $view->tag = '';
+ $view->base_table = 'node';
+ $view->human_name = 'test_exposed_remember';
+ $view->core = 0;
+ $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['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'none';
+ $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['exposed_form']['options']['reset_button'] = TRUE;
+ $handler->display->display_options['pager']['type'] = 'none';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+ /* 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';
+ /* Filter criterion: Content: Type */
+ $handler->display->display_options['filters']['type']['id'] = 'type';
+ $handler->display->display_options['filters']['type']['table'] = 'node';
+ $handler->display->display_options['filters']['type']['field'] = 'type';
+ $handler->display->display_options['filters']['type']['exposed'] = TRUE;
+ $handler->display->display_options['filters']['type']['expose']['operator_id'] = 'type_op';
+ $handler->display->display_options['filters']['type']['expose']['label'] = 'Type';
+ $handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op';
+ $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type';
+ $handler->display->display_options['filters']['type']['expose']['remember'] = TRUE;
+ $handler->display->display_options['filters']['type']['expose']['remember_roles'] = array(
+ 2 => '2',
+ );
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page_1');
+ $handler->display->display_options['path'] = 'test_exposed_remember';
+ $translatables['test_exposed_remember'] = array(
+ t('Master'),
+ t('more'),
+ t('Apply'),
+ t('Reset'),
+ t('Sort by'),
+ t('Asc'),
+ t('Desc'),
+ t('Type'),
+ t('Page'),
+ );
+
+ $views[$view->name] = $view;
+
+ $view = new view();
+ $view->name = 'test_ajax_view';
+ $view->description = '';
+ $view->tag = '';
+ $view->base_table = 'node';
+ $view->human_name = '';
+ $view->core = 0;
+ $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['use_ajax'] = TRUE;
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'none';
+ $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'] = 'none';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page_1');
+ $handler->display->display_options['path'] = 'test_ajax_view';
+
+ $views[$view->name] = $view;
+
+ $view = new view();
+ $view->name = 'test_noajax_view';
+ $view->description = '';
+ $view->tag = '';
+ $view->base_table = 'node';
+ $view->human_name = '';
+ $view->core = 0;
+ $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['use_ajax'] = FALSE;
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'none';
+ $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'] = 'none';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+
+ $views[$view->name] = $view;
+
return $views;
}
diff --git a/sites/all/modules/contrib/views/views/tests/views_translatable.test b/sites/all/modules/contrib/views/views/tests/views_translatable.test
index 983a97e..9c3422c 100644
--- a/sites/all/modules/contrib/views/views/tests/views_translatable.test
+++ b/sites/all/modules/contrib/views/views/tests/views_translatable.test
@@ -31,7 +31,7 @@ class ViewsTranslatableTest extends ViewsSqlTest {
'help' => t('This is a test description.'),
'handler' => 'views_plugin_localization_test',
'parent' => 'parent',
- 'path' => drupal_get_path('module', 'views') .'/tests',
+ 'path' => drupal_get_path('module', 'views') . '/tests',
),
),
);
@@ -100,7 +100,6 @@ class ViewsTranslatableTest extends ViewsSqlTest {
$view->init_display();
// Don't run translation. We just want to get the right keys.
-
foreach ($view->display as $display_id => $display) {
$translatables = array();
$display->handler->unpack_translatables($translatables);
@@ -145,7 +144,7 @@ class ViewsTranslatableTest extends ViewsSqlTest {
}
public function view_unpack_translatable() {
- $view = new view;
+ $view = new view();
$view->name = 'view_unpack_translatable';
$view->description = '';
$view->tag = '';
@@ -218,4 +217,5 @@ class ViewsTranslatableTest extends ViewsSqlTest {
return $view;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/tests/views_ui.test b/sites/all/modules/contrib/views/views/tests/views_ui.test
index 8785539..8a7e0e1 100644
--- a/sites/all/modules/contrib/views/views/tests/views_ui.test
+++ b/sites/all/modules/contrib/views/views/tests/views_ui.test
@@ -9,6 +9,10 @@
* Views UI wizard tests.
*/
class ViewsUIWizardHelper extends DrupalWebTestCase {
+
+ /**
+ *
+ */
function setUp() {
// Enable views_ui.
parent::setUp('views_ui');
@@ -17,12 +21,17 @@ class ViewsUIWizardHelper extends DrupalWebTestCase {
$views_admin = $this->drupalCreateUser(array('administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view revisions'));
$this->drupalLogin($views_admin);
}
+
}
/**
* Tests creating views with the wizard and viewing them on the listing page.
*/
class ViewsUIWizardBasicTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI wizard basic functionality',
@@ -31,6 +40,9 @@ class ViewsUIWizardBasicTestCase extends ViewsUIWizardHelper {
);
}
+ /**
+ *
+ */
function testViewsWizardAndListing() {
// Check if we can access the main views admin page.
$this->drupalGet('admin/structure/views');
@@ -46,7 +58,7 @@ class ViewsUIWizardBasicTestCase extends ViewsUIWizardHelper {
$this->assertText(t('Your view was saved. You may edit it from the list below.'));
$this->assertText($view1['human_name']);
$this->assertText($view1['description']);
- foreach(array('delete', 'clone', 'edit') as $operation) {
+ foreach (array('delete', 'clone', 'edit') as $operation) {
$this->assertLinkByHref(url('admin/structure/views/view/' . $view1['name'] . '/' . $operation));
}
@@ -146,12 +158,17 @@ class ViewsUIWizardBasicTestCase extends ViewsUIWizardHelper {
// Make sure the listing page doesn't show disabled default views.
$this->assertNoText('tracker', t('Default tracker view does not show on the listing page.'));
}
+
}
/**
* Tests enabling, disabling, and reverting default views via the listing page.
*/
class ViewsUIWizardDefaultViewsTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI default views functionality',
@@ -168,10 +185,9 @@ class ViewsUIWizardDefaultViewsTestCase extends ViewsUIWizardHelper {
// the listing page).
$edit_href = 'admin/structure/views/view/frontpage/edit';
$this->drupalGet('admin/structure/views');
- // TODO: Disabled default views do now appear on the front page. Test this
+ // @todo Disabled default views do now appear on the front page. Test this
// behavior with templates instead.
// $this->assertNoLinkByHref($edit_href);
-
// Enable the front page view, and make sure it is now visible on the main
// listing page.
$this->drupalGet('admin/structure/views/templates');
@@ -205,7 +221,7 @@ class ViewsUIWizardDefaultViewsTestCase extends ViewsUIWizardHelper {
// Now disable the view, and make sure it stops appearing on the main view
// listing page but instead goes back to displaying on the disabled views
// listing page.
- // TODO: Test this behavior with templates instead.
+ // @todo Test this behavior with templates instead.
$this->drupalGet('admin/structure/views');
$this->clickViewsOperationLink(t('Disable'), '/frontpage/');
// $this->assertUrl('admin/structure/views');
@@ -225,15 +241,15 @@ class ViewsUIWizardDefaultViewsTestCase extends ViewsUIWizardHelper {
* various views listing pages, and they might have tokens in them. So we
* need special code to find the correct one to click.
*
- * @param $label
+ * @param string $label
* Text between the anchor tags of the desired link.
- * @param $unique_href_part
+ * @param string $unique_href_part
* A unique string that is expected to occur within the href of the desired
* link. For example, if the link URL is expected to look like
* "admin/structure/views/view/frontpage/...", then "/frontpage/" could be
* passed as the expected unique string.
*
- * @return
+ * @return string
* The page content that results from clicking on the link, or FALSE on
* failure. Failure also results in a failed assertion.
*/
@@ -254,18 +270,42 @@ class ViewsUIWizardDefaultViewsTestCase extends ViewsUIWizardHelper {
return FALSE;
}
}
+
}
/**
* Tests the ability of the views wizard to create views filtered by taxonomy.
*/
class ViewsUIWizardTaggedWithTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
protected $node_type_with_tags;
+
+ /**
+ *
+ */
protected $node_type_without_tags;
+
+ /**
+ *
+ */
protected $tag_vocabulary;
+
+ /**
+ *
+ */
protected $tag_field;
+
+ /**
+ *
+ */
protected $tag_instance;
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI wizard taxonomy functionality',
@@ -274,6 +314,9 @@ class ViewsUIWizardTaggedWithTestCase extends ViewsUIWizardHelper {
);
}
+ /**
+ * {@inheritdoc}
+ */
function setUp() {
parent::setUp();
@@ -392,7 +435,7 @@ class ViewsUIWizardTaggedWithTestCase extends ViewsUIWizardHelper {
}
/**
- * Tests that the "tagged with" form element only shows for node types that support it.
+ * Test the "tagged with" form element only shows for node types that support it.
*/
function testTaggedWithByNodeType() {
// The tagging field is associated with one of our node types only. So the
@@ -422,12 +465,17 @@ class ViewsUIWizardTaggedWithTestCase extends ViewsUIWizardHelper {
$this->drupalPost(NULL, $view, t('Update "of type" choice'));
$this->assertFieldByXpath($tags_xpath);
}
+
}
/**
* Tests the ability of the views wizard to create views with sorts.
*/
class ViewsUIWizardSortingTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI wizard sorting functionality',
@@ -492,12 +540,17 @@ class ViewsUIWizardSortingTestCase extends ViewsUIWizardHelper {
$pos1 = strpos($content, $node1->title);
$this->assertTrue($pos3 < $pos2 && $pos2 < $pos1, t('The nodes appear in the expected order in a view that sorts by newest first.'));
}
+
}
/**
- * Tests the ability of the views wizard to specify the number of items per page.
+ * Tests the ability of the wizard to specify the number of items per page.
*/
class ViewsUIWizardItemsPerPageTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI wizard items per page functionality',
@@ -577,12 +630,17 @@ class ViewsUIWizardItemsPerPageTestCase extends ViewsUIWizardHelper {
$pos3 = strpos($content, $node3->title);
$this->assertTrue($pos5 < $pos4 && $pos4 < $pos3, t('The nodes appear in the expected order in the block display.'));
}
+
}
/**
* Tests the ability of the views wizard to put views in a menu.
*/
class ViewsUIWizardMenuTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI wizard menu functionality',
@@ -625,12 +683,17 @@ class ViewsUIWizardMenuTestCase extends ViewsUIWizardHelper {
}
$this->assertTrue($found, t('Found a link to %path in the main menu', array('%path' => $view['page[path]'])));
}
+
}
/**
- * Tests the ability of the views wizard to create views with a jump menu style plugin.
+ * Tests the ability of the wizard to create views with a jump menu style.
*/
class ViewsUIWizardJumpMenuTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI wizard jump menu functionality',
@@ -683,7 +746,6 @@ class ViewsUIWizardJumpMenuTestCase extends ViewsUIWizardHelper {
// Submit the jump menu form, and check that we are redirected to the
// expected URL.
-
$edit = array();
$edit['jump'] = url($path, $options);
@@ -786,12 +848,17 @@ class ViewsUIWizardJumpMenuTestCase extends ViewsUIWizardHelper {
node_save($node);
return 'node/' . $node->nid . '/revisions/' . $node->vid . '/view';
}
+
}
/**
* Tests that displays can be correctly overridden via the user interface.
*/
class ViewsUIWizardOverrideDisplaysTestCase extends ViewsUIWizardHelper {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views UI overridden displays',
@@ -948,9 +1015,8 @@ class ViewsUIWizardOverrideDisplaysTestCase extends ViewsUIWizardHelper {
* Tests that the revert to all displays select-option works as expected.
*/
function testRevertAllDisplays() {
- // Create a basic view with a page, block.
- // Because there is both a title on page and block we expect the title on
- // the block be overriden.
+ // Create a basic view with a page, block. Because there is both a title on
+ // page and block we expect the title on the block be overriden.
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['page[create]'] = 1;
@@ -970,4 +1036,5 @@ class ViewsUIWizardOverrideDisplaysTestCase extends ViewsUIWizardHelper {
$this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block", array(), t('Save'));
$this->assertText($view['page[title]']);
}
+
}
diff --git a/sites/all/modules/contrib/views/views/tests/views_upgrade.test b/sites/all/modules/contrib/views/views/tests/views_upgrade.test
index 3f453db..0c4da8f 100644
--- a/sites/all/modules/contrib/views/views/tests/views_upgrade.test
+++ b/sites/all/modules/contrib/views/views/tests/views_upgrade.test
@@ -11,6 +11,10 @@
* You can find all conversions by searching for "moved to".
*/
class ViewsUpgradeTestCase extends ViewsSqlTest {
+
+ /**
+ *
+ */
public static function getInfo() {
return array(
'name' => 'Views Upgrade test',
@@ -19,14 +23,21 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
);
}
+ /**
+ * {@inheritdoc}
+ */
protected function setUp() {
-// // To import a view the user needs use PHP for settings rights, so enable php module.
+ // To import a view the user needs use PHP for settings rights, so enable
+ // PHP module.
parent::setUp();
module_enable(array('php'));
$this->resetAll();
}
+ /**
+ *
+ */
function viewsData() {
$data = parent::viewsData();
$data['views_test']['old_field_1']['moved to'] = array('views_test', 'id');
@@ -41,6 +52,9 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
return $data;
}
+ /**
+ *
+ */
function debugField($field) {
$keys = array('id', 'table', 'field', 'actual_field', 'original_field', 'real_field');
$info = array();
@@ -59,8 +73,11 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
$view->update();
$view->build();
-// $this->assertEqual('old_field_1', $view->field['old_field_1']->options['id'], "Id shouldn't change during conversion");
-// $this->assertEqual('id', $view->field['old_field_1']->field, 'The field should change during conversion');
+ // $this->assertEqual('old_field_1',
+ // $view->field['old_field_1']->options['id'],
+ // "Id shouldn't change during conversion");
+ // $this->assertEqual('id', $view->field['old_field_1']->field,
+ // 'The field should change during conversion');
$this->assertEqual('id', $view->field['old_field_1']->real_field);
$this->assertEqual('views_test', $view->field['old_field_1']->table);
$this->assertEqual('old_field_1', $view->field['old_field_1']->original_field, 'The field should have stored the original_field');
@@ -70,11 +87,13 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
$view->update();
$view->build();
-// $this->assertEqual('old_field_2', $view->field['old_field_2']->options['id']);
+ // $this->assertEqual('old_field_2',
+ // $view->field['old_field_2']->options['id']);
$this->assertEqual('name', $view->field['old_field_2']->real_field);
$this->assertEqual('views_test', $view->field['old_field_2']->table);
-// $this->assertEqual('old_field_3', $view->filter['old_field_3']->options['id']);
+ // $this->assertEqual('old_field_3',
+ // $view->filter['old_field_3']->options['id']);
$this->assertEqual('age', $view->filter['old_field_3']->real_field);
$this->assertEqual('views_test', $view->filter['old_field_3']->table);
@@ -84,7 +103,8 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
$view->build();
$this->assertEqual('views_test', $view->base_table, 'Make sure that view->base_table gets automatically converted.');
-// $this->assertEqual('id', $view->field['id']->field, 'If we move a whole table fields of this table should work, too.');
+ // $this->assertEqual('id', $view->field['id']->field,
+ // 'If we move a whole table fields of this table should work, too.');
$this->assertEqual('id', $view->field['id']->real_field, 'To run the query right the real_field has to be set right.');
$this->assertEqual('views_test', $view->field['id']->table);
}
@@ -106,8 +126,11 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
$this->assertText('Recent comments');
}
+ /**
+ *
+ */
public function viewsMovedToField() {
- $view = new view;
+ $view = new view();
$view->name = 'test_views_move_to_field';
$view->description = '';
$view->tag = '';
@@ -127,8 +150,11 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
return $view;
}
+ /**
+ *
+ */
public function viewsMovedToHandler() {
- $view = new view;
+ $view = new view();
$view->name = 'test_views_move_to_handler';
$view->description = '';
$view->tag = '';
@@ -152,8 +178,11 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
return $view;
}
+ /**
+ *
+ */
public function viewsMovedToTable() {
- $view = new view;
+ $view = new view();
$view->name = 'test_views_move_to_table';
$view->description = '';
$view->tag = '';
@@ -173,6 +202,9 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
return $view;
}
+ /**
+ *
+ */
protected function viewUpgradeImport() {
$import = '
$view = new view;
@@ -272,6 +304,7 @@ class ViewsUpgradeTestCase extends ViewsSqlTest {
$handler->display->display_options["block_description"] = "Recent comments view"
;';
- return $import;
+ return $import;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/tests/views_view.test b/sites/all/modules/contrib/views/views/tests/views_view.test
index d268a0c..489864a 100644
--- a/sites/all/modules/contrib/views/views/tests/views_view.test
+++ b/sites/all/modules/contrib/views/views/tests/views_view.test
@@ -2,23 +2,27 @@
/**
* @file
- * Definition of ViewsViewTest.
+ * Views class tests.
*/
/**
- * Views class tests.
+ *
*/
class ViewsViewTest extends ViewsSqlTest {
+
+ /**
+ * Provide the test's meta information.
+ */
public static function getInfo() {
return array(
'name' => 'Test the view class',
- 'description' => 'Tests some functionality of the view class',
+ 'description' => 'Tests some functionality of the view class',
'group' => 'Views',
);
}
/**
- * Tests the deconstructor to be sure that every kind of heavy objects are removed.
+ * Ensure that every kind of heavy objects are removed by the destructor.
*/
function testDestroy() {
$view = $this->view_test_destroy();
@@ -36,6 +40,12 @@ class ViewsViewTest extends ViewsSqlTest {
$this->assertViewDestroy($view);
}
+ /**
+ * Assert that a given view is destroyed properly.
+ *
+ * @param object $view
+ * The view to destroy.
+ */
function assertViewDestroy($view) {
$this->assertFalse(isset($view->display['default']->handler), 'Make sure all displays are destroyed.');
$this->assertFalse(isset($view->display['attachment_1']->handler), 'Make sure all displays are destroyed.');
@@ -58,8 +68,11 @@ class ViewsViewTest extends ViewsSqlTest {
$this->assertEqual($view->attachment_after, '');
}
+ /**
+ * Test deleting a view.
+ */
function testDelete() {
- // Delete a database view
+ // Delete a database view.
$view = $this->view_test_delete();
$view->save();
$view = views_get_view($view->name);
@@ -72,10 +85,13 @@ class ViewsViewTest extends ViewsSqlTest {
$this->assertNull($view, "Make sure that the old view gets cleared by the reset parameter.");
}
+ /**
+ * Test validation.
+ */
function testValidate() {
// Test a view with multiple displays.
// Validating a view shouldn't change the active display.
- // @todo: Create an extra validation view.
+ // @todo Create an extra validation view.
$view = $this->view_test_destroy();
$view->set_display('page_1');
@@ -83,17 +99,20 @@ class ViewsViewTest extends ViewsSqlTest {
$this->assertEqual('page_1', $view->current_display, "The display should be constant while validating");
- // @todo: Write real tests for the validation.
+ // @todo Write real tests for the validation.
// In general the following things could be tested:
- // - Deleted displays shouldn't be validated
+ // - Deleted displays shouldn't be validated.
// - Multiple displays are validating and the errors are merged together.
}
/**
- * This view provides some filters, fields, arguments, relationships, sorts, areas and attachments.
+ * Generate an example view.
+ *
+ * Includes:
+ * filters, fields, arguments, relationships, sorts, areas and attachments.
*/
function view_test_destroy() {
- $view = new view;
+ $view = new view();
$view->name = 'test_destroy';
$view->description = '';
$view->tag = '';
@@ -227,6 +246,8 @@ class ViewsViewTest extends ViewsSqlTest {
'default' => 'default',
'page_1' => 'page_1',
);
+
+ // @codingStandardsIgnoreLine
$translatables['test_destroy'] = array(
t('Master'),
t('more'),
@@ -252,8 +273,12 @@ class ViewsViewTest extends ViewsSqlTest {
return $view;
}
+
+ /**
+ * Creates a test view.
+ */
function view_test_delete() {
- $view = new view;
+ $view = new view();
$view->name = 'test_view_delete';
$view->description = '';
$view->tag = '';
@@ -272,6 +297,8 @@ class ViewsViewTest extends ViewsSqlTest {
$handler->display->display_options['pager']['type'] = 'full';
$handler->display->display_options['style_plugin'] = 'default';
$handler->display->display_options['row_plugin'] = 'fields';
+
+ // @codingStandardsIgnoreLine
$translatables['test_view_delete'] = array(
t('Defaults'),
t('more'),
@@ -287,4 +314,5 @@ class ViewsViewTest extends ViewsSqlTest {
return $view;
}
+
}
diff --git a/sites/all/modules/contrib/views/views/theme/theme.inc b/sites/all/modules/contrib/views/views/theme/theme.inc
index e7f7a15..7382f01 100644
--- a/sites/all/modules/contrib/views/views/theme/theme.inc
+++ b/sites/all/modules/contrib/views/views/theme/theme.inc
@@ -8,11 +8,11 @@
/**
* Provide a full array of possible themes to try for a given hook.
*
- * @param $hook
+ * @param string $hook
* The hook to use. This is the base theme/template name.
- * @param $view
+ * @param object $view
* The view being rendered.
- * @param $display
+ * @param object $display
* The display being rendered, if applicable.
*/
function _views_theme_functions($hook, $view, $display = NULL) {
@@ -52,7 +52,7 @@ function template_preprocess_views_view(&$vars) {
$vars['name'] = $view->name;
$vars['display_id'] = $view->current_display;
- // Basic classes
+ // Basic classes.
$vars['css_class'] = '';
$vars['classes_array'] = array();
@@ -81,12 +81,12 @@ function template_preprocess_views_view(&$vars) {
$vars['pager'] = '';
- // @todo: Figure out whether this belongs into views_ui_preprocess_views_view.
+ // @todo Figure out whether this belongs into views_ui_preprocess_views_view.
// Render title for the admin preview.
$vars['title'] = !empty($view->views_ui_context) ? filter_xss_admin($view->get_title()) : '';
if ($view->display_handler->render_pager()) {
- $exposed_input = isset($view->exposed_raw_input) ? $view->exposed_raw_input : NULL;
+ $exposed_input = $view->get_exposed_input();
$vars['pager'] = $view->query->render_pager($exposed_input);
}
@@ -104,15 +104,15 @@ function template_preprocess_views_view(&$vars) {
// Attachments are always updated with the outer view, never by themselves,
// so they do not have dom ids.
if (empty($view->is_attachment)) {
- // Our JavaScript needs to have some means to find the HTML belonging to this
- // view.
+ // Our JavaScript needs to have some means to find the HTML belonging to
+ // this view.
//
// It is true that the DIV wrapper has classes denoting the name of the view
// and its display ID, but this is not enough to unequivocally match a view
// with its HTML, because one view may appear several times on the page. So
- // we set up a hash with the current time, $dom_id, to issue a "unique" identifier for
- // each view. This identifier is written to both Drupal.settings and the DIV
- // wrapper.
+ // we set up a hash with the current time, $dom_id, to issue a "unique"
+ // identifier for each view. This identifier is written to both
+ // Drupal.settings and the DIV wrapper.
$vars['dom_id'] = $view->dom_id;
$vars['classes_array'][] = 'view-dom-id-' . $vars['dom_id'];
}
@@ -129,7 +129,9 @@ function template_preprocess_views_view(&$vars) {
'view_args' => check_plain(implode('/', $view->args)),
'view_path' => check_plain($_GET['q']),
// Pass through URL to ensure we get e.g. language prefixes.
-// 'view_base_path' => isset($view->display['page']) ? substr(url($view->display['page']->display_options['path']), strlen($base_path)) : '',
+ // 'view_base_path' => isset($view->display['page']) ?
+ // substr(url($view->display['page']->display_options['path']),
+ // strlen($base_path)) : '',
'view_base_path' => $view->get_path(),
'view_dom_id' => $vars['dom_id'],
// To fit multiple views on a page, the programmer may have
@@ -138,6 +140,10 @@ function template_preprocess_views_view(&$vars) {
),
),
),
+ // Support for AJAX path validation in core 7.39.
+ 'urlIsAjaxTrusted' => array(
+ url('views/ajax') => TRUE,
+ ),
);
drupal_add_js($settings, 'setting');
@@ -175,16 +181,17 @@ function template_process_views_view(&$vars) {
}
/**
- * Preprocess theme function to print a single record from a row, with fields
+ * Preprocess theme function to print a single record from a row, with fields.
*/
function template_preprocess_views_view_fields(&$vars) {
$view = $vars['view'];
// Loop through the fields for this view.
$previous_inline = FALSE;
- $vars['fields'] = array(); // ensure it's at least an empty array.
+ $vars['fields'] = array();
+ // Ensure it's at least an empty array.
foreach ($view->field as $id => $field) {
- // render this even if set to exclude so it can be used elsewhere.
+ // Render this even if set to exclude so it can be used elsewhere.
$field_output = $view->style_plugin->get_field($view->row_index, $id);
$empty = $field->is_value_empty($field_output, $field->options['empty_zero']);
if (empty($field->options['exclude']) && (!$empty || (empty($field->options['hide_empty']) && empty($vars['options']['hide_empty'])))) {
@@ -203,7 +210,7 @@ function template_preprocess_views_view_fields(&$vars) {
if ($class) {
$class .= ' ';
}
- $class .= $classes;
+ $class .= $classes;
}
$pre = '<' . $object->element_type;
@@ -214,7 +221,8 @@ function template_preprocess_views_view_fields(&$vars) {
}
// Protect ourself somewhat for backward compatibility. This will prevent
- // old templates from producing invalid HTML when no element type is selected.
+ // old templates from producing invalid HTML when no element type is
+ // selected.
if (empty($object->element_type)) {
$object->element_type = 'span';
}
@@ -224,7 +232,8 @@ function template_preprocess_views_view_fields(&$vars) {
$object->raw = $vars['row']->{$view->field[$id]->field_alias};
}
else {
- $object->raw = NULL; // make sure it exists to reduce NOTICE
+ // Make sure it exists to reduce NOTICE.
+ $object->raw = NULL;
}
if (!empty($vars['options']['separator']) && $previous_inline && $object->inline && $object->content) {
@@ -264,8 +273,8 @@ function template_preprocess_views_view_fields(&$vars) {
$object->wrapper_suffix = 'inline_html . '>';
}
- // Set up the label for the value and the HTML to make it easier
- // on the template.
+ // Set up the label for the value and the HTML to make it easier on the
+ // template.
$object->label = check_plain($view->field[$id]->label());
$object->label_html = '';
if ($object->label) {
@@ -303,7 +312,6 @@ function template_preprocess_views_view_fields(&$vars) {
$vars['fields'][$id] = $object;
}
}
-
}
/**
@@ -316,7 +324,7 @@ function theme_views_view_grouping($vars) {
$output = '';
$output .= '' . $title . '';
- $output .= '' . $content . '' ;
+ $output .= '' . $content . '';
$output .= '';
return $output;
@@ -334,7 +342,7 @@ function template_preprocess_views_view_grouping(&$vars) {
*
* Interesting bits of info:
* $field->field_alias says what the raw value in $row will be. Reach it like
- * this: @code { $row->{$field->field_alias} @endcode
+ * this: @code { $row->{$field->field_alias} @endcode.
*/
function theme_views_view_field($vars) {
$view = $vars['view'];
@@ -355,7 +363,7 @@ function template_preprocess_views_view_field(&$vars) {
}
/**
- * Preprocess theme function to print a single record from a row, with fields
+ * Preprocess theme function to print a single record from a row, with fields.
*/
function template_preprocess_views_view_summary(&$vars) {
$view = $vars['view'];
@@ -369,12 +377,15 @@ function template_preprocess_views_view_summary(&$vars) {
}
$active_urls = drupal_map_assoc(array(
- url($_GET['q'], array('alias' => TRUE)), // force system path
- url($_GET['q']), // could be an alias
+ // Force system path.
+ url($_GET['q'], array('alias' => TRUE)),
+ // Could be an alias.
+ url($_GET['q']),
));
- // Collect all arguments foreach row, to be able to alter them for example by the validator.
- // This is not done per single argument value, because this could cause performance problems.
+ // Collect all arguments foreach row, to be able to alter them for example by
+ // the validator. This is not done per single argument value, because this
+ // could cause performance problems.
$row_args = array();
foreach ($vars['rows'] as $id => $row) {
@@ -402,8 +413,7 @@ function template_preprocess_views_view_summary(&$vars) {
}
/**
- * Template preprocess theme function to print summary basically
- * unformatted.
+ * Template preprocess theme function to print summary basically unformatted.
*/
function template_preprocess_views_view_summary_unformatted(&$vars) {
$view = $vars['view'];
@@ -418,12 +428,15 @@ function template_preprocess_views_view_summary_unformatted(&$vars) {
$count = 0;
$active_urls = drupal_map_assoc(array(
- url($_GET['q'], array('alias' => TRUE)), // force system path
- url($_GET['q']), // could be an alias
+ // Force system path.
+ url($_GET['q'], array('alias' => TRUE)),
+ // Could be an alias.
+ url($_GET['q']),
));
- // Collect all arguments foreach row, to be able to alter them for example by the validator.
- // This is not done per single argument value, because this could cause performance problems.
+ // Collect all arguments foreach row, to be able to alter them for example by
+ // the validator. This is not done per single argument value, because this
+ // could cause performance problems.
$row_args = array();
foreach ($vars['rows'] as $id => $row) {
$row_args[$id] = $argument->summary_argument($row);
@@ -431,7 +444,7 @@ function template_preprocess_views_view_summary_unformatted(&$vars) {
$argument->process_summary_arguments($row_args);
foreach ($vars['rows'] as $id => $row) {
- // only false on first time:
+ // Only false on first time.
if ($count++) {
$vars['rows'][$id]->separator = filter_xss_admin($vars['options']['separator']);
}
@@ -457,11 +470,11 @@ function template_preprocess_views_view_summary_unformatted(&$vars) {
function template_preprocess_views_view_table(&$vars) {
$view = $vars['view'];
- // We need the raw data for this grouping, which is passed in as $vars['rows'].
- // However, the template also needs to use for the rendered fields. We
- // therefore swap the raw data out to a new variable and reset $vars['rows']
- // so that it can get rebuilt.
- // Store rows so that they may be used by further preprocess functions.
+ // We need the raw data for this grouping, which is passed in as
+ // $vars['rows']. However, the template also needs to use for the rendered
+ // fields. We therefore swap the raw data out to a new variable and reset
+ // $vars['rows'] so that it can get rebuilt. Store rows so that they may be
+ // used by further preprocess functions.
$result = $vars['result'] = $vars['rows'];
$vars['rows'] = array();
$vars['field_classes'] = array();
@@ -489,14 +502,14 @@ function template_preprocess_views_view_table(&$vars) {
$renders = $handler->render_fields($result);
foreach ($columns as $field => $column) {
- // Create a second variable so we can easily find what fields we have and what the
- // CSS classes should be.
+ // Create a second variable so we can easily find what fields we have and
+ // what the CSS classes should be.
$vars['fields'][$field] = drupal_clean_css_identifier($field);
if ($active == $field) {
$vars['fields'][$field] .= ' active';
}
- // render the header labels
+ // Render the header labels.
if ($field == $column && empty($fields[$field]->options['exclude'])) {
$label = check_plain(!empty($fields[$field]) ? $fields[$field]->label() : '');
if (empty($options['info'][$field]['sortable']) || !$fields[$field]->click_sortable()) {
@@ -536,7 +549,7 @@ function template_preprocess_views_view_table(&$vars) {
}
$vars['header_classes'][$field] .= $class;
}
- // Add a CSS align class to each field if one was set
+ // Add a CSS align class to each field if one was set.
if (!empty($options['info'][$field]['align'])) {
$vars['header_classes'][$field] .= ' ' . drupal_clean_css_identifier($options['info'][$field]['align']);
}
@@ -548,17 +561,16 @@ function template_preprocess_views_view_table(&$vars) {
$vars['header'][$field] = '<' . $element_label_type . '>' . $vars['header'][$field] . '';
}
}
-
}
- // Add a CSS align class to each field if one was set
+ // Add a CSS align class to each field if one was set.
if (!empty($options['info'][$field]['align'])) {
$vars['fields'][$field] .= ' ' . drupal_clean_css_identifier($options['info'][$field]['align']);
}
// Render each field into its appropriate column.
foreach ($result as $num => $row) {
- // Add field classes
+ // Add field classes.
$vars['field_classes'][$field][$num] = '';
if ($fields[$field]->options['element_default_classes']) {
$vars['field_classes'][$field][$num] = "views-field views-field-" . $vars['fields'][$field];
@@ -598,7 +610,8 @@ function template_preprocess_views_view_table(&$vars) {
}
}
- // Remove columns if the option is hide empty column is checked and the field is not empty.
+ // Remove columns if the option is hide empty column is checked and the
+ // field is not empty.
if (!empty($options['info'][$field]['empty_column'])) {
$empty = TRUE;
foreach ($vars['rows'] as $num => $columns) {
@@ -642,12 +655,11 @@ function template_preprocess_views_view_table(&$vars) {
$vars['field_classes'][0][0] = 'views-empty';
}
-
if (!empty($options['sticky'])) {
drupal_add_js('misc/tableheader.js');
$vars['classes_array'][] = "sticky-enabled";
}
- $vars['classes_array'][] = 'cols-'. count($vars['header']);
+ $vars['classes_array'][] = 'cols-' . count($vars['header']);
// Add the summary to the list if set.
if (!empty($handler->options['summary'])) {
@@ -735,25 +747,25 @@ function template_preprocess_views_view_grid(&$vars) {
}
}
- // Apply the row classes
+ // Apply the row classes.
foreach ($rows as $row_number => $row) {
$row_classes = array();
if ($default_row_class) {
- $row_classes[] = 'row-' . ($row_number + 1);
+ $row_classes[] = 'row-' . ($row_number + 1);
}
if ($row_class_special) {
if ($row_number == 0) {
- $row_classes[] = 'row-first';
+ $row_classes[] = 'row-first';
}
if (count($rows) == ($row_number + 1)) {
- $row_classes[] = 'row-last';
+ $row_classes[] = 'row-last';
}
}
$vars['row_classes'][$row_number] = implode(' ', $row_classes);
foreach ($rows[$row_number] as $column_number => $item) {
$column_classes = array();
if ($default_row_class) {
- $column_classes[] = 'col-'. ($column_number + 1);
+ $column_classes[] = 'col-' . ($column_number + 1);
}
if ($row_class_special) {
if ($column_number == 0) {
@@ -787,7 +799,7 @@ function template_preprocess_views_view_grid(&$vars) {
}
/**
- * Display the simple view of rows one after another
+ * Display the simple view of rows one after another.
*/
function template_preprocess_views_view_unformatted(&$vars) {
$view = $vars['view'];
@@ -828,7 +840,7 @@ function template_preprocess_views_view_unformatted(&$vars) {
}
/**
- * Display the view as an HTML list element
+ * Display the view as an HTML list element.
*/
function template_preprocess_views_view_list(&$vars) {
$handler = $vars['view']->style_plugin;
@@ -857,7 +869,7 @@ function template_preprocess_views_view_list(&$vars) {
}
/**
- * Preprocess an RSS feed
+ * Preprocess an RSS feed.
*/
function template_preprocess_views_view_rss(&$vars) {
global $base_url;
@@ -885,8 +897,8 @@ function template_preprocess_views_view_rss(&$vars) {
}
$vars['title'] = check_plain($title);
- // Figure out which display which has a path we're using for this feed. If there isn't
- // one, use the global $base_url
+ // Figure out which display which has a path we're using for this feed. If
+ // there isn't one, use the global $base_url.
$link_display_id = $view->display_handler->get_link_display();
if ($link_display_id && !empty($view->display[$link_display_id])) {
$path = $view->display[$link_display_id]->handler->get_path();
@@ -899,7 +911,8 @@ function template_preprocess_views_view_rss(&$vars) {
$url_options['query'] = $view->exposed_raw_input;
}
- // Compare the link to the default home page; if it's the default home page, just use $base_url.
+ // Compare the link to the default home page; if it's the default home
+ // page, just use $base_url.
if ($path == variable_get('site_frontpage', 'node')) {
$path = '';
}
@@ -953,8 +966,8 @@ function template_preprocess_views_exposed_form(&$vars) {
$checkboxes .= drupal_render($form[$info['value']]);
continue;
}
- $widget = new stdClass;
- // set up defaults so that there's always something there.
+ $widget = new stdClass();
+ // Set up defaults so that there's always something there.
$widget->label = $widget->operator = $widget->widget = $widget->description = NULL;
$widget->id = isset($form[$info['value']]['#id']) ? $form[$info['value']]['#id'] : '';
@@ -977,8 +990,8 @@ function template_preprocess_views_exposed_form(&$vars) {
// Wrap up all the checkboxes we set aside into a widget.
if ($checkboxes) {
- $widget = new stdClass;
- // set up defaults so that there's always something there.
+ $widget = new stdClass();
+ // Set up defaults so that there's always something there.
$widget->label = $widget->operator = $widget->widget = NULL;
$widget->id = 'checkboxes';
$widget->widget = $checkboxes;
@@ -1034,6 +1047,9 @@ function theme_views_form_views_form($variables) {
return drupal_render_children($form);
}
+/**
+ * theme function for a mini pager.
+ */
function theme_views_mini_pager($vars) {
global $pager_page_array, $pager_total;
@@ -1041,12 +1057,11 @@ function theme_views_mini_pager($vars) {
$element = $vars['element'];
$parameters = $vars['parameters'];
- // current is the page we are currently paged to
+ // Current is the page we are currently paged to.
$pager_current = $pager_page_array[$element] + 1;
- // max is the maximum page number
+ // Max is the maximum page number.
$pager_max = $pager_total[$element];
// End of marker calculations.
-
if ($pager_total[$element] > 1) {
$li_previous = theme('pager_previous',
@@ -1088,6 +1103,7 @@ function theme_views_mini_pager($vars) {
'class' => array('pager-next'),
'data' => $li_next,
);
+
return theme('item_list',
array(
'items' => $items,
diff --git a/sites/all/modules/contrib/views/views/theme/views-more.tpl.php b/sites/all/modules/contrib/views/views/theme/views-more.tpl.php
index 0b7080b..1adfa3e 100644
--- a/sites/all/modules/contrib/views/views/theme/views-more.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-more.tpl.php
@@ -7,13 +7,15 @@
* - $view: The view object.
* - $more_url: the url for the more link.
* - $link_text: the text for the more link.
+ * - $new_window: The flag that indicates if link should be opened in a new
+ * window.
*
* @ingroup views_templates
*/
?>
diff --git a/sites/all/modules/contrib/views/views/theme/views-ui-display-tab-bucket.tpl.php b/sites/all/modules/contrib/views/views/theme/views-ui-display-tab-bucket.tpl.php
index 6d51a1d..079f579 100644
--- a/sites/all/modules/contrib/views/views/theme/views-ui-display-tab-bucket.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-ui-display-tab-bucket.tpl.php
@@ -7,7 +7,7 @@
?>
>
-
+
diff --git a/sites/all/modules/contrib/views/views/theme/views-ui-edit-item.tpl.php b/sites/all/modules/contrib/views/views/theme/views-ui-edit-item.tpl.php
deleted file mode 100644
index bf90ec1..0000000
--- a/sites/all/modules/contrib/views/views/theme/views-ui-edit-item.tpl.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $field): ?>
-
-
-
-
-
-
-
-
-
-
diff --git a/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php b/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php
index 5c3732c..f433332 100644
--- a/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-ui-edit-view.tpl.php
@@ -8,10 +8,11 @@
- break this lock.', array('!user' => $locked, '!age' => $lock_age, '!break' => $break)); ?>
+ break this lock.',
+ array('!user' => $locked, '!age' => $lock_age, '!break' => $break)); ?>
- ">
+
vid)): ?>
@@ -28,7 +29,8 @@
-
+
$columns): ?>
- >
+ class="">
$item): ?>
- >
+ class="">
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-list.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-list.tpl.php
index 601279a..27e2736 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-list.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-list.tpl.php
@@ -6,6 +6,7 @@
*
* - $title : The title of this group of rows. May be empty.
* - $options['type'] will either be ul or ol.
+ *
* @ingroup views_templates
*/
?>
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-row-comment.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-row-comment.tpl.php
index 7fe2e81..dc1aa39 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-row-comment.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-row-comment.tpl.php
@@ -10,7 +10,7 @@
* a views template, which is why it's not used here, but is a template
* 'suggestion' given to the comment template, and is used exactly
* the same as any other variant of the comment template file, such as
- * node-nodeTYPE.tpl.php
+ * node-nodeTYPE.tpl.php.
*
* @ingroup views_templates
*/
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-summary-unformatted.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-summary-unformatted.tpl.php
index 306d76f..e200893 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-summary-unformatted.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-summary-unformatted.tpl.php
@@ -11,7 +11,7 @@
?>
$row): ?>
'; ?>
- separator)) { print $row->separator; } ?>
+ separator)):?>separator; ?>
>link; ?>
(count; ?>)
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-summary.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-summary.tpl.php
index 22969eb..2b61f2d 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-summary.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-summary.tpl.php
@@ -10,7 +10,7 @@
$row): ?>
- - >link; ?>
+
- >link; ?>
(count?>)
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php
index 4fec9fa..370ecd7 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php
@@ -16,18 +16,19 @@
* $rows are keyed by row number, fields within rows are keyed by field ID.
* - $field_classes: An array of classes to apply to each field, indexed by
* field id, then row number. This matches the index in $rows.
+ *
* @ingroup views_templates
*/
?>
-
>
-
+ class="">
+
$label): ?>
- >
+ class="" scope="col">
@@ -36,9 +37,9 @@
$row): ?>
- >
+ class="">
$content): ?>
- >
+ class="">
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-unformatted.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-unformatted.tpl.php
index f1cccb8..fc8cfc4 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-unformatted.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-unformatted.tpl.php
@@ -11,7 +11,7 @@
$row): ?>
- >
+ class="">
diff --git a/sites/all/modules/contrib/views/views/theme/views-view.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view.tpl.php
index 579cf12..96edaab 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view.tpl.php
@@ -22,7 +22,7 @@
* - $pager: The pager next/prev links to display, if any
* - $exposed: Exposed widget form/info to display
* - $feed_icon: Feed icon to display, if any
- * - $more: A link to view more, if any
+ * - $more: A link to view more, if any.
*
* @ingroup views_templates
*/
diff --git a/sites/all/modules/contrib/views/views/views.api.php b/sites/all/modules/contrib/views/views/views.api.php
index 70c5dc8..ea53a37 100644
--- a/sites/all/modules/contrib/views/views/views.api.php
+++ b/sites/all/modules/contrib/views/views/views.api.php
@@ -87,7 +87,7 @@
* $this->value_title = t('Node type');
* $types = node_get_types();
* foreach ($types as $type => $info) {
- * $options[$type] = $info->name;
+ * $options[$type] = $info->name;
* }
* $this->value_options = $options;
* }
@@ -143,7 +143,7 @@
* responsible for building the query. Instead, they are objects that are used
* to display the view or make other modifications.
*
- * There are 10 types of plugins in Views:
+ * There are several types of plugins in Views:
* - Display: Display plugins are responsible for controlling *where* a view
* lives; that is, how they are being exposed to other parts of Drupal. Page
* and block are the most common displays, as well as the ubiquitous 'master'
@@ -244,9 +244,11 @@
* 'title' => t('Node'),
* 'help' => t('Display the node with standard node view.'),
* 'handler' => 'views_plugin_row_node_view',
- * 'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
+ * // Not necessary for most modules.
+ * 'path' => drupal_get_path('module', 'views') . '/modules/node',
* 'theme' => 'views_view_row_node',
- * 'base' => array('node'), // only works with 'node' as base.
+ * // Only works with 'node' as base.
+ * 'base' => array('node'),
* 'uses options' => TRUE,
* 'type' => 'normal',
* ),
@@ -292,12 +294,12 @@
/**
* Describes data tables (or the equivalent) to Views.
*
- * This hook should be placed in MODULENAME.views.inc and it will be
- * auto-loaded. MODULENAME.views.inc must be in the directory specified by the
- * 'path' key returned by MODULENAME_views_api(), or the same directory as the
- * .module file, if 'path' is unspecified.
+ * This hook should be placed in MODULENAME.views.inc and it will be auto
+ * loaded. MODULENAME.views.inc must be in the directory specified by the 'path'
+ * key returned by MODULENAME_views_api(), or the same directory as the .module
+ * file, if 'path' is unspecified.
*
- * @return
+ * @return array
* An associative array describing the data structure. Primary key is the
* name used internally by Views for the table(s) – usually the actual table
* name. The values for the key entries are described in detail below.
@@ -307,17 +309,15 @@ function hook_views_data() {
// table:
//
// CREATE TABLE example_table (
- // nid INT(11) NOT NULL COMMENT 'Primary key; refers to {node}.nid.',
+ // nid INT(11) NOT NULL COMMENT 'Primary key; refers to {node}.nid.',
// plain_text_field VARCHAR(32) COMMENT 'Just a plain text field.',
- // numeric_field INT(11) COMMENT 'Just a numeric field.',
- // boolean_field INT(1) COMMENT 'Just an on/off field.',
- // timestamp_field INT(8) COMMENT 'Just a timestamp field.',
+ // numeric_field INT(11) COMMENT 'Just a numeric field.',
+ // boolean_field INT(1) COMMENT 'Just an on/off field.',
+ // timestamp_field INT(8) COMMENT 'Just a timestamp field.',
// PRIMARY KEY(nid)
// );
-
// First, the entry $data['example_table']['table'] describes properties of
// the actual table – not its content.
-
// The 'group' index will be used as a prefix in the UI for any of this
// table's fields, sort criteria, etc. so it's easy to tell where they came
// from.
@@ -328,7 +328,8 @@ function hook_views_data() {
// is not very useful for this table, as it isn't really a distinct object of
// its own, but it makes a good example.
$data['example_table']['table']['base'] = array(
- 'field' => 'nid', // This is the identifier field for the view.
+ // This is the identifier field for the view.
+ 'field' => 'nid',
'title' => t('Example table'),
'help' => t('Example table contains example content and can be related to nodes.'),
'weight' => -10,
@@ -339,10 +340,10 @@ function hook_views_data() {
// table, the fields are automatically available.
$data['example_table']['table']['join'] = array(
// Index this array by the table name to which this table refers.
- // 'left_field' is the primary key in the referenced table.
- // 'field' is the foreign key in this table.
'node' => array(
+ // The primary key in the referenced table.
'left_field' => 'nid',
+ // The foreign key in this table.
'field' => 'nid',
),
);
@@ -362,7 +363,6 @@ function hook_views_data() {
// footer or as no result behaviour.
//
// The handler descriptions are described with examples below.
-
// Node ID table field.
$data['example_table']['nid'] = array(
'title' => t('Example content'),
@@ -372,8 +372,10 @@ function hook_views_data() {
// other direction, use hook_views_data_alter(), or use the 'implicit' join
// method described above.
'relationship' => array(
- 'base' => 'node', // The name of the table to join with.
- 'base field' => 'nid', // The name of the field on the joined table.
+ // The name of the table to join with.
+ 'base' => 'node',
+ // The name of the field on the joined table.
+ 'base field' => 'nid',
// 'field' => 'nid' -- see hook_views_data_alter(); not needed here.
'handler' => 'views_handler_relationship',
'label' => t('Default label for the relationship'),
@@ -388,7 +390,8 @@ function hook_views_data() {
'help' => t('Just a plain text field.'),
'field' => array(
'handler' => 'views_handler_field',
- 'click sortable' => TRUE, // This is use by the table display plugin.
+ // This is use by the table display plugin.
+ 'click sortable' => TRUE,
),
'sort' => array(
'handler' => 'views_handler_sort',
@@ -408,7 +411,7 @@ function hook_views_data() {
'field' => array(
'handler' => 'views_handler_field_numeric',
'click sortable' => TRUE,
- ),
+ ),
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
@@ -427,11 +430,11 @@ function hook_views_data() {
),
'filter' => array(
'handler' => 'views_handler_filter_boolean_operator',
- // Note that you can override the field-wide label:
+ // Note that you can override the field-wide label.
'label' => t('Published'),
// This setting is used by the boolean filter handler, as possible option.
'type' => 'yes-no',
- // use boolean_field = 1 instead of boolean_field <> 0 in WHERE statment.
+ // use boolean_field = 1 instead of boolean_field <> 0 in WHERE statement.
'use equal' => TRUE,
),
'sort' => array(
@@ -468,7 +471,7 @@ function hook_views_data() {
* 'path' key returned by MODULENAME_views_api(), or the same directory as the
* .module file, if 'path' is unspecified.
*
- * @param $data
+ * @param array $data
* An array of all Views data, passed by reference. See hook_views_data() for
* structure.
*
@@ -500,9 +503,12 @@ function hook_views_data_alter(&$data) {
'title' => t('Example relationship'),
'help' => t('Example help'),
'relationship' => array(
- 'base' => 'example_table', // Table we're joining to.
- 'base field' => 'eid', // Field on the joined table.
- 'field' => 'fid', // Real field name on the 'foo' table.
+ // Table we're joining to.
+ 'base' => 'example_table',
+ // Field on the joined table.
+ 'base field' => 'eid',
+ // Real field name on the 'foo' table.
+ 'field' => 'fid',
'handler' => 'views_handler_relationship',
'label' => t('Default label for relationship'),
'title' => t('Title seen when adding relationship'),
@@ -516,26 +522,26 @@ function hook_views_data_alter(&$data) {
/**
* Override the default data for a Field API field.
*
- * Field module's implementation of hook_views_data() invokes this for each
+ * Field module's Implements hook_views_data() invokes this for each
* field in the module that defines the field type (as declared in the field
* array). It is not invoked in other modules.
*
* If no hook implementation exists, hook_views_data() falls back to
* field_views_field_default_views_data().
*
+ * @param array $field
+ * A field definition array, as returned by field_info_fields().
+ *
+ * @return array
+ * An array of views data, in the same format as the return value of
+ * hook_views_data().
+ *
* @see field_views_data()
* @see hook_field_views_data_alter()
* @see hook_field_views_data_views_data_alter()
- *
- * @param $field
- * A field definition array, as returned by field_info_fields().
- *
- * @return
- * An array of views data, in the same format as the return value of
- * hook_views_data().
*/
function hook_field_views_data($field) {
-
+ return array();
}
/**
@@ -545,13 +551,13 @@ function hook_field_views_data($field) {
* the field, and therefore may be used to alter the default data that
* field_views_field_default_views_data() supplies for the field.
*
- * @param $result
- * An array of views table data provided for a single field. This has the same
- * format as the return value of hook_views_data().
- * @param $field
- * A field definition array, as returned by field_info_fields().
- * @param $module
- * The module that defines the field type.
+ * @param array $result
+ * An array of views table data provided for a single field. This has the same
+ * format as the return value of hook_views_data().
+ * @param array $field
+ * A field definition array, as returned by field_info_fields().
+ * @param string $module
+ * The module that defines the field type.
*
* @see field_views_data()
* @see hook_field_views_data()
@@ -564,7 +570,7 @@ function hook_field_views_data_alter(&$result, $field, $module) {
/**
* Alter the views data on a per field basis.
*
- * Field module's implementation of hook_views_data_alter() invokes this for
+ * Field module's Implements hook_views_data_alter() invokes this for
* each field in the module that defines the field type (as declared in the
* field array). It is not invoked in other modules.
*
@@ -597,12 +603,12 @@ function hook_field_views_data_views_data_alter(&$data, $field) {
* .module file, if 'path' is unspecified. All plugin files need to be
* referenced in MODULENAME.info with the files[] directive.
*
- * @return
+ * @return array
* An array on the form $plugins['PLUGIN TYPE']['PLUGIN NAME']. The plugin
* must be one of row, display, display_extender, style, argument default,
* argument validator, access, query, cache, pager, exposed_form or
* localization. The plugin name should be prefixed with your module name.
- * The value for each entry is an associateive array that may contain the
+ * The value for each entry is an associative array that may contain the
* following entries:
* - Used by all plugin types:
* - title (required): The name of the plugin, as shown in Views. Wrap in
@@ -619,7 +625,8 @@ function hook_field_views_data_views_data_alter(&$data, $field) {
* selectable in the ui, though on the api side they still exists.
* - uses options: Set to TRUE to denote that the plugin has an additional
* options form.
- * - help: A short help text, wrapped in t() used as description on the plugin settings form.
+ * - help: A short help text, wrapped in t() used as description on the
+ * plugin settings form.
* - help topic: The name of an entry by advanced help for the plugin.
* - theme: The name of a theme suggestion to use for the display.
* - js: An array with paths to js files that should be included for the
@@ -646,8 +653,8 @@ function hook_field_views_data_views_data_alter(&$data, $field) {
* should be added. Can for example be 'page' or 'block'. If you don't
* specify it there will be contextual links around the rendered view. If
* this is not set or regions have been specified, views will display an
- * option to 'hide contextual links'. Use an empty array if you do not want
- * this.
+ * option to 'hide contextual links'. Use an empty array if you do not
+ * want this.
* - uses hook menu: Set to TRUE to have the display included by
* views_menu_alter(). views_menu_alter executes then execute_hook_menu
* on the display object.
@@ -664,8 +671,8 @@ function hook_field_views_data_views_data_alter(&$data, $field) {
* - uses fields: Set to TRUE to have the style plugin accept field
* handlers.
* - uses grouping: Set to TRUE to allow the grouping settings for rows.
- * - even empty: May have the value 'even empty' to tell Views that the style
- * should be rendered even if there are no results.
+ * - even empty: May have the value 'even empty' to tell Views that the
+ * style should be rendered even if there are no results.
*
* - Used by row plugins:
* - uses fields: Set to TRUE to have the row plugin accept field handlers.
@@ -682,12 +689,14 @@ function hook_views_plugins() {
);
return array(
- 'module' => 'views', // This just tells our themes are elsewhere.
+ // This just tells our themes are elsewhere.
+ 'module' => 'views',
'argument validator' => array(
'taxonomy_term' => array(
'title' => t('Taxonomy term'),
'handler' => 'views_plugin_argument_validate_taxonomy_term',
- 'path' => drupal_get_path('module', 'views') . '/modules/taxonomy', // not necessary for most modules
+ // Declaring path explicitly not necessary for most modules.
+ 'path' => drupal_get_path('module', 'views') . '/modules/taxonomy',
),
),
'argument default' => array(
@@ -711,19 +720,75 @@ function hook_views_plugins_alter(&$plugins) {
$plugins['row']['node']['base'][] = 'apachesolr';
}
+/**
+ * Alter existing plugin option definitions.
+ *
+ * This can be used to edit default or add new option definitions to existing
+ * plugins. The reason for doing this is that only overriding the relevent form
+ * with hook_form_alter() is insufficent because submitted form values will be
+ * ignored if they haven't been declared as an available option.
+ *
+ * An alternative approach you could also take is to extend each plugin
+ * individually. However if your goal is to override many, or even all plugins,
+ * this results in a lot of additional code and files. This makes it a lot more
+ * troublesome to maintain the codebase, as well as interoperability with other
+ * modules.
+ *
+ * @param array $options
+ * The option definitions to be altered.
+ * @param $plugin
+ * A views object of the plugin where the default options are defined.
+ *
+ * @see views_object::option_definition()
+ * @see hook_views_handler_option_definition_alter()
+ * @see hook_form_alter()
+ */
+function hook_views_plugin_option_definition_alter(&$options, $plugin) {
+ // Add a new option definition.
+ $options['option_name'] = array('default' => '');
+}
+
+/**
+ * Alter existing handler option definitions.
+ *
+ * This can be used to edit default or add new option definitions to existing
+ * handers. The reason for doing this is that only overriding the relevent form
+ * with hook_form_alter() is insufficent because submitted form values will be
+ * ignored if they haven't been declared as an available option.
+ *
+ * An alternative approach you could also take is to extend each handler
+ * individually. However if your goal is to override many, or even all handlers,
+ * this results in a lot of additional code and files. This makes it a lot more
+ * troublesome to maintain the codebase, as well as interoperability with other
+ * modules.
+ *
+ * @param array $options
+ * The option definitions to be altered.
+ * @param $handler
+ * A views object of the handler where the default options are defined.
+ *
+ * @see views_handler::option_definition()
+ * @see hook_views_plugin_option_definition_alter()
+ * @see hook_form_alter()
+ */
+function hook_views_handler_option_definition_alter(&$options, $handler) {
+ // Add a new option definition.
+ $options['option_name'] = array('default' => '');
+}
+
/**
* Register View API information.
*
* This is required for your module to have its include files loaded; for
* example, when implementing hook_views_default_views().
*
- * @return
+ * @return array
* An array with the following possible keys:
* - api: (required) The version of the Views API the module implements.
* - path: (optional) If includes are stored somewhere other than within the
* root module directory, specify its path here.
* - template path: (optional) A path where the module has stored it's views
- * template files. When you have specificed this key views automatically
+ * template files. When you have specified this key views automatically
* uses the template files for the views. You can use the same naming
* conventions like for normal views template files.
*/
@@ -736,8 +801,9 @@ function hook_views_api() {
}
/**
- * This hook allows modules to provide their own views which can either be used
- * as-is or as a "starter" for users to build from.
+ * Allows modules to provide their own views.
+ *
+ * These can either be used as-is or as a "starter" for users to build from.
*
* This hook should be placed in MODULENAME.views_default.inc and it will be
* auto-loaded. MODULENAME.views_default.inc must be in the directory specified
@@ -747,7 +813,7 @@ function hook_views_api() {
* The $view->disabled boolean flag indicates whether the View should be
* enabled (FALSE) or disabled (TRUE) by default.
*
- * @return
+ * @return array
* An associative array containing the structures of views, as generated from
* the Export tab, keyed by the view name. A best practice is to go through
* and add t() to all title and label strings, with the exception of menu
@@ -755,7 +821,7 @@ function hook_views_api() {
*/
function hook_views_default_views() {
// Begin copy and paste of output from the Export tab of a view.
- $view = new view;
+ $view = new view();
$view->name = 'frontpage';
$view->description = 'Emulates the default Drupal front page; you may set the default home page path to this view to make it your front page.';
$view->tag = 'default';
@@ -819,13 +885,11 @@ function hook_views_default_views() {
$handler->display->display_options['sitename_title'] = '1';
// (Export ends here.)
-
// Add view to list of views to provide.
$views[$view->name] = $view;
- // ...Repeat all of the above for each view the module should provide.
-
- // At the end, return array of default views.
+ // Repeat all of the above for each view the module should provide. At the
+ // end, return array of default views.
return $views;
}
@@ -855,11 +919,12 @@ function hook_views_default_views_alter(&$views) {
/**
* Performs replacements in the query before being performed.
*
- * @param $view
+ * @param object $view
* The View being executed.
- * @return
+ *
+ * @return array
* An array with keys being the strings to replace, and the values the strings
- * to replace them with. The strings to replace are ofted surrounded with
+ * to replace them with. The strings to replace are often surrounded with
* '***', as illustrated in the example implementation.
*/
function hook_views_query_substitutions($view) {
@@ -874,10 +939,11 @@ function hook_views_query_substitutions($view) {
}
/**
- * This hook is called to get a list of placeholders and their substitutions,
- * used when preprocessing a View with form elements.
+ * This hook is called to get a list of placeholders and their substitutions.
*
- * @return
+ * Used when preprocessing a View with form elements.
+ *
+ * @return array
* An array with keys being the strings to replace, and the values the strings
* to replace them with.
*/
@@ -888,16 +954,31 @@ function hook_views_form_substitutions() {
}
/**
- * Allows altering a view at the very beginning of views processing, before
- * anything is done.
+ * Allows altering a view at the very beginning of processing a preview.
+ *
+ * Occurs before anything is done.
+ *
+ * This hook is only triggered when the one of the following are invoked:
+ * - $view->execute_display()
+ * - $view->preview()
+ *
+ * As such code placed in this hook will not fire during:
+ * - $view->build()
+ * - $view->execute()
+ * - $view->render()
+ *
+ * Likely, hook_views_pre_build() or hook_views_pre_execute() are much better
+ * choices for most use cases since they are always invoked, not just when
+ * previewing a display.
*
* Adding output to the view can be accomplished by placing text on
* $view->attachment_before and $view->attachment_after.
- * @param $view
+ *
+ * @param object $view
* The view object about to be processed.
- * @param $display_id
+ * @param string $display_id
* The machine name of the active display.
- * @param $args
+ * @param array $args
* An array of arguments passed into the view.
*/
function hook_views_pre_view(&$view, &$display_id, &$args) {
@@ -906,25 +987,25 @@ function hook_views_pre_view(&$view, &$display_id, &$args) {
// (Note that this is not necessarily the best way to solve that task. Feel
// free to contribute another example!)
if (
- $view->name == 'my_special_view' &&
- user_access('administer site configuration') &&
- $display_id == 'public_display'
+ $view->name == 'my_special_view'
+ && user_access('administer site configuration')
+ && $display_id == 'public_display'
) {
$view->set_display('private_display');
}
}
/**
- * This hook is called right before the build process, but after displays
- * are attached and the display performs its pre_execute phase.
+ * Called after the display's pre_execute phase but before the build process.
*
* Adding output to the view can be accomplished by placing text on
* $view->attachment_before and $view->attachment_after.
- * @param $view
+ *
+ * @param object $view
* The view object about to be processed.
*/
function hook_views_pre_build(&$view) {
- // Because of some unexplicable business logic, we should remove all
+ // Because of some inexplicable business logic, we should remove all
// attachments from all views on Mondays.
// (This alter could be done later in the execution process as well.)
if (date('D') == 'Mon') {
@@ -934,12 +1015,15 @@ function hook_views_pre_build(&$view) {
}
/**
- * This hook is called right after the build process. The query is now fully
- * built, but it has not yet been run through db_rewrite_sql.
+ * This hook is called right after the build process.
+ *
+ * The query is now fully built, but it has not yet been run through
+ * db_rewrite_sql.
*
* Adding output to the view can be accomplished by placing text on
* $view->attachment_before and $view->attachment_after.
- * @param $view
+ *
+ * @param object $view
* The view object about to be processed.
*/
function hook_views_post_build(&$view) {
@@ -957,12 +1041,15 @@ function hook_views_post_build(&$view) {
}
/**
- * This hook is called right before the execute process. The query is now fully
- * built, but it has not yet been run through db_rewrite_sql.
+ * This hook is called right before the execute process.
+ *
+ * The query is now fully built, but it has not yet been run through
+ * db_rewrite_sql.
*
* Adding output to the view can be accomplished by placing text on
* $view->attachment_before and $view->attachment_after.
- * @param $view
+ *
+ * @param object $view
* The view object about to be processed.
*/
function hook_views_pre_execute(&$view) {
@@ -976,14 +1063,16 @@ function hook_views_pre_execute(&$view) {
}
/**
- * This hook is called right after the execute process. The query has
- * been executed, but the pre_render() phase has not yet happened for
- * handlers.
+ * This hook is called right after the execute process.
+ *
+ * The query has been executed, but the pre_render() phase has not yet happened
+ * for handlers.
*
* Adding output to the view can be accomplished by placing text on
- * $view->attachment_before and $view->attachment_after. Altering the
- * content can be achieved by editing the items of $view->result.
- * @param $view
+ * $view->attachment_before and $view->attachment_after. Altering the content
+ * can be achieved by editing the items of $view->result.
+ *
+ * @param object $view
* The view object about to be processed.
*/
function hook_views_post_execute(&$view) {
@@ -997,16 +1086,18 @@ function hook_views_post_execute(&$view) {
}
/**
- * This hook is called right before the render process. The query has been
- * executed, and the pre_render() phase has already happened for handlers, so
- * all data should be available.
+ * This hook is called right before the render process.
+ *
+ * The query has been executed, and the pre_render() phase has already happened
+ * for handlers, so all data should be available.
*
* Adding output to the view can be accomplished by placing text on
* $view->attachment_before and $view->attachment_after. Altering the content
* can be achieved by editing the items of $view->result.
*
* This hook can be utilized by themes.
- * @param $view
+ *
+ * @param object $view
* The view object about to be processed.
*/
function hook_views_pre_render(&$view) {
@@ -1037,11 +1128,12 @@ function hook_views_pre_render(&$view) {
* so all ids used in the query should be discoverable.
*
* This hook can be utilized by themes.
- * @param $view
+ *
+ * @param object $view
* The view object about to be processed.
- * @param $output
+ * @param string $output
* A flat string with the rendered output of the view.
- * @param $cache
+ * @param array $cache
* The cache settings.
*/
function hook_views_post_render(&$view, &$output, &$cache) {
@@ -1061,10 +1153,11 @@ function hook_views_post_render(&$view, &$output, &$cache) {
* 'path' key returned by MODULENAME_views_api(), or the same directory as the
* .module file, if 'path' is unspecified.
*
- * @param $view
+ * @param object $view
* The view object about to be processed.
- * @param $query
+ * @param object $query
* An object describing the query.
+ *
* @see hook_views_query_substitutions()
*/
function hook_views_query_alter(&$view, &$query) {
@@ -1075,7 +1168,7 @@ function hook_views_query_alter(&$view, &$query) {
// Traverse through the 'where' part of the query.
foreach ($query->where as &$condition_group) {
foreach ($condition_group['conditions'] as &$condition) {
- // If this is the part of the query filtering on title, chang the
+ // If this is the part of the query filtering on title, change the
// condition to filter on node ID.
if ($condition['field'] == 'node.title') {
$condition = array(
@@ -1090,8 +1183,9 @@ function hook_views_query_alter(&$view, &$query) {
}
/**
- * Alter the information box that (optionally) appears with a view preview,
- * including query and performance statistics.
+ * Alter the information box that (optionally) appears with a view preview.
+ *
+ * Includes query and performance statistics.
*
* This hook should be placed in MODULENAME.views.inc and it will be
* auto-loaded. MODULENAME.views.inc must be in the directory specified by the
@@ -1101,14 +1195,15 @@ function hook_views_query_alter(&$view, &$query) {
* Warning: $view is not a reference in PHP4 and cannot be modified here. But it
* IS a reference in PHP5, and can be modified. Please be careful with it.
*
- * @param $rows
+ * @param array $rows
* An associative array with two keys:
* - query: An array of rows suitable for theme('table'), containing
* information about the query and the display title and path.
* - statistics: An array of rows suitable for theme('table'), containing
* performance statistics.
- * @param $view
+ * @param object $view
* The view object.
+ *
* @see theme_table()
*/
function hook_views_preview_info_alter(&$rows, $view) {
@@ -1121,15 +1216,16 @@ function hook_views_preview_info_alter(&$rows, $view) {
}
/**
- * This hooks allows to alter the links at the top of the view edit form. Some
- * modules might want to add links there.
+ * This hooks allows to alter the links at the top of the view edit form.
*
- * @param $links
+ * Some modules might want to add links there.
+ *
+ * @param array $links
* An array of links which will be displayed at the top of the view edit form.
* Each entry should be on a form suitable for theme('link').
- * @param view $view
+ * @param object $view
* The full view object which is currently edited.
- * @param $display_id
+ * @param string $display_id
* The current display id which is edited. For example that's 'default' or
* 'page_1'.
*/
@@ -1141,20 +1237,19 @@ function hook_views_ui_display_top_links_alter(&$links, $view, $display_id) {
}
/**
- * This hook allows to alter the commands which are used on a views ajax
- * request.
+ * Allows altering the commands which are used on a views AJAX request.
*
- * @param $commands
- * An array of ajax commands
- * @param $view view
+ * @param array $commands
+ * An array of ajax commands.
+ * @param object $view
* The view which is requested.
*/
function hook_views_ajax_data_alter(&$commands, $view) {
// Replace Views' method for scrolling to the top of the element with your
// custom scrolling method.
foreach ($commands as &$command) {
- if ($command['method'] == 'viewsScrollTop') {
- $command['method'] .= 'myScrollTop';
+ if ($command['command'] == 'viewsScrollTop') {
+ $command['command'] .= 'myScrollTop';
}
}
}
@@ -1165,12 +1260,41 @@ function hook_views_ajax_data_alter(&$commands, $view) {
* This hook should fire whenever a view is enabled, disabled, created,
* updated, or deleted.
*
+ * @param string $cid
+ * The cache identifier that is being cleared.
+ *
* @see views_invalidate_cache()
*/
-function hook_views_invalidate_cache() {
+function hook_views_invalidate_cache($cid) {
cache_clear_all('views:*', 'cache_mymodule', TRUE);
}
+/**
+ * Allow modules to alter a view prior to being saved.
+ */
+function hook_views_view_presave($view) {
+ // Do some adjustments to the view. Handle with care.
+ if (mymodule_check_view($view)) {
+ mymodule_do_some_voodoo($view);
+ }
+}
+
+/**
+ * Allow modules to respond to a view being saved.
+ */
+function hook_views_view_save($view) {
+ // Make a watchdog entry.
+ watchdog('views', 'The view @name was deleted by @user at @time', array('@name' => $view->name, '@user' => $GLOBALS['user']->name, '@time' => format_date(time())));
+}
+
+/**
+ * Allow modules to respond to a view being deleted or reverted.
+ */
+function hook_views_view_delete($view) {
+ // Make a watchdog entry.
+ watchdog('views', 'The view @name was deleted by @user at @time', array('@name' => $view->name, '@user' => $GLOBALS['user']->name, '@time' => format_date(time())));
+}
+
/**
* @}
*/
diff --git a/sites/all/modules/contrib/views/views/views.info b/sites/all/modules/contrib/views/views/views.info
index 87b01b9..d9d1c11 100644
--- a/sites/all/modules/contrib/views/views/views.info
+++ b/sites/all/modules/contrib/views/views/views.info
@@ -2,7 +2,6 @@ name = Views
description = Create customized lists and queries from your database.
package = Views
core = 7.x
-php = 5.2
; Always available CSS
stylesheets[all][] = css/views.css
@@ -27,9 +26,11 @@ files[] = handlers/views_handler_field.inc
files[] = handlers/views_handler_field_counter.inc
files[] = handlers/views_handler_field_boolean.inc
files[] = handlers/views_handler_field_contextual_links.inc
+files[] = handlers/views_handler_field_ctools_dropdown.inc
files[] = handlers/views_handler_field_custom.inc
files[] = handlers/views_handler_field_date.inc
files[] = handlers/views_handler_field_entity.inc
+files[] = handlers/views_handler_field_links.inc
files[] = handlers/views_handler_field_markup.inc
files[] = handlers/views_handler_field_math.inc
files[] = handlers/views_handler_field_numeric.inc
@@ -116,6 +117,7 @@ files[] = modules/locale/views_handler_field_locale_link_edit.inc
files[] = modules/locale/views_handler_filter_locale_group.inc
files[] = modules/locale/views_handler_filter_locale_language.inc
files[] = modules/locale/views_handler_filter_locale_version.inc
+files[] = modules/locale/views_handler_sort_node_language.inc
files[] = modules/node/views_handler_argument_dates_various.inc
files[] = modules/node/views_handler_argument_node_language.inc
files[] = modules/node/views_handler_argument_node_nid.inc
@@ -133,11 +135,14 @@ files[] = modules/node/views_handler_field_node_revision_link_delete.inc
files[] = modules/node/views_handler_field_node_revision_link_revert.inc
files[] = modules/node/views_handler_field_node_path.inc
files[] = modules/node/views_handler_field_node_type.inc
+files[] = modules/node/views_handler_field_node_version_count.inc
files[] = modules/node/views_handler_filter_history_user_timestamp.inc
files[] = modules/node/views_handler_filter_node_access.inc
files[] = modules/node/views_handler_filter_node_status.inc
files[] = modules/node/views_handler_filter_node_type.inc
files[] = modules/node/views_handler_filter_node_uid_revision.inc
+files[] = modules/node/views_handler_filter_node_version_count.inc
+files[] = modules/node/views_handler_sort_node_version_count.inc
files[] = modules/node/views_plugin_argument_default_node.inc
files[] = modules/node/views_plugin_argument_validate_node.inc
files[] = modules/node/views_plugin_row_node_rss.inc
@@ -151,6 +156,8 @@ files[] = modules/search/views_handler_filter_search.inc
files[] = modules/search/views_handler_sort_search_score.inc
files[] = modules/search/views_plugin_row_search_view.inc
files[] = modules/statistics/views_handler_field_accesslog_path.inc
+files[] = modules/statistics/views_handler_field_node_counter_timestamp.inc
+files[] = modules/statistics/views_handler_field_statistics_numeric.inc
files[] = modules/system/views_handler_argument_file_fid.inc
files[] = modules/system/views_handler_field_file.inc
files[] = modules/system/views_handler_field_file_extension.inc
@@ -161,6 +168,7 @@ files[] = modules/system/views_handler_filter_file_status.inc
files[] = modules/taxonomy/views_handler_argument_taxonomy.inc
files[] = modules/taxonomy/views_handler_argument_term_node_tid.inc
files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc
files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
files[] = modules/taxonomy/views_handler_argument_vocabulary_vid.inc
files[] = modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
@@ -169,6 +177,7 @@ files[] = modules/taxonomy/views_handler_field_term_node_tid.inc
files[] = modules/taxonomy/views_handler_field_term_link_edit.inc
files[] = modules/taxonomy/views_handler_filter_term_node_tid.inc
files[] = modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
+files[] = modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc
files[] = modules/taxonomy/views_handler_filter_vocabulary_vid.inc
files[] = modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
files[] = modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -292,12 +301,14 @@ files[] = tests/styles/views_plugin_style_unformatted.test
files[] = tests/views_access.test
files[] = tests/views_analyze.test
files[] = tests/views_basic.test
+files[] = tests/views_ajax.test
files[] = tests/views_argument_default.test
files[] = tests/views_argument_validator.test
files[] = tests/views_exposed_form.test
files[] = tests/field/views_fieldapi.test
files[] = tests/views_glossary.test
files[] = tests/views_groupby.test
+files[] = tests/views_handler_filter.test
files[] = tests/views_handlers.test
files[] = tests/views_module.test
files[] = tests/views_pager.test
@@ -318,9 +329,8 @@ files[] = tests/views_cache.test
files[] = tests/views_view.test
files[] = tests/views_ui.test
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2019-04-03
+version = "7.x-3.22"
core = "7.x"
project = "views"
-datestamp = "1423648085"
-
+datestamp = "1554307093"
diff --git a/sites/all/modules/contrib/views/views/views.install b/sites/all/modules/contrib/views/views/views.install
index b69f410..92c7abc 100644
--- a/sites/all/modules/contrib/views/views/views.install
+++ b/sites/all/modules/contrib/views/views/views.install
@@ -19,20 +19,18 @@ function views_install() {
/**
* Implements hook_schema().
- *
- * Generate the current version of the database schema from
- * the sequence of schema update functions. Uses a similar
- * method to install.inc's drupal_get_schema_versions() to
- * establish the update sequence.
- *
- * To change the schema, add a new views_schema_N()
- * function to match the associated views_update_N()
- *
- * @param $caller_function
- * The name of the function that called us.
- * Used internally, if requesting a specific schema version.
*/
-function views_schema($caller_function = FALSE) {
+function views_schema($caller_function = NULL) {
+ // Generate the current version of the database schema from the sequence of
+ // schema update functions. Uses a similar method to install.inc's
+ // drupal_get_schema_versions() to establish the update sequence.
+ //
+ // To change the schema, add a new views_schema_N() function to match the
+ // associated views_update_N().
+ //
+ // @param string $caller_function
+ // The name of the function that called us. Used internally, if requesting a
+ // specific schema version.
static $get_current;
static $schemas = array();
@@ -44,31 +42,30 @@ function views_schema($caller_function = FALSE) {
// Generate a sorted list of available schema update functions.
if ($get_current || empty($schemas)) {
$get_current = FALSE;
- $functions = get_defined_functions();
- foreach ($functions['user'] as $function) {
- if (strpos($function, 'views_schema_') === 0) {
- $version = substr($function, strlen('views_schema_'));
- if (is_numeric($version)) {
- $schemas[] = $version;
- }
+ // Provide a worst-case scenario range.
+ $start_schema = 6000;
+ $end_schema = 7999;
+ for ($i = $start_schema; $i <= $end_schema; $i++) {
+ if (function_exists('views_schema_' . $i)) {
+ $schemas[] = $i;
}
}
if ($schemas) {
sort($schemas, SORT_NUMERIC);
- // If a specific version was requested, drop any later
- // updates from the sequence.
+ // If a specific version was requested, drop any later updates from the
+ // sequence.
if ($caller_function) {
do {
$schema = array_pop($schemas);
- } while ($schemas && $caller_function != 'views_schema_'. $schema);
+ } while ($schemas && $caller_function != 'views_schema_' . $schema);
}
}
}
// Call views_schema_, for the highest available .
if ($schema = array_pop($schemas)) {
- $function = 'views_schema_'. $schema;
+ $function = 'views_schema_' . $schema;
return $function();
}
@@ -77,12 +74,14 @@ function views_schema($caller_function = FALSE) {
/**
* Views 2's initial schema.
+ *
* Called directly by views_update_6000() for updates from Drupal 5.
*
* Important: Do not edit this schema!
*
- * Updates to the views schema must be provided as views_schema_6xxx() functions,
- * which views_schema() automatically sees and applies. See below for examples.
+ * Updates to the views schema must be provided as views_schema_6xxx()
+ * functions, which views_schema() automatically sees and applies. See below for
+ * examples.
*
* Please do document updates with comments in this function, however.
*/
@@ -103,11 +102,11 @@ function views_schema_6000() {
'current_version' => '3.0',
),
'object' => 'view',
- // the callback to load the displays
+ // the callback to load the displays.
'subrecords callback' => 'views_load_display_records',
- // the variable that holds enabled/disabled status
+ // the variable that holds enabled/disabled status.
'status' => 'views_defaults',
- // CRUD callbacks
+ // CRUD callbacks.
'create callback' => 'views_new_view',
'save callback' => 'views_save_view',
'delete callback' => 'views_delete_view',
@@ -149,7 +148,8 @@ function views_schema_6000() {
),
'base_table' => array(
'type' => 'varchar',
- 'length' => '32', // Updated to '64' in views_schema_6005()
+ 'length' => '32',
+ // Updated to '64' in views_schema_6005()
'default' => '',
'not null' => TRUE,
'description' => 'What table this view is based on, such as node, user, comment, or term.',
@@ -162,7 +162,8 @@ function views_schema_6000() {
),
),
'primary key' => array('vid'),
- 'unique key' => array('name' => array('name')), // Updated to 'unique keys' in views_schema_6003()
+ 'unique key' => array('name' => array('name')),
+ // Updated to 'unique keys' in views_schema_6003()
);
$schema['views_display'] = array(
@@ -242,7 +243,8 @@ function views_schema_6000() {
'description' => 'The time this cache was created or updated.',
),
'data' => array(
- 'type' => 'blob', // Updated to 'text' (with size => 'big') in views_schema_6004()
+ 'type' => 'blob',
+ // Updated to 'text' (with size => 'big') in views_schema_6004()
'description' => 'Serialized data being stored.',
'serialize' => TRUE,
),
@@ -253,8 +255,7 @@ function views_schema_6000() {
),
);
- // $schema['cache_views_data'] added in views_schema_6006()
-
+ // $schema['cache_views_data'] added in views_schema_6006().
return $schema;
}
@@ -296,8 +297,10 @@ function views_update_6001() {
update_sql("UPDATE {blocks} SET delta = CONCAT(delta, '-block_1') WHERE module = 'views'");
}
-// NOTE: Update 6002 removed because it did not always work.
-// Update 6004 implements the change correctly.
+/**
+ * NOTE: Update 6002 removed because it did not always work.
+ * Update 6004 implements the change correctly.
+ */
/**
* Add missing unique key.
@@ -337,7 +340,7 @@ function views_update_6004() {
}
/**
- * Enlarge the base_table column
+ * Enlarge the base_table column.
*/
function views_schema_6005() {
$schema = views_schema(__FUNCTION__);
@@ -402,7 +405,7 @@ function views_update_6008() {
}
/**
- * Enlarge the views_display.display_options field to accomodate a larger set
+ * Enlarge the views_display.display_options field to accommodate a larger set
* of configurations (e. g. fields, filters, etc.) on a display.
*/
function views_schema_6009() {
@@ -444,7 +447,7 @@ function views_update_6009() {
}
/**
- * Remove the view_php field
+ * Remove the view_php field.
*/
function views_schema_6010() {
$schema = views_schema(__FUNCTION__);
@@ -454,7 +457,7 @@ function views_schema_6010() {
}
/**
- * Remove the view_php and is_cacheable field
+ * Remove the view_php and is_cacheable field.
*/
function views_update_6010() {
db_drop_field('views_view', 'view_php');
@@ -488,7 +491,7 @@ function views_update_6011() {
*/
function views_update_6012() {
// There is only one simple query to run.
- $update = db_update('blocks')
+ db_update('blocks')
->condition('module', 'views')
->condition('delta', db_like('-exp-') . '%', 'LIKE')
->fields(array('cache' => DRUPAL_NO_CACHE));
@@ -578,7 +581,7 @@ function views_update_7000() {
}
/**
- * Fix missing items from Views administrative breadcrumb
+ * Fix missing items from Views administrative breadcrumb.
*/
function views_update_7001() {
$depth = db_select('menu_links')
@@ -619,7 +622,7 @@ function views_schema_7301() {
}
/**
- * Enlarge the name column
+ * Enlarge the name column.
*/
function views_update_7301() {
$new_field = array(
@@ -631,3 +634,17 @@ function views_update_7301() {
);
db_change_field('views_view', 'name', 'name', $new_field);
}
+
+/**
+ * Remove headers field from cache tables.
+ *
+ * @see system_update_7054()
+ */
+function views_update_7302() {
+ if (db_field_exists('cache_views', 'headers')) {
+ db_drop_field('cache_views', 'headers');
+ }
+ if (db_field_exists('cache_views_data', 'headers')) {
+ db_drop_field('cache_views_data', 'headers');
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/views.module b/sites/all/modules/contrib/views/views/views.module
index 9cdcfb5..58cfed4 100644
--- a/sites/all/modules/contrib/views/views/views.module
+++ b/sites/all/modules/contrib/views/views/views.module
@@ -10,7 +10,33 @@
*/
/**
- * Advertise the current views api version
+ * Implements hook_help().
+ */
+function views_help($path, $arg) {
+ switch ($path) {
+ case 'admin/help#views':
+ $output = '';
+ $output .= '' . t('About') . '
';
+ $output .= '' . t('The Views module provides a back end to fetch information from content, user accounts, taxonomy terms, and other entities from the database and present it to the user as a grid, HTML list, table, unformatted list, etc. The resulting displays are known generally as views.') . '
';
+ $output .= '' . t('For more information, see the online documentation for the Views.', array('@views' => 'https://www.drupal.org/documentation/modules/views')) . '
';
+ $output .= '' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the Views UI module help page for more information.') . '
';
+
+ $output .= '' . t('Uses') . '
';
+ $output .= '';
+ $output .= '- ' . t('Adding functionality to administrative pages') . '
';
+ $output .= '- ' . t('The Views module adds functionality to some core administration pages. For example, admin/content uses Views to filter and sort content. With Views uninstalled, admin/content is more limited.') . '
';
+
+ $output .= '- ' . t('Expanding Views functionality') . '
';
+ $output .= '- ' . t('Contributed projects that support the Views module can be found in the online documentation for Views-related contributed modules..', array('@views-related' => 'https://www.drupal.org/documentation/modules/views/add-ons')) . '
';
+
+ $output .= '- ' . t('Improving table accessibility') . '
';
+ $output .= '- ' . t('Views tables include semantic markup to improve accessibility. Data cells are automatically associated with header cells through id and header attributes. To improve the accessibility of your tables you can add descriptive elements within the Views table settings. The caption element can introduce context for a table, making it easier to understand. The summary element can provide an overview of how the data has been organized and how to navigate the table. Both the caption and summary are visible by default and also implemented according to HTML5 guidelines.') . '
';
+ return $output;
+ }
+}
+
+/**
+ * Advertise the current views api version.
*/
function views_api_version() {
return '3.0';
@@ -55,7 +81,9 @@ function views_api_minimum_version() {
}
/**
- * Implement hook_theme(). Register views theming functions.
+ * Implements hook_theme().
+ *
+ * Register views theming functions.
*/
function views_theme($existing, $type, $theme, $path) {
$path = drupal_get_path('module', 'views');
@@ -67,9 +95,13 @@ function views_theme($existing, $type, $theme, $path) {
'path' => $path . '/theme',
);
- // Our extra version of pager from pager.inc
+ // Our extra version of pager from pager.inc.
$hooks['views_mini_pager'] = $base + array(
- 'variables' => array('tags' => array(), 'element' => 0, 'parameters' => array()),
+ 'variables' => array(
+ 'tags' => array(),
+ 'element' => 0,
+ 'parameters' => array(),
+ ),
'pattern' => 'views_mini_pager__',
);
@@ -78,28 +110,48 @@ function views_theme($existing, $type, $theme, $path) {
// $view is an object but the core contextual_preprocess() function only
// attaches contextual links when the primary theme argument is an array.
'display' => array('view_array' => array(), 'view' => NULL),
- 'style' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL),
- 'row' => array('view' => NULL, 'options' => NULL, 'row' => NULL, 'field_alias' => NULL),
+ 'style' => array(
+ 'view' => NULL,
+ 'options' => NULL,
+ 'rows' => NULL,
+ 'title' => NULL,
+ ),
+ 'row' => array(
+ 'view' => NULL,
+ 'options' => NULL,
+ 'row' => NULL,
+ 'field_alias' => NULL,
+ ),
'exposed_form' => array('view' => NULL, 'options' => NULL),
'pager' => array(
- 'view' => NULL, 'options' => NULL,
- 'tags' => array(), 'quantity' => 10, 'element' => 0, 'parameters' => array()
+ 'view' => NULL,
+ 'options' => NULL,
+ 'tags' => array(),
+ 'quantity' => 10,
+ 'element' => 0,
+ 'parameters' => array(),
),
);
- // Default view themes
+ // Default view themes.
$hooks['views_view_field'] = $base + array(
'pattern' => 'views_view_field__',
'variables' => array('view' => NULL, 'field' => NULL, 'row' => NULL),
);
$hooks['views_view_grouping'] = $base + array(
'pattern' => 'views_view_grouping__',
- 'variables' => array('view' => NULL, 'grouping' => NULL, 'grouping_level' => NULL, 'rows' => NULL, 'title' => NULL),
+ 'variables' => array(
+ 'view' => NULL,
+ 'grouping' => NULL,
+ 'grouping_level' => NULL,
+ 'rows' => NULL,
+ 'title' => NULL,
+ ),
);
$plugins = views_fetch_plugin_data();
- // Register theme functions for all style plugins
+ // Register theme functions for all style plugins.
foreach ($plugins as $type => $info) {
foreach ($info as $plugin => $def) {
if (isset($def['theme']) && (!isset($def['register theme']) || !empty($def['register theme']))) {
@@ -154,7 +206,11 @@ function views_theme($existing, $type, $theme, $path) {
$hooks['views_more'] = $base + array(
'template' => 'views-more',
'pattern' => 'views_more__',
- 'variables' => array('more_url' => NULL, 'link_text' => 'more', 'view' => NULL),
+ 'variables' => array(
+ 'more_url' => NULL,
+ 'link_text' => 'more',
+ 'view' => NULL,
+ ),
);
// Add theme suggestions which are part of modules.
@@ -169,16 +225,16 @@ function views_theme($existing, $type, $theme, $path) {
/**
* Scans a directory of a module for template files.
*
- * @param $cache
+ * @param array $cache
* The existing cache of theme hooks to test against.
- * @param $path
+ * @param string $path
* The path to search.
*
* @see drupal_find_theme_templates()
*/
function _views_find_module_templates($cache, $path) {
$templates = array();
- $regex = '/' . '\.tpl\.php' . '$' . '/';
+ $regex = '/\.tpl\.php$/';
// Because drupal_system_listing works the way it does, we check for real
// templates separately from checking for patterns.
@@ -216,11 +272,12 @@ function _views_find_module_templates($cache, $path) {
// for the purposes of searching.
$pattern = strtr($info['pattern'], '_', '-');
- $matches = preg_grep('/^'. $pattern .'/', $patterns);
+ $matches = preg_grep('/^' . $pattern . '/', $patterns);
if ($matches) {
foreach ($matches as $match) {
$file = substr($match, 0, strpos($match, '.'));
- // Put the underscores back in for the hook name and register this pattern.
+ // Put the underscores back in for the hook name and register this
+ // pattern.
$templates[strtr($file, '-', '_')] = array(
'template' => $file,
'path' => dirname($files[$match]->uri),
@@ -289,6 +346,8 @@ function views_plugin_list() {
}
/**
+ * Preprocess a node.
+ *
* A theme preprocess function to automatically allow view-based node
* templates if called from a view.
*
@@ -304,8 +363,8 @@ function views_preprocess_node(&$vars) {
if (!empty($vars['node']->view->current_display)) {
$vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->name . '__' . $vars['node']->view->current_display;
- // If a node is being rendered in a view, and the view does not have a path,
- // prevent drupal from accidentally setting the $page variable:
+ // If a node is being rendered in a view, and the view does not have a
+ // path, prevent drupal from accidentally setting the $page variable.
if ($vars['page'] && $vars['view_mode'] == 'full' && !$vars['view']->display_handler->has_path()) {
$vars['page'] = FALSE;
}
@@ -319,11 +378,14 @@ function views_preprocess_node(&$vars) {
}
/**
+ * Preprocess a comment.
+ *
* A theme preprocess function to automatically allow view-based node
* templates if called from a view.
*/
function views_preprocess_comment(&$vars) {
- // The 'view' attribute of the node is added in template_preprocess_views_view_row_comment()
+ // The 'view' attribute of the node is added in
+ // template_preprocess_views_view_row_comment().
if (!empty($vars['node']->view) && !empty($vars['node']->view->name)) {
$vars['view'] = &$vars['node']->view;
$vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['node']->view->name;
@@ -334,7 +396,7 @@ function views_preprocess_comment(&$vars) {
}
/**
- * Implement hook_permission().
+ * Implements hook_permission().
*/
function views_permission() {
return array(
@@ -352,7 +414,7 @@ function views_permission() {
}
/**
- * Implement hook_menu().
+ * Implements hook_menu().
*/
function views_menu() {
$items = array();
@@ -366,8 +428,8 @@ function views_menu() {
'type' => MENU_CALLBACK,
'file' => 'includes/ajax.inc',
);
- // Path is not admin/structure/views due to menu complications with the wildcards from
- // the generic ajax callback.
+ // Path is not admin/structure/views due to menu complications with the
+ // wildcards from the generic ajax callback.
$items['admin/views/ajax/autocomplete/user'] = array(
'page callback' => 'views_ajax_autocomplete_user',
'theme callback' => 'ajax_base_page_theme',
@@ -377,7 +439,7 @@ function views_menu() {
'file' => 'includes/ajax.inc',
);
// Define another taxonomy autocomplete because the default one of drupal
- // does not support a vid a argument anymore
+ // does not support a vid a argument anymore.
$items['admin/views/ajax/autocomplete/taxonomy'] = array(
'page callback' => 'views_ajax_autocomplete_taxonomy',
'theme callback' => 'ajax_base_page_theme',
@@ -390,7 +452,7 @@ function views_menu() {
}
/**
- * Implement hook_menu_alter().
+ * Implements hook_menu_alter().
*/
function views_menu_alter(&$callbacks) {
$our_paths = array();
@@ -399,18 +461,14 @@ function views_menu_alter(&$callbacks) {
list($view, $display_id) = $data;
$result = $view->execute_hook_menu($display_id, $callbacks);
if (is_array($result)) {
- // The menu system doesn't support having two otherwise
- // identical paths with different placeholders. So we
- // want to remove the existing items from the menu whose
- // paths would conflict with ours.
-
- // First, we must find any existing menu items that may
- // conflict. We use a regular expression because we don't
- // know what placeholders they might use. Note that we
- // first construct the regex itself by replacing %views_arg
- // in the display path, then we use this constructed regex
- // (which will be something like '#^(foo/%[^/]*/bar)$#') to
- // search through the existing paths.
+ // The menu system doesn't support having two otherwise identical paths
+ // with different placeholders. So we want to remove the existing items
+ // from the menu whose paths would conflict with ours. First, we must find
+ // any existing menu items that may conflict. We use a regular expression
+ // because we don't know what placeholders they might use. Note that we
+ // first construct the regex itself by replacing %views_arg in the display
+ // path, then we use this constructed regex (which will be something like
+ // '#^(foo/%[^/]*/bar)$#') to search through the existing paths.
$regex = '#^(' . preg_replace('#%views_arg#', '%[^/]*', implode('|', array_keys($result))) . ')$#';
$matches = preg_grep($regex, array_keys($callbacks));
@@ -431,10 +489,10 @@ function views_menu_alter(&$callbacks) {
// This item already exists, so it must be one that we added.
// We change the various callback arguments to pass an array
// of possible display IDs instead of a single ID.
- $callbacks[$path]['page arguments'][1] = (array)$callbacks[$path]['page arguments'][1];
+ $callbacks[$path]['page arguments'][1] = (array) $callbacks[$path]['page arguments'][1];
$callbacks[$path]['page arguments'][1][] = $display_id;
$callbacks[$path]['access arguments'][] = $item['access arguments'][0];
- $callbacks[$path]['load arguments'][1] = (array)$callbacks[$path]['load arguments'][1];
+ $callbacks[$path]['load arguments'][1] = (array) $callbacks[$path]['load arguments'][1];
$callbacks[$path]['load arguments'][1][] = $display_id;
}
$our_paths[$path] = TRUE;
@@ -450,22 +508,24 @@ function views_menu_alter(&$callbacks) {
}
/**
+ * Load a views argument.
+ *
* Helper function for menu loading. This will automatically be
* called in order to 'load' a views argument; primarily it
* will be used to perform validation.
*
- * @param $value
+ * @param string $value
* The actual value passed.
- * @param $name
+ * @param string $name
* The name of the view. This needs to be specified in the 'load function'
* of the menu entry.
- * @param $display_id
+ * @param string $display_id
* The display id that will be loaded for this menu item.
- * @param $index
+ * @param int $index
* The menu argument index. This counts from 1.
*/
function views_arg_load($value, $name, $display_id, $index) {
- static $views = array();
+ static $views = array();
$display_ids = is_array($display_id) ? $display_id : array($display_id);
$display_id = reset($display_ids);
@@ -521,12 +581,12 @@ function views_arg_load($value, $name, $display_id, $index) {
/**
* Page callback: Displays a page view, given a name and display id.
*
- * @param $name
+ * @param string $name
* The name of a view.
- * @param $display_id
+ * @param string $display_id
* The display id of a view.
*
- * @return
+ * @return string|int
* Either the HTML of a fully-executed view, or MENU_NOT_FOUND.
*/
function views_page($name, $display_id) {
@@ -590,8 +650,8 @@ function views_preprocess_html(&$variables) {
}
/**
-* Implements hook_preprocess_HOOK() for page.tpl.php.
-*/
+ * Implements hook_preprocess_HOOK() for page.tpl.php.
+ */
function views_preprocess_page(&$variables) {
// If the page contains a view as its main content, contextual links may have
// been attached to the page as a whole; for example, by views_page_alter().
@@ -623,7 +683,7 @@ function views_contextual_links_view_alter(&$element, $items) {
}
/**
- * Implement hook_block_info().
+ * Implements hook_block_info().
*/
function views_block_info() {
// Try to avoid instantiating all the views just to get the blocks info.
@@ -636,7 +696,7 @@ function views_block_info() {
$items = array();
$views = views_get_all_views();
foreach ($views as $view) {
- // disabled views get nothing.
+ // Disabled views get nothing.
if (!empty($view->disabled)) {
continue;
}
@@ -665,7 +725,7 @@ function views_block_info() {
// can also be 32. So for very long deltas, change to md5 hashes.
$hashes = array();
- // get the keys because we're modifying the array and we don't want to
+ // Get the keys because we're modifying the array and we don't want to
// confuse PHP too much.
$keys = array_keys($items);
foreach ($keys as $delta) {
@@ -693,11 +753,10 @@ function views_block_info() {
}
/**
- * Implement hook_block_view().
+ * Implements hook_block_view().
*/
function views_block_view($delta) {
- $start = microtime(TRUE);
- // if this is 32, this should be an md5 hash.
+ // If this is 32, this should be an md5 hash.
if (strlen($delta) == 32) {
$hashes = variable_get('views_block_hashes', array());
if (!empty($hashes[$delta])) {
@@ -732,7 +791,7 @@ function views_block_view($delta) {
return;
}
list($name, $display_id) = $explode;
- // Load the view
+ // Load the view.
if ($view = views_get_view($name)) {
if ($view->access($display_id)) {
$output = $view->execute_display($display_id);
@@ -749,18 +808,18 @@ function views_block_view($delta) {
/**
* Converts Views block content to a renderable array with contextual links.
*
- * @param $block
+ * @param array $block
* An array representing the block, with the same structure as the return
* value of hook_block_view(). This will be modified so as to force
* $block['content'] to be a renderable array, containing the optional
* '#contextual_links' property (if there are any contextual links associated
* with the block).
- * @param $view
+ * @param object $view
* The view that was used to generate the block content.
- * @param $display_id
+ * @param string $display_id
* The ID of the display within the view that was used to generate the block
* content.
- * @param $block_type
+ * @param string $block_type
* The type of the block. If it's block it's a regular views display,
* but 'special_block_-exp' exist as well.
*/
@@ -807,12 +866,12 @@ function views_add_block_contextual_links(&$block, $view, $display_id, $block_ty
* later on (for example, alter hooks which run later during the same page
* request).
*
- * @param $render_element
+ * @param array $render_element
* The renderable array to which contextual links will be added. This array
* should be suitable for passing in to drupal_render() and will normally
* contain a representation of the view display whose contextual links are
* being requested.
- * @param $location
+ * @param string $location
* The location in which the calling function intends to render the view and
* its contextual links. The core system supports three options for this
* parameter:
@@ -832,9 +891,9 @@ function views_add_block_contextual_links(&$block, $view, $display_id, $block_ty
* declare, via the 'contextual links locations' array key, which view
* displays support having their contextual links rendered in the location
* you have defined.
- * @param $view
+ * @param object $view
* The view whose contextual links will be added.
- * @param $display_id
+ * @param string $display_id
* The ID of the display within $view whose contextual links will be added.
*
* @see hook_views_plugins()
@@ -852,7 +911,7 @@ function views_add_contextual_links(&$render_element, $location, $view, $display
$plugin = views_fetch_plugin_data('display', $view->display[$display_id]->display_plugin);
// If contextual links locations are not set, provide a sane default. (To
// avoid displaying any contextual links at all, a display plugin can still
- // set 'contextual links locations' to, e.g., an empty array.)
+ // set 'contextual links locations' to, e.g., an empty array).
$plugin += array('contextual links locations' => array('view'));
// On exposed_forms blocks contextual links should always be visible.
$plugin['contextual links locations'][] = 'special_block_-exp';
@@ -894,13 +953,14 @@ function views_add_contextual_links(&$render_element, $location, $view, $display
/**
* Returns an array of language names.
*
- * This is a one to one copy of locale_language_list because we can't rely on enabled locale module.
+ * This is a one to one copy of locale_language_list because we can't rely on
+ * enabled locale module.
*
- * @param $field
- * 'name' => names in current language, localized
- * 'native' => native names
- * @param $all
- * Boolean to return all languages or only enabled ones
+ * @param string $field
+ * Either 'name' for localized names in current language or 'native' for
+ * native names.
+ * @param bool $all
+ * Boolean to return all languages or only enabled ones.
*
* @see locale_language_list()
*/
@@ -927,7 +987,7 @@ function views_flush_caches() {
}
/**
- * Implements hook_field_create_instance.
+ * Implements hook_field_create_instance().
*/
function views_field_create_instance($instance) {
cache_clear_all('*', 'cache_views', TRUE);
@@ -935,7 +995,7 @@ function views_field_create_instance($instance) {
}
/**
- * Implements hook_field_update_instance.
+ * Implements hook_field_update_instance().
*/
function views_field_update_instance($instance, $prior_instance) {
cache_clear_all('*', 'cache_views', TRUE);
@@ -943,7 +1003,7 @@ function views_field_update_instance($instance, $prior_instance) {
}
/**
- * Implements hook_field_delete_instance.
+ * Implements hook_field_delete_instance().
*/
function views_field_delete_instance($instance) {
cache_clear_all('*', 'cache_views', TRUE);
@@ -952,10 +1012,14 @@ function views_field_delete_instance($instance) {
/**
* Invalidate the views cache, forcing a rebuild on the next grab of table data.
+ *
+ * @param string $cid
+ * The cache identifier we want to clear. If no given, it will default to '*'
+ * which will clear the entire cache_views bin.
*/
-function views_invalidate_cache() {
+function views_invalidate_cache($cid = '*') {
// Clear the views cache.
- cache_clear_all('*', 'cache_views', TRUE);
+ cache_clear_all($cid, 'cache_views', TRUE);
// Clear the page and block cache.
cache_clear_all();
@@ -964,7 +1028,7 @@ function views_invalidate_cache() {
variable_set('menu_rebuild_needed', TRUE);
// Allow modules to respond to the Views cache being cleared.
- module_invoke_all('views_invalidate_cache');
+ module_invoke_all('views_invalidate_cache', $cid);
}
/**
@@ -1020,13 +1084,26 @@ function views_access() {
* permissions. If the $account argument is omitted, the current user
* is used.
*/
-function views_check_perm($perm, $account = NULL) {
- return user_access($perm, $account) || user_access('access all views', $account);
+function views_check_perm($perms, $account = NULL) {
+ // Backward compatibility to ensure also a single permission string is
+ // properly processed.
+ $perms = is_array($perms) ? $perms : array($perms);
+ if (user_access('access all views', $account)) {
+ return TRUE;
+ }
+ // Perms are handled as OR, as soon one permission allows access TRUE is
+ // returned.
+ foreach ($perms as $perm) {
+ if (user_access($perm, $account)) {
+ return TRUE;
+ }
+ }
+ return FALSE;
}
/**
* Access callback for the views_plugin_access_role access plugin.
-
+ *
* Determine if the specified user has access to a view on the basis of any of
* the requested roles. If the $account argument is omitted, the current user
* is used.
@@ -1038,10 +1115,10 @@ function views_check_roles($rids, $account = NULL) {
$roles[] = $account->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID;
return user_access('access all views', $account) || array_intersect(array_filter($rids), $roles);
}
-// ------------------------------------------------------------------
-// Functions to help identify views that are running or ran
/**
+ * Set page view.
+ *
* Set the current 'page view' that is being displayed so that it is easy
* for other modules or the theme to identify.
*/
@@ -1055,6 +1132,8 @@ function &views_set_page_view($view = NULL) {
}
/**
+ * Get page view.
+ *
* Find out what, if any, page view is currently in use. Please note that
* this returns a reference, so be careful! You can unintentionally modify the
* $view object.
@@ -1067,10 +1146,13 @@ function &views_get_page_view() {
}
/**
+ * Set current view.
+ *
* Set the current 'current view' that is being built/rendered so that it is
- * easy for other modules or items in drupal_eval to identify
+ * easy for other modules or items in drupal_eval to identify.
*
* @return view
+ * The current view.
*/
function &views_set_current_view($view = NULL) {
static $cache = NULL;
@@ -1082,24 +1164,28 @@ function &views_set_current_view($view = NULL) {
}
/**
+ * Get current view.
+ *
* Find out what, if any, current view is currently in use. Please note that
* this returns a reference, so be careful! You can unintentionally modify the
* $view object.
*
* @return view
+ * The current view.
*/
function &views_get_current_view() {
return views_set_current_view();
}
-// ------------------------------------------------------------------
-// Include file helpers
-
/**
* Include views .inc files as necessary.
*/
function views_include($file) {
- ctools_include($file, 'views');
+ static $views_path;
+ if (!isset($views_path)) {
+ $views_path = DRUPAL_ROOT . '/' . drupal_get_path('module', 'views');
+ }
+ include_once $views_path . '/includes/' . $file . '.inc';
}
/**
@@ -1136,7 +1222,7 @@ function views_get_module_apis($api = 'views', $reset = FALSE) {
function views_add_css($file) {
// We set preprocess to FALSE because we are adding the files conditionally,
// and we don't want to generate duplicate cache files.
- // TODO: at some point investigate adding some files unconditionally and
+ // @todo at some point investigate adding some files unconditionally and
// allowing preprocess.
drupal_add_css(drupal_get_path('module', 'views') . "/css/$file.css", array('preprocess' => FALSE));
}
@@ -1180,22 +1266,18 @@ function views_include_handlers($reset = FALSE) {
$finished = TRUE;
}
-// -----------------------------------------------------------------------
-// Views handler functions
-
/**
* Fetch a handler from the data cache.
*
- * @param $table
+ * @param string $table
* The name of the table this handler is from.
- * @param $field
+ * @param string $field
* The name of the field this handler is from.
- * @param $key
- * The type of handler. i.e, sort, field, argument, filter, relationship
- * @param $override
- * Override the actual handler object with this class. Used for
- * aggregation when the handler is redirected to the aggregation
- * handler.
+ * @param string $key
+ * The type of handler. i.e, sort, field, argument, filter, relationship.
+ * @param mixed $override
+ * Override the actual handler object with this class. Used for aggregation
+ * when the handler is redirected to the aggregation handler.
*
* @return views_handler
* An instance of a handler object. May be views_handler_broken.
@@ -1207,8 +1289,6 @@ function views_get_handler($table, $field, $key, $override = NULL) {
$handler = NULL;
views_include('handlers');
- // Support old views_data entries conversion.
-
// Support conversion on table level.
if (isset($data['moved to'])) {
$moved = array($data['moved to'], $field);
@@ -1226,7 +1306,7 @@ function views_get_handler($table, $field, $key, $override = NULL) {
if (!empty($moved)) {
list($moved_table, $moved_field) = $moved;
if (!empty($recursion_protection[$moved_table][$moved_field])) {
- // recursion detected!
+ // Recursion detected!
return NULL;
}
@@ -1234,7 +1314,7 @@ function views_get_handler($table, $field, $key, $override = NULL) {
$handler = views_get_handler($moved_table, $moved_field, $key, $override);
$recursion_protection = array();
if ($handler) {
- // store these values so we know what we were originally called.
+ // Store these values so we know what we were originally called.
$handler->original_table = $table;
$handler->original_field = $field;
if (empty($handler->actual_table)) {
@@ -1245,7 +1325,7 @@ function views_get_handler($table, $field, $key, $override = NULL) {
return $handler;
}
- // Set up a default handler:
+ // Set up a default handler.
if (empty($data[$field][$key]['handler'])) {
$data[$field][$key]['handler'] = 'views_handler_' . $key;
}
@@ -1261,8 +1341,9 @@ function views_get_handler($table, $field, $key, $override = NULL) {
return $handler;
}
- // DEBUG -- identify missing handlers
- vpr("Missing handler: @table @field @key", array('@table' => $table, '@field' => $field, '@key' => $key));
+ // DEBUG -- identify missing handlers.
+ $placeholders = array('@table' => $table, '@field' => $field, '@key' => $key);
+ vpr("Missing handler: @table @field @key", $placeholders);
$broken = array(
'title' => t('Broken handler @table.@field', array('@table' => $table, '@field' => $field)),
'handler' => 'views_handler_' . $key . '_broken',
@@ -1273,16 +1354,13 @@ function views_get_handler($table, $field, $key, $override = NULL) {
}
/**
- * Fetch Views' data from the cache
+ * Fetch Views' data from the cache.
*/
function views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
views_include('cache');
return _views_fetch_data($table, $move, $reset);
}
-// -----------------------------------------------------------------------
-// Views plugin functions
-
/**
* Fetch the plugin data from cache.
*/
@@ -1292,17 +1370,17 @@ function views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
}
/**
- * Fetch a list of all base tables available
+ * Fetch a list of all base tables available.
*
- * @param $type
- * Either 'display', 'style' or 'row'
- * @param $key
- * For style plugins, this is an optional type to restrict to. May be 'normal',
- * 'summary', 'feed' or others based on the neds of the display.
- * @param $base
+ * @param string $type
+ * Either 'display', 'style' or 'row'.
+ * @param string $key
+ * For style plugins, this is an optional type to restrict to. May be
+ * 'normal', 'summary', 'feed' or others based on the needs of the display.
+ * @param array $base
* An array of possible base tables.
*
- * @return
+ * @return array
* A keyed array of in the form of 'base_table' => 'Description'.
*/
function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
@@ -1324,16 +1402,16 @@ function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
asort($plugins[$type]);
return $plugins[$type];
}
- // fall-through
+
+ // Fall-through.
return array();
}
/**
- * Get a handler for a plugin
+ * Get a handler for a plugin.
*
* @return views_plugin
- *
- * The created plugin object.
+ * The created plugin object.
*/
function views_get_plugin($type, $plugin, $reset = FALSE) {
views_include('handlers');
@@ -1346,7 +1424,8 @@ function views_get_plugin($type, $plugin, $reset = FALSE) {
/**
* Load the current enabled localization plugin.
*
- * @return The name of the localization plugin.
+ * @return string
+ * The name of the localization plugin.
*/
function views_get_localization_plugin() {
$plugin = variable_get('views_localization_plugin', '');
@@ -1363,9 +1442,6 @@ function views_get_localization_plugin() {
return $plugin;
}
-// -----------------------------------------------------------------------
-// Views database functions
-
/**
* Get all view templates.
*
@@ -1406,19 +1482,20 @@ function views_new_view() {
}
/**
- * Return a list of all views and display IDs that have a particular
- * setting in their display's plugin settings.
+ * Get applicable views.
*
- * @return
- * @code
- * array(
- * array($view, $display_id),
- * array($view, $display_id),
- * );
- * @endcode
+ * Return a list of all views and display IDs that have a particular setting in
+ * their display's plugin settings.
+ *
+ * @return array
+ * An array with the following structure.
+ * array(
+ * array($view, $display_id),
+ * array($view, $display_id),
+ * );
*/
function views_get_applicable_views($type) {
- // @todo: Use a smarter flagging system so that we don't have to
+ // @todo Use a smarter flagging system so that we don't have to
// load every view for this.
$result = array();
$views = views_get_all_views();
@@ -1459,7 +1536,7 @@ function views_get_applicable_views($type) {
/**
* Return an array of all views as fully loaded $view objects.
*
- * @param $reset
+ * @param bool $reset
* If TRUE, reset the static cache forcing views to be reloaded.
*/
function views_get_all_views($reset = FALSE) {
@@ -1484,29 +1561,31 @@ function views_get_disabled_views() {
}
/**
+ * Get options array.
+ *
* Return an array of view as options array, that can be used by select,
* checkboxes and radios as #options.
*
* @param bool $views_only
- * If TRUE, only return views, not displays.
+ * If TRUE, only return views, not displays.
* @param string $filter
- * Filters the views on status. Can either be 'all' (default), 'enabled' or
- * 'disabled'
- * @param mixed $exclude_view
- * view or current display to exclude
- * either a
- * - views object (containing $exclude_view->name and $exclude_view->current_display)
- * - views name as string: e.g. my_view
- * - views name and display id (separated by ':'): e.g. my_view:default
+ * Filters the views on status. Can either be 'all' (default), 'enabled' or
+ * 'disabled'.
+ * @param mixed $exclude_view
+ * View or current display to exclude
+ * either a
+ * - views object (containing name and current_display)
+ * - views name as string: e.g. my_view
+ * - views name and display id (separated by ':'): e.g. my_view:default.
* @param bool $optgroup
- * If TRUE, returns an array with optgroups for each view (will be ignored for
- * $views_only = TRUE). Can be used by select
+ * If TRUE, returns an array with optgroups for each view (will be ignored for
+ * $views_only = TRUE). Can be used by select.
* @param bool $sort
- * If TRUE, the list of views is sorted ascending.
+ * If TRUE, the list of views is sorted ascending.
*
* @return array
- * an associative array for use in select.
- * - key: view name and display id separated by ':', or the view name only
+ * An associative array for use in select.
+ * - key: view name and display id separated by ':', or the view name only
*/
function views_get_views_as_options($views_only = FALSE, $filter = 'all', $exclude_view = NULL, $optgroup = FALSE, $sort = FALSE) {
@@ -1518,6 +1597,7 @@ function views_get_views_as_options($views_only = FALSE, $filter = 'all', $exclu
$func = "views_get_{$filter}_views";
$views = $func();
break;
+
default:
return array();
}
@@ -1582,10 +1662,11 @@ function views_view_is_disabled($view) {
* isn't called 'views_load()' primarily because it might get a view
* from the default views which aren't technically loaded from the database.
*
- * @param $name
+ * @param string $name
* The name of the view.
- * @param $reset
+ * @param bool $reset
* If TRUE, reset this entry in the load cache.
+ *
* @return view
* A reference to the $view object. Use $reset if you're sure you want
* a fresh one.
@@ -1691,22 +1772,19 @@ function views_export_status($view, $status) {
views_invalidate_cache();
}
-// ------------------------------------------------------------------
-// Views debug helper functions
-
/**
* Provide debug output for Views.
*
* This relies on devel.module
* or on the debug() function if you use a simpletest.
*
- * @param $message
+ * @param mixed $message
* The message/variable which should be debugged.
* This either could be
* * an array/object which is converted to pretty output
- * * a translation source string which is used together with the parameter placeholders.
- *
- * @param $placeholder
+ * * a translation source string which is used together with the parameter
+ * placeholders.
+ * @param array $placeholders
* The placeholders which are used for the translation source string.
*/
function views_debug($message, $placeholders = array()) {
@@ -1719,7 +1797,7 @@ function views_debug($message, $placeholders = array()) {
$output = $message;
watchdog('views_logging', $output, $placeholders);
}
- else if ($devel_region == 'drupal_debug') {
+ elseif ($devel_region == 'drupal_debug') {
$output = empty($output) ? t($message, $placeholders) : $output;
dd($output);
}
@@ -1735,14 +1813,14 @@ function views_debug($message, $placeholders = array()) {
}
/**
- * Shortcut to views_debug()
+ * Shortcut to views_debug().
*/
function vpr($message, $placeholders = array()) {
views_debug($message, $placeholders);
}
/**
- * Debug messages
+ * Debug messages.
*/
function vsm($message) {
if (module_exists('devel')) {
@@ -1753,7 +1831,8 @@ function vsm($message) {
function views_trace() {
$message = '';
foreach (debug_backtrace() as $item) {
- if (!empty($item['file']) && !in_array($item['function'], array('vsm_trace', 'vpr_trace', 'views_trace'))) {
+ $traces = array('vsm_trace', 'vpr_trace', 'views_trace');
+ if (!empty($item['file']) && !in_array($item['function'], $traces)) {
$message .= basename($item['file']) . ": " . (empty($item['class']) ? '' : ($item['class'] . '->')) . "$item[function] line $item[line]" . "\n";
}
}
@@ -1768,10 +1847,9 @@ function vpr_trace() {
dpr(views_trace());
}
-// ------------------------------------------------------------------
-// Views form (View with form elements)
-
/**
+ * Determine whether the view has form elements.
+ *
* Returns TRUE if the passed-in view contains handlers with views form
* implementations, FALSE otherwise.
*/
@@ -1793,6 +1871,7 @@ function views_view_has_form_elements($view) {
/**
* This is the entry function. Just gets the form for the current step.
+ *
* The form is always assumed to be multistep, even if it has only one
* step (the default 'views_form_views_form' step). That way it is actually
* possible for modules to have a multistep form if they need to.
@@ -1820,6 +1899,7 @@ function views_form($form, &$form_state, $view, $output) {
/**
* Callback for the main step of a Views form.
+ *
* Invoked by views_form().
*/
function views_form_views_form($form, &$form_state, $view, $output) {
@@ -1909,6 +1989,7 @@ function views_form_views_form($form, &$form_state, $view, $output) {
/**
* Validate handler for the first step of the views form.
+ *
* Calls any existing views_form_validate functions located
* on the views fields.
*/
@@ -1934,6 +2015,7 @@ function views_form_views_form_validate($form, &$form_state) {
/**
* Submit handler for the first step of the views form.
+ *
* Calls any existing views_form_submit functions located
* on the views fields.
*/
@@ -1957,9 +2039,6 @@ function views_form_views_form_submit($form, &$form_state) {
}
}
-// ------------------------------------------------------------------
-// Exposed widgets form
-
/**
* Form builder for the exposed widgets form.
*
@@ -1969,7 +2048,8 @@ function views_exposed_form($form, &$form_state) {
// Don't show the form when batch operations are in progress.
if ($batch = batch_get() && isset($batch['current_set'])) {
return array(
- // Set the theme callback to be nothing to avoid errors in template_preprocess_views_exposed_form().
+ // Set the theme callback to be nothing to avoid errors in
+ // template_preprocess_views_exposed_form().
'#theme' => '',
);
}
@@ -1984,7 +2064,7 @@ function views_exposed_form($form, &$form_state) {
// Let form plugins know this is for exposed widgets.
$form_state['exposed'] = TRUE;
- // Check if the form was already created
+ // Check if the form was already created.
if ($cache = views_exposed_form_cache($view->name, $view->current_display)) {
return $cache;
}
@@ -2021,8 +2101,9 @@ function views_exposed_form($form, &$form_state) {
}
}
+ // Form submit, #name is an empty string to prevent showing up in $_GET.
$form['submit'] = array(
- '#name' => '', // prevent from showing up in $_GET.
+ '#name' => '',
'#type' => 'submit',
'#value' => t('Apply'),
'#id' => drupal_html_id('edit-submit-' . $view->name),
@@ -2031,7 +2112,6 @@ function views_exposed_form($form, &$form_state) {
$form['#action'] = url($view->display_handler->get_url());
$form['#theme'] = views_theme_functions('views_exposed_form', $view, $display);
$form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->name) . '-' . check_plain($display->id));
-// $form['#attributes']['class'] = array('views-exposed-form');
// If using AJAX, we need the form plugin.
if ($view->use_ajax) {
@@ -2042,14 +2122,14 @@ function views_exposed_form($form, &$form_state) {
$exposed_form_plugin = $form_state['exposed_form_plugin'];
$exposed_form_plugin->exposed_form_alter($form, $form_state);
- // Save the form
+ // Save the form.
views_exposed_form_cache($view->name, $view->current_display, $form);
return $form;
}
/**
- * Implement hook_form_alter for the exposed form.
+ * Implements hook_form_alter() for views_exposed_form().
*
* Since the exposed form is a GET form, we don't want it to send a wide
* variety of information.
@@ -2061,7 +2141,7 @@ function views_form_views_exposed_form_alter(&$form, &$form_state) {
}
/**
- * Validate handler for exposed filters
+ * Validate handler for exposed filters.
*/
function views_exposed_form_validate(&$form, &$form_state) {
foreach (array('field', 'filter') as $type) {
@@ -2075,7 +2155,7 @@ function views_exposed_form_validate(&$form, &$form_state) {
}
/**
- * Submit handler for exposed filters
+ * Submit handler for exposed filters.
*/
function views_exposed_form_submit(&$form, &$form_state) {
foreach (array('field', 'filter') as $type) {
@@ -2087,8 +2167,16 @@ function views_exposed_form_submit(&$form, &$form_state) {
$form_state['view']->exposed_data = $form_state['values'];
$form_state['view']->exposed_raw_input = array();
-
- $exclude = array('q', 'submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', '', 'reset');
+ $exclude = array(
+ 'q',
+ 'submit',
+ 'form_build_id',
+ 'form_id',
+ 'form_token',
+ 'exposed_form_plugin',
+ '',
+ 'reset',
+ );
$exposed_form_plugin = $form_state['exposed_form_plugin'];
$exposed_form_plugin->exposed_form_submit($form, $form_state, $exclude);
@@ -2102,13 +2190,14 @@ function views_exposed_form_submit(&$form, &$form_state) {
/**
* Save the Views exposed form for later use.
*
- * @param $views_name
- * String. The views name.
- * @param $display_name
- * String. The current view display name.
- * @param $form_output
- * Array (optional). The form structure. Only needed when inserting the value.
- * @return
+ * @param string $views_name
+ * The views name.
+ * @param string $display_name
+ * The current view display name.
+ * @param array $form_output
+ * An optional form structure. Only needed when inserting the value.
+ *
+ * @return array|bool
* Array. The form structure, if any. Otherwise, return FALSE.
*/
function views_exposed_form_cache($views_name, $display_name, $form_output = NULL) {
@@ -2116,19 +2205,15 @@ function views_exposed_form_cache($views_name, $display_name, $form_output = NUL
// be cleared between each test.
$views_exposed = &drupal_static(__FUNCTION__);
- // Save the form output
+ // Save the form output.
if (!empty($form_output)) {
$views_exposed[$views_name][$display_name] = $form_output;
- return;
}
- // Return the form output, if any
+ // Return the form output, if any.
return empty($views_exposed[$views_name][$display_name]) ? FALSE : $views_exposed[$views_name][$display_name];
}
-// ------------------------------------------------------------------
-// Misc helpers
-
/**
* Build a list of theme function names for use most everywhere.
*/
@@ -2213,9 +2298,9 @@ function _views_query_tag_alter_condition(QueryAlterableInterface $query, &$cond
* to do that, you will need to do what this function does manually, by
* loading the view, getting the preview and then getting $view->get_title().
*
- * @param $name
+ * @param string $name
* The name of the view to embed.
- * @param $display_id
+ * @param string $display_id
* The display id to embed. If unsure, use 'default', as it will always be
* valid. But things like 'page' or 'block' should work here.
* @param ...
@@ -2223,9 +2308,11 @@ function _views_query_tag_alter_condition(QueryAlterableInterface $query, &$cond
*/
function views_embed_view($name, $display_id = 'default') {
$args = func_get_args();
- array_shift($args); // remove $name
+ // Remove $name.
+ array_shift($args);
if (count($args)) {
- array_shift($args); // remove $display_id
+ // Remove $display_id.
+ array_shift($args);
}
$view = views_get_view($name);
@@ -2250,14 +2337,17 @@ function views_embed_view($name, $display_id = 'default') {
* Everything after #views-tab- is the display ID, e.g. page_1.
* @param ...
* Any additional parameters will be passed as arguments.
+ *
* @return array
* An array containing an object for each view item.
*/
function views_get_view_result($name, $display_id = NULL) {
$args = func_get_args();
- array_shift($args); // remove $name
+ // Remove $name.
+ array_shift($args);
if (count($args)) {
- array_shift($args); // remove $display_id
+ // Remove $display_id.
+ array_shift($args);
}
$view = views_get_view($name);
@@ -2322,22 +2412,28 @@ function views_var_export($var, $prefix = '', $init = TRUE) {
}
/**
- * Prepare a string for use as a valid CSS identifier (element, class or ID name).
+ * Prepare a string for use as a valid CSS identifier.
+ *
* This function is similar to a core version but with more sane filter values.
- *
* http://www.w3.org/TR/CSS21/syndata.html#characters shows the syntax for valid
- * CSS identifiers (including element names, classes, and IDs in selectors.)
+ * CSS identifiers (including element names, classes, and IDs in selectors).
*
- * @param $identifier
+ * @param string $identifier
* The identifier to clean.
- * @param $filter
+ * @param array $filter
* An array of string replacements to use on the identifier.
- * @return
+ *
+ * @return string
* The cleaned identifier.
*
* @see drupal_clean_css_identifier()
*/
-function views_clean_css_identifier($identifier, $filter = array(' ' => '-', '/' => '-', '[' => '-', ']' => '')) {
+function views_clean_css_identifier($identifier, $filter = array(
+ ' ' => '-',
+ '/' => '-',
+ '[' => '-',
+ ']' => '',
+)) {
// By default, we filter using Drupal's coding standards.
$identifier = strtr($identifier, $filter);
@@ -2355,19 +2451,19 @@ function views_clean_css_identifier($identifier, $filter = array(' ' => '-', '/'
}
/**
- * Implement hook_views_exportables().
+ * Implements hook_views_exportables().
*/
function views_views_exportables($op = 'list', $views = NULL, $name = 'foo') {
$all_views = views_get_all_views();
if ($op == 'list') {
foreach ($all_views as $name => $view) {
- // in list, $views is a list of tags.
+ // In list, $views is a list of tags.
if (empty($views) || in_array($view->tag, $views)) {
$return[$name] = array(
'name' => check_plain($name),
'desc' => check_plain($view->description),
- 'tag' => check_plain($view->tag)
+ 'tag' => check_plain($view->tag),
);
}
}
@@ -2394,7 +2490,7 @@ function views_views_exportables($op = 'list', $views = NULL, $name = 'foo') {
}
/**
- * #process callback to see if we need to check_plain() the options.
+ * Process callback to see if we need to check_plain() the options.
*
* Since FAPI is inconsistent, the #options are sanitized for you in all cases
* _except_ checkboxes. We have form elements that are sometimes 'select' and
@@ -2412,19 +2508,18 @@ function views_process_check_options($element, &$form_state) {
/**
* Trim the field down to the specified length.
*
- * @param $alter
- * - max_length: Maximum lenght of the string, the rest gets truncated.
+ * @param array $alter
+ * - max_length: Maximum length of the string, the rest gets truncated.
* - word_boundary: Trim only on a word boundary.
* - ellipsis: Show an ellipsis (...) at the end of the trimmed string.
* - html: Take sure that the html is correct.
- *
- * @param $value
+ * @param string $value
* The string which should be trimmed.
*/
function views_trim_text($alter, $value) {
if (drupal_strlen($value) > $alter['max_length']) {
$value = drupal_substr($value, 0, $alter['max_length']);
- // TODO: replace this with cleanstring of ctools
+ // @todo Replace this with cleanstring of CTools.
if (!empty($alter['word_boundary'])) {
$regex = "(.*)\b.+";
if (function_exists('mb_ereg')) {
@@ -2438,7 +2533,7 @@ function views_trim_text($alter, $value) {
$value = $matches[1];
}
}
- // Remove scraps of HTML entities from the end of a strings
+ // Remove scraps of HTML entities from the end of a strings.
$value = rtrim(preg_replace('/(?:<(?!.+>)|&(?!.+;)).*$/us', '', $value));
if (!empty($alter['ellipsis'])) {
@@ -2461,7 +2556,7 @@ function views_array_key_plus($array) {
$keys = array_keys($array);
rsort($keys);
foreach ($keys as $key) {
- $array[$key+1] = $array[$key];
+ $array[$key + 1] = $array[$key];
unset($array[$key]);
}
asort($array);
@@ -2469,14 +2564,15 @@ function views_array_key_plus($array) {
}
/**
- * Report to CTools that we use hook_views_api instead of hook_ctools_plugin_api()
+ * Implements hook_ctools_plugin_api_hook_name().
+ *
+ * Report to CTools that we use hook_views_api instead of
+ * hook_ctools_plugin_api().
*/
function views_ctools_plugin_api_hook_name() {
return 'views_api';
}
-// Declare API compatibility on behalf of core modules:
-
/**
* Implements hook_views_api().
*
@@ -2484,84 +2580,179 @@ function views_ctools_plugin_api_hook_name() {
*/
function views_views_api() {
return array(
- // in your modules do *not* use views_api_version()!!!
+ // In your modules do *not* use views_api_version()!!!
'api' => views_api_version(),
'path' => drupal_get_path('module', 'views') . '/modules',
);
}
if (!function_exists('aggregator_views_api')) {
- function aggregator_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Aggregator module.
+ */
+ function aggregator_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('book_views_api')) {
- function book_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Book module.
+ */
+ function book_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('comment_views_api')) {
- function comment_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Comment module.
+ */
+ function comment_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('field_views_api')) {
- function field_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Field module.
+ */
+ function field_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('file_views_api')) {
- function file_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the File module.
+ */
+ function file_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('filter_views_api')) {
- function filter_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Filter module.
+ */
+ function filter_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('image_views_api')) {
- function image_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Image module.
+ */
+ function image_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('locale_views_api')) {
- function locale_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Locale module.
+ */
+ function locale_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('node_views_api')) {
- function node_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Node module.
+ */
+ function node_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('poll_views_api')) {
- function poll_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Poll module.
+ */
+ function poll_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('profile_views_api')) {
- function profile_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Profile module.
+ */
+ function profile_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('search_views_api')) {
- function search_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Search module.
+ */
+ function search_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('statistics_views_api')) {
- function statistics_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Statistics module.
+ */
+ function statistics_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('system_views_api')) {
- function system_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the System module.
+ */
+ function system_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('tracker_views_api')) {
- function tracker_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Tracker module.
+ */
+ function tracker_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('taxonomy_views_api')) {
- function taxonomy_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Taxonomy module.
+ */
+ function taxonomy_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('translation_views_api')) {
- function translation_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Translation module.
+ */
+ function translation_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('user_views_api')) {
- function user_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the User module.
+ */
+ function user_views_api() {
+ return views_views_api();
+ }
}
if (!function_exists('contact_views_api')) {
- function contact_views_api() { return views_views_api(); }
+ /**
+ * Provide Views integration for the Contact module.
+ */
+ function contact_views_api() {
+ return views_views_api();
+ }
}
diff --git a/sites/all/modules/contrib/views/views/views.tokens.inc b/sites/all/modules/contrib/views/views/views.tokens.inc
index cc45b5c..bdd0da1 100644
--- a/sites/all/modules/contrib/views/views/views.tokens.inc
+++ b/sites/all/modules/contrib/views/views/views.tokens.inc
@@ -48,7 +48,6 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
$url_options['language'] = $options['language'];
}
$sanitize = !empty($options['sanitize']);
- $langcode = isset($options['language']) ? $options['language']->language : NULL;
$replacements = array();
diff --git a/sites/all/modules/contrib/views/views/views_ui.info b/sites/all/modules/contrib/views/views/views_ui.info
index d8be6e4..3053db9 100644
--- a/sites/all/modules/contrib/views/views/views_ui.info
+++ b/sites/all/modules/contrib/views/views/views_ui.info
@@ -4,12 +4,12 @@ package = Views
core = 7.x
configure = admin/structure/views
dependencies[] = views
+# @codingStandardsIgnoreLine
files[] = views_ui.module
files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2019-04-03
+version = "7.x-3.22"
core = "7.x"
project = "views"
-datestamp = "1423648085"
-
+datestamp = "1554307093"
diff --git a/sites/all/modules/contrib/views/views/views_ui.module b/sites/all/modules/contrib/views/views/views_ui.module
index 5366f77..387e669 100644
--- a/sites/all/modules/contrib/views/views/views_ui.module
+++ b/sites/all/modules/contrib/views/views/views_ui.module
@@ -5,6 +5,29 @@
* Provide structure for the administrative interface to Views.
*/
+/**
+ * Implements hook_help().
+ */
+function views_ui_help($path, $arg) {
+ switch ($path) {
+ case 'admin/help#views_ui':
+ $output = '';
+ $output .= '' . t('About') . '
';
+ $output .= '' . t('The Views UI module provides an interface for managing views for the Views module. For more information, see the online documentation for the Views UI module.', array('@views' => 'https://www.drupal.org/documentation/modules/views')) . '
';
+ $output .= '' . t('Uses') . '
';
+ $output .= '';
+ $output .= '- ' . t('Creating and managing views') . '
';
+ $output .= '- ' . t('Views can be created from the Views list page by using the "Add view" action. Existing views can be managed from the Views list page by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".') . '
';
+
+ $output .= '- ' . t('Enabling and disabling views') . '
';
+ $output .= '- ' . t('Views can be enabled or disabled from the Views list page. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.') . '
';
+
+ $output .= '- ' . t('Exporting and importing views') . '
';
+ $output .= '- ' . t('Views can be exported and imported as configuration files by using the Configuration Manager module.') . '
';
+ return $output;
+ }
+}
+
/**
* Implements hook_menu().
*/
@@ -96,7 +119,6 @@ function views_ui_menu() {
) + $base;
// Additional pages for acting on a View.
-
$items['admin/structure/views/view/%views_ui_cache/break-lock'] = array(
'title' => 'Break lock',
'page callback' => 'drupal_get_form',
@@ -143,7 +165,7 @@ function views_ui_menu() {
'type' => MENU_CALLBACK,
) + $base;
- // A page in the Reports section to show usage of fields in all views
+ // A page in the Reports section to show usage of fields in all views.
$items['admin/reports/fields/list'] = array(
'title' => 'List',
'type' => MENU_DEFAULT_LOCAL_TASK,
@@ -175,9 +197,17 @@ function views_ui_theme() {
require_once DRUPAL_ROOT . "/$path/includes/admin.inc";
return array(
- // edit a view
+ // Edit a view.
'views_ui_display_tab_setting' => array(
- 'variables' => array('description' => '', 'link' => '', 'settings_links' => array(), 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => array()),
+ 'variables' => array(
+ 'description' => '',
+ 'link' => '',
+ 'settings_links' => array(),
+ 'overridden' => FALSE,
+ 'defaulted' => FALSE,
+ 'description_separator' => TRUE,
+ 'class' => array(),
+ ),
'template' => 'views-ui-display-tab-setting',
'path' => "$path/theme",
),
@@ -186,11 +216,6 @@ function views_ui_theme() {
'template' => 'views-ui-display-tab-bucket',
'path' => "$path/theme",
),
- 'views_ui_edit_item' => array(
- 'variables' => array('type' => NULL, 'view' => NULL, 'display' => NULL, 'no_fields' => FALSE),
- 'template' => 'views-ui-edit-item',
- 'path' => "$path/theme",
- ),
'views_ui_rearrange_form' => array(
'render element' => 'form',
),
@@ -203,7 +228,7 @@ function views_ui_theme() {
'file' => 'includes/admin.inc',
),
- // list views
+ // List views.
'views_ui_view_info' => array(
'variables' => array('view' => NULL, 'base' => NULL),
'file' => "includes/admin.inc",
@@ -215,7 +240,7 @@ function views_ui_theme() {
'file' => 'includes/admin.inc',
),
- // tab themes
+ // Tab themes.
'views_tabset' => array(
'variables' => array('tabs' => NULL),
),
@@ -227,15 +252,19 @@ function views_ui_theme() {
'file' => 'includes/admin.inc',
),
-
- // On behalf of a plugin
+ // On behalf of a plugin.
'views_ui_style_plugin_table' => array(
'render element' => 'form',
),
// When previewing a view.
'views_ui_view_preview_section' => array(
- 'variables' => array('view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''),
+ 'variables' => array(
+ 'view' => NULL,
+ 'section' => NULL,
+ 'content' => NULL,
+ 'links' => '',
+ ),
),
// Generic container wrapper, to use instead of theme_container when an id
@@ -248,7 +277,7 @@ function views_ui_theme() {
}
/**
- * Impements hook_custom_theme()
+ * Implements hook_custom_theme().
*/
function views_ui_custom_theme() {
$theme = variable_get('views_ui_custom_theme', '_default');
@@ -279,10 +308,10 @@ function views_ui_edit_page_title($view) {
/**
* Specialized menu callback to load a view and check its locked status.
*
- * @param $name
+ * @param string $name
* The machine name of the view.
*
- * @return
+ * @return object
* The view object, with a "locked" property indicating whether or not
* someone else is already editing the view.
*/
@@ -320,6 +349,8 @@ function views_ui_cache_load($name) {
}
/**
+ * Cache set.
+ *
* Specialized cache function to add a flag to our view, include an appropriate
* include, and cache more easily.
*/
@@ -329,7 +360,8 @@ function views_ui_cache_set(&$view) {
return;
}
ctools_include('object-cache');
- $view->changed = TRUE; // let any future object know that this view has changed.
+ // Let any future object know that this view has changed.
+ $view->changed = TRUE;
if (isset($view->current_display)) {
// Add the knowledge of the changed display, too.
@@ -337,7 +369,7 @@ function views_ui_cache_set(&$view) {
unset($view->current_display);
}
- // Unset handlers; we don't want to write these into the cache
+ // Unset handlers; we don't want to write these into the cache.
unset($view->display_handler);
unset($view->default_display);
$view->query = NULL;
@@ -348,8 +380,9 @@ function views_ui_cache_set(&$view) {
ctools_object_cache_set('view', $view->name, $view);
}
-
/**
+ * Default Load.
+ *
* Specialized menu callback to load a view that is only a default
* view.
*/
@@ -369,7 +402,21 @@ function views_ui_preprocess_views_view(&$vars) {
$view = $vars['view'];
if (!empty($view->views_ui_context) && module_exists('contextual')) {
$view->hide_admin_links = TRUE;
- foreach (array('title', 'header', 'exposed', 'rows', 'pager', 'more', 'footer', 'empty', 'attachment_after', 'attachment_before') as $section) {
+
+ $sections = array(
+ 'title',
+ 'header',
+ 'exposed',
+ 'rows',
+ 'pager',
+ 'more',
+ 'footer',
+ 'empty',
+ 'attachment_after',
+ 'attachment_before',
+ );
+
+ foreach ($sections as $section) {
if (!empty($vars[$section])) {
$vars[$section] = array(
'#theme' => 'views_ui_view_preview_section',
@@ -388,8 +435,7 @@ function views_ui_preprocess_views_view(&$vars) {
/**
* Theme preprocess for theme_views_ui_view_preview_section().
*
- * @TODO
- * Perhaps move this to includes/admin.inc or theme/theme.inc
+ * @todo Perhaps move this to includes/admin.inc or theme/theme.inc.
*/
function template_preprocess_views_ui_view_preview_section(&$vars) {
switch ($vars['section']) {
@@ -397,42 +443,51 @@ function template_preprocess_views_ui_view_preview_section(&$vars) {
$vars['title'] = t('Title');
$links = views_ui_view_preview_section_display_category_links($vars['view'], 'title', $vars['title']);
break;
+
case 'header':
$vars['title'] = t('Header');
$links = views_ui_view_preview_section_handler_links($vars['view'], $vars['section']);
break;
+
case 'empty':
$vars['title'] = t('No results behavior');
$links = views_ui_view_preview_section_handler_links($vars['view'], $vars['section']);
break;
+
case 'exposed':
// @todo Sorts can be exposed too, so we may need a better title.
$vars['title'] = t('Exposed Filters');
$links = views_ui_view_preview_section_display_category_links($vars['view'], 'exposed_form_options', $vars['title']);
break;
+
case 'rows':
// @todo The title needs to depend on what is being viewed.
$vars['title'] = t('Content');
$links = views_ui_view_preview_section_rows_links($vars['view']);
break;
+
case 'pager':
$vars['title'] = t('Pager');
$links = views_ui_view_preview_section_display_category_links($vars['view'], 'pager_options', $vars['title']);
break;
+
case 'more':
$vars['title'] = t('More');
$links = views_ui_view_preview_section_display_category_links($vars['view'], 'use_more', $vars['title']);
break;
+
case 'footer':
$vars['title'] = t('Footer');
$links = views_ui_view_preview_section_handler_links($vars['view'], $vars['section']);
break;
+
case 'attachment_before':
- // @todo: Add links to the attachment configuration page.
+ // @todo Add links to the attachment configuration page.
$vars['title'] = t('Attachment before');
break;
+
case 'attachment_after':
- // @todo: Add links to the attachment configuration page.
+ // @todo Add links to the attachment configuration page.
$vars['title'] = t('Attachment after');
break;
}
@@ -459,18 +514,17 @@ function template_preprocess_views_ui_view_preview_section(&$vars) {
function theme_views_ui_view_preview_section($vars) {
return '' . $vars['title'] . '
'
. $vars['links']
- . ''. $vars['content'] . '';
+ . '' . $vars['content'] . '';
}
/**
* Returns contextual links for each handler of a certain section.
*
- * @TODO
- * Bring in relationships
- * Refactor this function to use much stuff of views_ui_edit_form_get_bucket.
- *
- * @param $title
+ * @param string $title
* Add a bolded title of this section.
+ *
+ * @todo Bring in relationships.
+ * @todo Refactor this function to use much of views_ui_edit_form_get_bucket.
*/
function views_ui_view_preview_section_handler_links($view, $type, $title = FALSE) {
$display = $view->display_handler->display;
@@ -521,8 +575,9 @@ function views_ui_view_preview_section_display_category_links($view, $type, $tit
* Returns all contextual links for the main content part of the view.
*/
function views_ui_view_preview_section_rows_links($view) {
- $display = $view->display_handler->display;
+
$links = array();
+
$links = array_merge($links, views_ui_view_preview_section_handler_links($view, 'filter', TRUE));
$links = array_merge($links, views_ui_view_preview_section_handler_links($view, 'field', TRUE));
$links = array_merge($links, views_ui_view_preview_section_handler_links($view, 'sort', TRUE));
@@ -532,7 +587,6 @@ function views_ui_view_preview_section_rows_links($view) {
return $links;
}
-
/**
* Implments hook_ctools_plugin_directory().
*
@@ -547,10 +601,10 @@ function views_ui_ctools_plugin_directory($module, $plugin) {
/**
* Fetch metadata on a specific views ui wizard plugin.
*
- * @param $wizard_type
+ * @param string $wizard_type
* Name of a wizard, or name of a base table.
*
- * @return
+ * @return array
* An array with information about the requested wizard type.
*/
function views_ui_get_wizard($wizard_type) {
@@ -576,14 +630,14 @@ function views_ui_get_wizard($wizard_type) {
/**
* Fetch metadata for all content_type plugins.
*
- * @return
+ * @return array
* An array of arrays with information about all available views wizards.
*/
function views_ui_get_wizards() {
ctools_include('plugins');
$wizard_plugins = ctools_get_plugins('views_ui', 'views_wizard');
$wizard_tables = array();
- foreach ($wizard_plugins as $name => $info) {
+ foreach ($wizard_plugins as $info) {
$wizard_tables[$info['base_table']] = TRUE;
}
$base_tables = views_fetch_base_tables();
@@ -604,7 +658,7 @@ function views_ui_get_wizards() {
/**
* Helper function to define the default values for a Views wizard plugin.
*
- * @return
+ * @return array
* An array of defaults for a views wizard.
*/
function views_ui_views_wizard_defaults() {
@@ -612,7 +666,7 @@ function views_ui_views_wizard_defaults() {
// The children may, for example, be a different variant for each node type.
'get children' => NULL,
'get child' => NULL,
- // title and base table must be populated. They are empty here just
+ // Title and base table must be populated. They are empty here just
// so they are documented.
'title' => '',
'base_table' => NULL,
@@ -641,6 +695,9 @@ function views_ui_ctools_plugin_type() {
);
}
+/**
+ * Get form wizard instance.
+ */
function views_ui_get_form_wizard_instance($wizard) {
if (isset($wizard['form_wizard_class']['class'])) {
$class = $wizard['form_wizard_class']['class'];
@@ -710,7 +767,7 @@ function views_ui_contextual_links_suppress($set = NULL) {
* @see views_ui_contextual_links_suppress_pop()
*/
function views_ui_contextual_links_suppress_push() {
- views_ui_contextual_links_suppress(((int) views_ui_contextual_links_suppress())+1);
+ views_ui_contextual_links_suppress(((int) views_ui_contextual_links_suppress()) + 1);
}
/**
@@ -719,13 +776,16 @@ function views_ui_contextual_links_suppress_push() {
* @see views_ui_contextual_links_suppress_push()
*/
function views_ui_contextual_links_suppress_pop() {
- views_ui_contextual_links_suppress(((int) views_ui_contextual_links_suppress())-1);
+ views_ui_contextual_links_suppress(((int) views_ui_contextual_links_suppress()) - 1);
}
/**
- * Menu callback; handles AJAX form submissions similar to ajax_form_callback(), but can be used for uncached forms.
+ * Menu callback.
*
- * ajax_form_callback(), the menu callback for the system/ajax path, requires
+ * Handles AJAX form submissions similar to ajax_form_callback(), but can be
+ * used for uncached forms.
+ *
+ * Ajax_form_callback(), the menu callback for the system/ajax path, requires
* the form to be retrievable from the form cache, because it lacks a trusted
* $form_id argument with which to call drupal_retrieve_form(). When AJAX is
* wanted on a non-cacheable form, #ajax['path'] can be set to a path whose
@@ -765,16 +825,18 @@ function views_ui_ajax_get_form($form_id) {
return $callback($form, $form_state);
}
}
-// @todo move these when we can
+/**
+ * @todo move these when we can
+ */
/**
* Helper function to get a list of paths assigned to a view.
*
- * @param $view
+ * @param object $view
* The view.
*
- * @return
+ * @return array
* An array of links to this view's display paths.
*/
function _views_ui_get_paths($view) {
@@ -783,14 +845,14 @@ function _views_ui_get_paths($view) {
$all_paths[] = t('Edit this view to add a display.');
}
else {
- $view->init_display(); // Make sure all the handlers are set up
+ // Make sure all the handlers are set up.
+ $view->init_display();
foreach ($view->display as $display) {
if (!empty($display->handler) && $display->handler->has_path()) {
$one_path = $display->handler->get_option('path');
- if (empty($path_sort)) {
- $path_sort = strtolower($one_path);
- }
+
if (empty($view->disabled) && strpos($one_path, '%') === FALSE) {
+ // @codingStandardsIgnoreLine
$all_paths[] = l('/' . $one_path, $one_path);
}
else {
@@ -806,10 +868,10 @@ function _views_ui_get_paths($view) {
/**
* Helper function to get a list of displays included in a view.
*
- * @param $view
+ * @param object $view
* The view.
*
- * @return
+ * @return array
* An array of display types that this view includes.
*/
function _views_ui_get_displays_list($view) {
@@ -828,21 +890,22 @@ function _views_ui_get_displays_list($view) {
}
/**
- * This is part of a patch to address a jQueryUI bug. The bug is responsible
- * for the inability to scroll a page when a modal dialog is active. If the content
- * of the dialog extends beyond the bottom of the viewport, the user is only able
- * to scroll with a mousewheel or up/down keyboard keys.
+ * This is part of a patch to address a jQueryUI bug.
+ *
+ * The bug is responsible
+ * for the inability to scroll a page when a modal dialog is active. If the
+ * content of the dialog extends beyond the bottom of the viewport, the user is
+ * only able to scroll with a mousewheel or up/down keyboard keys.
*
* @see http://bugs.jqueryui.com/ticket/4671
* @see https://bugs.webkit.org/show_bug.cgi?id=19033
* @see /js/jquery.ui.dialog.patch.js
* @see /js/jquery.ui.dialog.min.js
*
- * The javascript patch overwrites the $.ui.dialog.overlay.events object to remove
- * the mousedown, mouseup and click events from the list of events that are bound
- * in $.ui.dialog.overlay.create.
+ * The javascript patch overwrites the $.ui.dialog.overlay.events object to
+ * remove the mousedown, mouseup and click events from the list of events that
+ * are bound in $.ui.dialog.overlay.create.
*/
-
function views_ui_library_alter(&$libraries, $module) {
if ($module == 'system' && isset($libraries['ui.dialog'])) {
// Only apply the fix, if we don't have an up to date jQueryUI version.
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/LICENSE.txt b/sites/all/modules/contrib/views/views_bulk_operations/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc
index 7667e49..ef36acd 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc
@@ -3,10 +3,14 @@
/**
* @file
* Provides an action for creating a zip archive of selected files.
+ *
* An entry in the {file_managed} table is created for the newly created archive,
* and it is marked as permanent or temporary based on the operation settings.
*/
+/**
+ * Implements hook_action_info().
+ */
function views_bulk_operations_archive_action_info() {
$actions = array();
if (function_exists('zip_open')) {
@@ -18,6 +22,7 @@ function views_bulk_operations_archive_action_info() {
// "Create an advanced action" dropdown on admin/config/system/actions.
'configurable' => FALSE,
'vbo_configurable' => TRUE,
+ 'behavior' => array('views_property'),
'triggers' => array('any'),
);
}
@@ -70,6 +75,10 @@ function views_bulk_operations_archive_action($file, $context) {
$archive_file->filemime = file_get_mimetype($destination);
$archive_file->uid = $user->uid;
$archive_file->status = $context['settings']['temporary'] ? FALSE : FILE_STATUS_PERMANENT;
+ // Clear filesize() cache to avoid private file system differences in
+ // filesize.
+ // @see https://www.drupal.org/node/2743999
+ clearstatcache();
file_save($archive_file);
$url = file_create_url($archive_file->uri);
@@ -99,8 +108,11 @@ function views_bulk_operations_archive_action_form($context) {
}
/**
- * Assembles a sanitized and unique URI for the archive, and returns it for
- * usage by the action callback (views_bulk_operations_archive_action).
+ * Assembles a sanitized and unique URI for the archive.
+ *
+ * @returns array
+ * A URI array used by the action callback
+ * (views_bulk_operations_archive_action).
*/
function views_bulk_operations_archive_action_submit($form, $form_state) {
// Validate the scheme, fallback to public if it's somehow invalid.
@@ -155,10 +167,12 @@ function views_bulk_operations_archive_action_views_bulk_operations_form($option
/**
* Create a sanitized and unique version of the provided filename.
*
- * @param $filename
- * String filename
+ * @param string $filename
+ * The filename to create.
+ * @param array $archive_list
+ * The list of files already in the archive.
*
- * @return
+ * @return string
* The new filename.
*/
function _views_bulk_operations_archive_action_create_filename($filename, $archive_list) {
@@ -166,7 +180,7 @@ function _views_bulk_operations_archive_action_create_filename($filename, $archi
// some filesystems, not many applications handle them well.
$filename = preg_replace('/[\x00-\x1F]/u', '_', $filename);
if (substr(PHP_OS, 0, 3) == 'WIN') {
- // These characters are not allowed in Windows filenames
+ // These characters are not allowed in Windows filenames.
$filename = str_replace(array(':', '*', '?', '"', '<', '>', '|'), '_', $filename);
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc
index add893e..4621dcd 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc
@@ -13,11 +13,13 @@ function views_bulk_operations_book_action_info() {
'label' => t('Move to book'),
'configurable' => TRUE,
'behavior' => array('changes_property'),
+ 'triggers' => array('any'),
);
$actions['views_bulk_operations_remove_from_book_action'] = array(
'type' => 'node',
'label' => t('Remove from book'),
'configurable' => FALSE,
+ 'triggers' => array('any'),
);
}
@@ -56,9 +58,9 @@ function views_bulk_operations_move_to_book_action_submit($form, $form_state) {
function views_bulk_operations_move_to_book_action($node, $context = array()) {
if (isset($context['book'])) {
$book_node = node_load($context['book']);
- $mlid = db_select('menu_links' , 'ml')
- ->condition('ml.link_path' , 'node/' . $node->nid)
- ->fields('ml' , array('mlid'))
+ $mlid = db_select('menu_links', 'ml')
+ ->condition('ml.link_path', 'node/' . $node->nid)
+ ->fields('ml', array('mlid'))
->execute()
->fetchField();
$node->book['mlid'] = $mlid;
@@ -69,9 +71,10 @@ function views_bulk_operations_move_to_book_action($node, $context = array()) {
}
/**
- * Adds the action 'Remove node from a parent book'
+ * Adds the action 'Remove node from a parent book'.
*/
-function views_bulk_operations_remove_from_book_action($node, $context) {
- $book = $node->book['mlid'];
+function views_bulk_operations_remove_from_book_action($node) {
book_node_delete($node);
+ // Remove book to avoid book_node_update() from building the links again.
+ unset($node->book);
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/change_owner.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/change_owner.action.inc
new file mode 100644
index 0000000..697670d
--- /dev/null
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/change_owner.action.inc
@@ -0,0 +1,65 @@
+ array(
+ 'type' => 'entity',
+ 'label' => t('Change owner'),
+ 'configurable' => TRUE,
+ 'behavior' => array('changes_property'),
+ 'triggers' => array('any'),
+ ),
+ );
+}
+
+/**
+ * Action function.
+ */
+function views_bulk_operations_change_owner_action($entity, $context) {
+ $entity->uid = $context['owner_uid'];
+}
+
+/**
+ * Action form function.
+ */
+function views_bulk_operations_change_owner_action_form($context, &$form_state) {
+ $form['owner_username'] = array(
+ '#type' => 'textfield',
+ '#maxlength' => USERNAME_MAX_LENGTH,
+ '#title' => t('Owner'),
+ '#required' => TRUE,
+ '#description' => t('Choose the user you would like to set as the owner.'),
+ '#autocomplete_path' => 'user/autocomplete',
+ );
+
+ return $form;
+}
+
+/**
+ * Action form validate function.
+ *
+ * Checks that the submitted text is a valid username.
+ */
+function views_bulk_operations_change_owner_action_validate($form, $form_state) {
+ if (!user_load_by_name($form_state['values']['owner_username'])) {
+ form_set_error('owner_username', t('Valid username required.'));
+ }
+}
+
+/**
+ * Action form submit function.
+ *
+ * Pass submitted username back to views_bulk_operations_change_owner.
+ */
+function views_bulk_operations_change_owner_action_submit($form, $form_state) {
+ $user = user_load_by_name($form_state['values']['owner_username']);
+ return array('owner_uid' => $user->uid);
+}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc
index 1106ab0..439a504 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc
@@ -19,15 +19,51 @@ function views_bulk_operations_delete_action_info() {
'label' => t('Delete revision'),
'configurable' => FALSE,
'behavior' => array('deletes_property'),
+ 'triggers' => array('any'),
),
);
}
+function views_bulk_operations_delete_item_views_bulk_operations_form($settings) {
+ $form = array();
+ $form['log'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Log individual deletions'),
+ '#description' => t('Note: Deleting large amounts of entities will generate large amounts of log messages.'),
+ '#default_value' => !empty($settings['log']),
+ );
+
+ return $form;
+}
+
function views_bulk_operations_delete_item($entity, $context) {
$info = entity_get_info($context['entity_type']);
$entity_id = $entity->{$info['entity keys']['id']};
entity_delete($context['entity_type'], $entity_id);
+
+ // Add a message to the watchdog if we've been configured to do so.
+ if (!empty($context['settings']['log'])) {
+ // Log an appropriate message for this entity type, using the format from
+ // the node, taxonomy and user module for their entity types.
+ switch ($context['entity_type']) {
+ case 'node':
+ watchdog('content', '@type: deleted %title.', array('@type' => $entity->type, '%title' => $entity->title));
+ break;
+
+ case 'taxonomy_term':
+ watchdog('taxonomy', 'Deleted term %name.', array('%name' => $entity->name), WATCHDOG_NOTICE);
+ break;
+
+ case 'user':
+ watchdog('user', 'Deleted user: %name %email.', array('%name' => $entity->name, '%email' => '<' . $entity->mail . '>'), WATCHDOG_NOTICE);
+ break;
+
+ default:
+ watchdog('entity', 'Deleted @type %label.', array('@type' => $context['entity_type'], '%label' => entity_label($context['entity_type'], $entity)));
+ break;
+ }
+ }
}
function views_bulk_operations_delete_revision($entity, $context) {
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc
index 71b6181..e46268d 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc
@@ -1,24 +1,30 @@
array(
- 'type' => 'entity',
- 'label' => t('Modify entity values'),
- 'behavior' => array('changes_property'),
- // This action only works when invoked through VBO. That's why it's
- // declared as non-configurable to prevent it from being shown in the
- // "Create an advanced action" dropdown on admin/config/system/actions.
- 'configurable' => FALSE,
- 'vbo_configurable' => TRUE,
- 'triggers' => array('any'),
- ));
+ return array(
+ 'views_bulk_operations_modify_action' => array(
+ 'type' => 'entity',
+ 'label' => t('Modify entity values'),
+ 'behavior' => array('changes_property'),
+ // This action only works when invoked through VBO. That's why it's
+ // declared as non-configurable to prevent it from being shown in the
+ // "Create an advanced action" dropdown on admin/config/system/actions.
+ 'configurable' => FALSE,
+ 'vbo_configurable' => TRUE,
+ 'triggers' => array('any'),
+ ),
+ );
}
/**
@@ -28,7 +34,7 @@ function views_bulk_operations_modify_action_info() {
* replacing the existing values, or appending to them (based on user input).
*/
function views_bulk_operations_modify_action($entity, $context) {
- list(,,$bundle_name) = entity_extract_ids($context['entity_type'], $entity);
+ list(,, $bundle_name) = entity_extract_ids($context['entity_type'], $entity);
// Handle Field API fields.
if (!empty($context['selected']['bundle_' . $bundle_name])) {
// The pseudo entity is cloned so that changes to it don't get carried
@@ -38,7 +44,7 @@ function views_bulk_operations_modify_action($entity, $context) {
// Get this field's language. We can just pull it from the pseudo entity
// as it was created using field_attach_form and entity_language so it's
// already been figured out if this field is translatable or not and
- // applied the appropriate language code to the field
+ // applied the appropriate language code to the field.
$language = key($pseudo_entity->{$key});
// Replace any tokens that might exist in the field columns.
foreach ($pseudo_entity->{$key}[$language] as $delta => &$item) {
@@ -49,7 +55,7 @@ function views_bulk_operations_modify_action($entity, $context) {
}
}
- if (in_array($key, $context['append']['bundle_' . $bundle_name]) && !empty($entity->$key)) {
+ if (in_array($key, $context['append']['bundle_' . $bundle_name]) && !empty($entity->{$key})) {
$entity->{$key}[$language] = array_merge($entity->{$key}[$language], $pseudo_entity->{$key}[$language]);
// Check if we breached cardinality, and notify the user.
@@ -58,9 +64,11 @@ function views_bulk_operations_modify_action($entity, $context) {
if ($field_info['cardinality'] != FIELD_CARDINALITY_UNLIMITED && $field_count > $field_info['cardinality']) {
$entity_label = entity_label($context['entity_type'], $entity);
$warning = t('Tried to set !field_count values for field !field_name that supports a maximum of !cardinality.',
- array('!field_count' => $field_count,
- '!field_name' => $field_info['field_name'],
- '!cardinality' => $field_info['cardinality']));
+ array(
+ '!field_count' => $field_count,
+ '!field_name' => $field_info['field_name'],
+ '!cardinality' => $field_info['cardinality'],
+ ));
drupal_set_message($warning, 'warning', FALSE);
}
@@ -76,25 +84,36 @@ function views_bulk_operations_modify_action($entity, $context) {
}
// Handle properties.
+ // Use the wrapper to set property values, since some properties need
+ // additional massaging by their setter callbacks.
+ // The wrapper will automatically modify $entity itself.
+ $wrapper = entity_metadata_wrapper($context['entity_type'], $entity);
+ // The default setting for 'revision' property (create new revisions) should
+ // be respected for nodes. This requires some special treatment.
+ if ($context['entity_type'] == 'node' && in_array('revision', variable_get('node_options_' . $bundle_name)) && !in_array('revision', $context['selected']['properties'])) {
+ $wrapper->revision->set(1);
+ }
+
if (!empty($context['selected']['properties'])) {
- // Use the wrapper to set property values, since some properties need
- // additional massaging by their setter callbacks.
- // The wrapper will automatically modify $entity itself.
- $wrapper = entity_metadata_wrapper($context['entity_type'], $entity);
foreach ($context['selected']['properties'] as $key) {
+ if (!$wrapper->{$key}->access('update')) {
+ // No access.
+ continue;
+ }
+
if (in_array($key, $context['append']['properties'])) {
- $old_values = $wrapper->$key->value();
- $wrapper->$key->set($context['properties'][$key]);
+ $old_values = $wrapper->{$key}->value();
+ $wrapper->{$key}->set($context['properties'][$key]);
$new_values = $wrapper->{$key}->value();
$all_values = array_merge($old_values, $new_values);
- $wrapper->$key->set($all_values);
+ $wrapper->{$key}->set($all_values);
}
else {
$value = $context['properties'][$key];
if (is_string($value)) {
$value = token_replace($value, array($context['entity_type'] => $entity), array('sanitize' => FALSE));
}
- $wrapper->$key->set($value);
+ $wrapper->{$key}->set($value);
}
}
}
@@ -108,7 +127,8 @@ function views_bulk_operations_modify_action($entity, $context) {
* entity bundle, as provided by field_attach_form().
*/
function views_bulk_operations_modify_action_form($context, &$form_state) {
- // This action form uses admin-provided settings. If they were not set, pull the defaults now.
+ // This action form uses admin-provided settings. If they were not set, pull
+ // the defaults now.
if (!isset($context['settings'])) {
$context['settings'] = views_bulk_operations_modify_action_views_bulk_operations_form_options();
}
@@ -121,7 +141,8 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
// and filled with form data.
// After submit, the pseudo-entities get passed to the actual action
// (views_bulk_operations_modify_action()) which copies the data from the
- // relevant pseudo-entity constructed here to the actual entity being modified.
+ // relevant pseudo-entity constructed here to the actual entity being
+ // modified.
$form_state['entities'] = array();
$info = entity_get_info($entity_type);
@@ -134,7 +155,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
if (!empty($properties)) {
$form['properties'] = array(
'#type' => 'fieldset',
- '#title' => 'Properties',
+ '#title' => t('Properties'),
);
$form['properties']['show_value'] = array(
'#suffix' => '',
@@ -146,7 +167,16 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
'#title' => $property['label'],
);
- $determined_type = ($property['type'] == 'boolean') ? 'checkbox' : 'textfield';
+ // According to _views_bulk_operations_modify_action_get_properties
+ // we have fixed list of supported types. Most of these types are string
+ // and only some of them has options list.
+ if (isset($property['options list'])) {
+ $determined_type = ($property['type'] == 'list') ? 'checkboxes' : 'select';
+ }
+ else {
+ $determined_type = ($property['type'] == 'boolean') ? 'checkbox' : 'textfield';
+ }
+
$form['properties'][$key] = array(
'#type' => $determined_type,
'#title' => $property['label'],
@@ -163,9 +193,9 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
$form['properties'][$key]['#maxlength'] = 255;
}
- if (!empty($property['options list'])) {
+ if (!empty($property['options list']) && is_callable($property['options list'])) {
$form['properties'][$key]['#type'] = 'select';
- $form['properties'][$key]['#options'] = $property['options list']($key, array());
+ $form['properties'][$key]['#options'] = call_user_func_array($property['options list'], array($key, array()));
if ($property['type'] == 'list') {
$form['properties'][$key]['#type'] = 'checkboxes';
@@ -184,7 +214,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
}
}
- // Going to need this for multilingual nodes
+ // Going to need this for multilingual nodes.
global $language;
foreach ($bundles as $bundle_name => $bundle) {
$bundle_key = $info['entity keys']['bundle'];
@@ -197,8 +227,8 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
$entity = entity_create($context['entity_type'], $default_values);
$form_state['entities'][$bundle_name] = $entity;
- // Show the more detailed label only if the entity type has multiple bundles.
- // Otherwise, it would just be confusing.
+ // Show the more detailed label only if the entity type has multiple
+ // bundles. Otherwise, it would just be confusing.
if (count($info['bundles']) > 1) {
$label = t('Fields for @bundle_key @label', array('@bundle_key' => $bundle_key, '@label' => $bundle['label']));
}
@@ -298,7 +328,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
$token_type = str_replace('_', '-', $entity_type);
$form['tokens'] = array(
'#type' => 'fieldset',
- '#title' => 'Available tokens',
+ '#title' => t('Available tokens'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
'#weight' => 998,
@@ -375,7 +405,7 @@ function views_bulk_operations_modify_action_validate($form, &$form_state) {
$properties = _views_bulk_operations_modify_action_get_properties($form_state['entity_type']);
foreach ($form_state['selected']['properties'] as $key) {
$value = $form_state['values']['properties'][$key];
- if (!$wrapper->$key->validate($value)) {
+ if (!$wrapper->{$key}->validate($value)) {
$label = $properties[$key]['label'];
form_set_error('properties][' . $key, t('%label contains an invalid value.', array('%label' => $label)));
}
@@ -412,9 +442,9 @@ function views_bulk_operations_modify_action_submit($form, $form_state) {
* Properties that can't be changed are entity keys, timestamps, and the ones
* without a setter callback.
*
- * @param $entity_type
+ * @param string $entity_type
* The entity type whose properties will be fetched.
- * @param $display_values
+ * @param array $display_values
* An optional, admin-provided list of properties and fields that should be
* displayed for editing, used to filter the returned list of properties.
*/
@@ -430,8 +460,17 @@ function _views_bulk_operations_modify_action_get_properties($entity_type, $disp
}
}
// List of supported types.
- $supported_types = array('text', 'token', 'integer', 'decimal', 'date', 'duration',
- 'boolean', 'uri', 'list');
+ $supported_types = array(
+ 'text',
+ 'token',
+ 'integer',
+ 'decimal',
+ 'date',
+ 'duration',
+ 'boolean',
+ 'uri',
+ 'list',
+ );
$property_info = entity_get_property_info($entity_type);
if (empty($property_info['properties'])) {
// Stop here if no properties were found.
@@ -479,9 +518,9 @@ function _views_bulk_operations_modify_action_get_properties($entity_type, $disp
* (through the action settings) then only bundles that have at least one field
* selected are returned.
*
- * @param $entity_type
+ * @param string $entity_type
* The entity type whose bundles will be fetched.
- * @param $context
+ * @param array $context
* The VBO context variable.
*/
function _views_bulk_operations_modify_action_get_bundles($entity_type, $context) {
@@ -589,8 +628,8 @@ function views_bulk_operations_modify_action_views_bulk_operations_form($options
}
foreach ($info['bundles'] as $bundle_name => $bundle) {
$bundle_key = $info['entity keys']['bundle'];
- // Show the more detailed label only if the entity type has multiple bundles.
- // Otherwise, it would just be confusing.
+ // Show the more detailed label only if the entity type has multiple
+ // bundles. Otherwise, it would just be confusing.
if (count($info['bundles']) > 1) {
$label = t('Fields for @bundle_key @label', array('@bundle_key' => $bundle_key, '@label' => $bundle['label']));
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc
index ea8e8ee..3637e39 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc
@@ -1,16 +1,19 @@
array(
- 'type' => 'user',
- 'label' => t('Cancel user account'),
- 'configurable' => TRUE,
- 'behavior' => array('deletes_property'),
- ));
+ return array(
+ 'views_bulk_operations_user_cancel_action' => array(
+ 'type' => 'user',
+ 'label' => t('Cancel user account'),
+ 'configurable' => TRUE,
+ 'behavior' => array('deletes_property'),
+ 'triggers' => array('any'),
+ ),
+ );
}
function views_bulk_operations_user_cancel_action_form($context) {
@@ -74,7 +77,17 @@ function views_bulk_operations_user_cancel_action($account, $context) {
if (!empty($context['user_cancel_notify'])) {
_user_mail_notify('status_canceled', $account);
}
- user_delete($account->uid);
+ // In cases when nodes are to be reassigned to UID 0, the user_delete must
+ // not run until *after* the user_cancel has been invoked, otherwise the
+ // nodes are deleted before they can be reassigned. Adding the user delete
+ // to the batch queue ensures things happen in the correct sequence.
+ $batch = array(
+ 'operations' => array(
+ array('user_delete', array($account->uid)),
+ ),
+ 'file' => drupal_get_path('module', 'node') . '/node.admin.inc',
+ );
+ batch_set($batch);
watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
break;
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc
index 394597c..616f13c 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc
@@ -45,24 +45,19 @@ function views_bulk_operations_user_roles_action_submit($form, $form_state) {
);
}
-function views_bulk_operations_user_roles_action(&$user, $context) {
- $roles = $user->roles;
- $selected = (is_array($context['add_roles']) ? $context['add_roles'] : array()) +
- (is_array($context['remove_roles']) ? $context['remove_roles'] : array());
- $result = db_query("SELECT rid, name FROM {role} WHERE rid IN (:selected)", array(':selected' => array_keys($selected)));
- foreach ($result as $role) {
- if (isset($context['add_roles'][$role->rid])) {
- $add_roles[$role->rid] = $role->name;
- }
- if (isset($context['remove_roles'][$role->rid])) {
- $remove_roles[$role->rid] = $role->name;
- }
+function views_bulk_operations_user_roles_action($user, $context) {
+ $wrapper = entity_metadata_wrapper('user', $user);
+ if (!$wrapper->roles->access("update")) {
+ // No access.
+ return;
}
- if (!empty($add_roles)) {
- $roles += $add_roles;
+ $roles = $wrapper->roles->value();
+ if (is_array($context['add_roles'])) {
+ $roles = array_merge($roles, $context['add_roles']);
}
- if (!empty($remove_roles)) {
- $roles = array_diff($roles, $remove_roles);
+ if (is_array($context['remove_roles'])) {
+ $roles = array_diff($roles, $context['remove_roles']);
}
- user_save($user, array('roles' => $roles));
+ $wrapper->roles->set($roles);
+ $wrapper->save();
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info b/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info
index e57077b..1f97bd5 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info
@@ -3,9 +3,8 @@ description = Provides permission-based access control for actions. Used by View
package = Administration
core = 7.x
-; Information added by Drupal.org packaging script on 2013-12-23
-version = "7.x-3.2"
+; Information added by Drupal.org packaging script on 2018-05-08
+version = "7.x-3.5"
core = "7.x"
project = "views_bulk_operations"
-datestamp = "1387798183"
-
+datestamp = "1525821486"
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/css/views_bulk_operations.css b/sites/all/modules/contrib/views/views_bulk_operations/css/views_bulk_operations.css
index a93cf22..d26da62 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/css/views_bulk_operations.css
+++ b/sites/all/modules/contrib/views/views_bulk_operations/css/views_bulk_operations.css
@@ -1,4 +1,5 @@
-.vbo-select-all-markup, .vbo-table-select-all-markup {
+.vbo-select-all-markup,
+.vbo-table-select-all-markup {
display: none;
}
@@ -15,9 +16,10 @@
.views-table-row-select-all td {
text-align: center;
}
-.vbo-table-select-all-pages, .vbo-table-select-this-page {
- margin: 0 !important;
- padding: 2px 5px !important;
+.vbo-views-form .vbo-table-select-all-pages,
+.vbo-views-form .vbo-table-select-this-page {
+ margin: 0;
+ padding: 2px 5px;
}
/* Generic "select all" */
@@ -30,6 +32,6 @@
margin-bottom: 0;
}
.vbo-fieldset-select-all div {
- padding: 0 !important;
- margin: 0 !important;
+ padding: 0;
+ margin: 0;
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js b/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js
index aeeecc6..62218be 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js
+++ b/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js
@@ -1,9 +1,17 @@
(function ($) {
+ // Polyfill for jQuery less than 1.6.
+ if (typeof $.fn.prop != 'function') {
+ jQuery.fn.extend({
+ prop: jQuery.fn.attr
+ });
+ }
+
Drupal.behaviors.vbo = {
attach: function(context) {
$('.vbo-views-form', context).each(function() {
Drupal.vbo.initTableBehaviors(this);
Drupal.vbo.initGenericBehaviors(this);
+ Drupal.vbo.toggleButtonsState(this);
});
}
}
@@ -30,9 +38,10 @@
$('.vbo-table-select-all', form).show();
// This is the "select all" checkbox in (each) table header.
- $('.vbo-table-select-all', form).click(function() {
- var table = $(this).closest('table')[0];
- $('input[id^="edit-views-bulk-operations"]:not(:disabled)', table).attr('checked', this.checked);
+ $('input.vbo-table-select-all', form).click(function() {
+ var table = $(this).closest('table:not(.sticky-header)')[0];
+ $('.vbo-select:not(:disabled)', table).prop('checked', this.checked);
+ Drupal.vbo.toggleButtonsState(form);
// Toggle the visibility of the "select all" row (if any).
if (this.checked) {
@@ -46,21 +55,19 @@
});
// Set up the ability to click anywhere on the row to select it.
- $('.views-table tbody tr', form).click(function(event) {
- if (event.target.tagName.toLowerCase() != 'input' && event.target.tagName.toLowerCase() != 'a') {
- $('input[id^="edit-views-bulk-operations"]:not(:disabled)', this).each(function() {
- var checked = this.checked;
- // trigger() toggles the checkmark *after* the event is set,
- // whereas manually clicking the checkbox toggles it *beforehand*.
- // that's why we manually set the checkmark first, then trigger the
- // event (so that listeners get notified), then re-set the checkmark
- // which the trigger will have toggled. yuck!
- this.checked = !checked;
- $(this).trigger('click');
- this.checked = !checked;
- });
- }
- });
+ if (Drupal.settings.vbo.row_clickable) {
+ $('.views-table tbody tr', form).click(function(event) {
+ var tagName = event.target.tagName.toLowerCase();
+ if (tagName != 'input' && tagName != 'a' && tagName != 'label') {
+ $('.vbo-select:not(:disabled)', this).each(function() {
+ // Always return true for radios, you cannot de-select a radio by clicking on it,
+ // it should be the same when clicking on a row.
+ this.checked = $(this).is(':radio') ? true : !this.checked;
+ $(this).trigger('change');
+ });
+ }
+ });
+ }
}
Drupal.vbo.tableSelectAllPages = function(form) {
@@ -81,35 +88,44 @@
$('.vbo-select-all-markup', form).show();
$('.vbo-select-this-page', form).click(function() {
- $('input[id^="edit-views-bulk-operations"]', form).attr('checked', this.checked);
- $('.vbo-select-all-pages', form).attr('checked', false);
+ $('.vbo-select', form).prop('checked', this.checked);
+ Drupal.vbo.toggleButtonsState(form);
+ $('.vbo-select-all-pages', form).prop('checked', false);
// Toggle the "select all" checkbox in grouped tables (if any).
- $('.vbo-table-select-all', form).attr('checked', this.checked);
+ $('.vbo-table-select-all', form).prop('checked', this.checked);
});
$('.vbo-select-all-pages', form).click(function() {
- $('input[id^="edit-views-bulk-operations"]', form).attr('checked', this.checked);
- $('.vbo-select-this-page', form).attr('checked', false);
+ $('.vbo-select', form).prop('checked', this.checked);
+ Drupal.vbo.toggleButtonsState(form);
+ $('.vbo-select-this-page', form).prop('checked', false);
// Toggle the "select all" checkbox in grouped tables (if any).
- $('.vbo-table-select-all', form).attr('checked', this.checked);
+ $('.vbo-table-select-all', form).prop('checked', this.checked);
// Modify the value of the hidden form field.
$('.select-all-rows', form).val(this.checked);
});
- $('.vbo-select', form).click(function() {
+ // Toggle submit buttons' "disabled" states with the state of the operation
+ // selectbox.
+ $('select[name="operation"]', form).change(function () {
+ Drupal.vbo.toggleButtonsState(form);
+ });
+
+ // Handle a "change" event originating either from a row click or an actual checkbox click.
+ $('.vbo-select', form).change(function() {
// If a checkbox was deselected, uncheck any "select all" checkboxes.
if (!this.checked) {
- $('.vbo-select-this-page', form).attr('checked', false);
- $('.vbo-select-all-pages', form).attr('checked', false);
+ $('.vbo-select-this-page', form).prop('checked', false);
+ $('.vbo-select-all-pages', form).prop('checked', false);
// Modify the value of the hidden form field.
$('.select-all-rows', form).val('0')
var table = $(this).closest('table')[0];
if (table) {
// Uncheck the "select all" checkbox in the table header.
- $('.vbo-table-select-all', table).attr('checked', false);
+ $('.vbo-table-select-all', table).prop('checked', false);
// If there's a "select all" row, hide it.
if ($('.vbo-table-select-this-page', table).length) {
@@ -119,7 +135,26 @@
}
}
}
+
+ Drupal.vbo.toggleButtonsState(form);
});
}
+ Drupal.vbo.toggleButtonsState = function(form) {
+ // If no rows are checked, disable any form submit actions.
+ var selectbox = $('select[name="operation"]', form);
+ var checkedCheckboxes = $('.vbo-select:checked', form);
+ // The .vbo-prevent-toggle CSS class is added to buttons to prevent toggling
+ // between disabled and enabled. For example the case of an 'add' button.
+ var buttons = $('[id^="edit-select"] [type="submit"]:not(.vbo-prevent-toggle)', form);
+
+ if (selectbox.length) {
+ var has_selection = checkedCheckboxes.length && selectbox.val() !== '0';
+ buttons.prop('disabled', !has_selection);
+ }
+ else {
+ buttons.prop('disabled', !checkedCheckboxes.length);
+ }
+ };
+
})(jQuery);
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php
index c74d90c..0be5785 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php
+++ b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php
@@ -20,7 +20,7 @@ class ViewsBulkOperationsAction extends ViewsBulkOperationsBaseOperation {
*/
public function getAccessMask() {
// Assume edit by default.
- if (!isset($this->operationInfo['behavior'])) {
+ if (empty($this->operationInfo['behavior'])) {
$this->operationInfo['behavior'] = array('changes_property');
}
@@ -128,7 +128,12 @@ class ViewsBulkOperationsAction extends ViewsBulkOperationsBaseOperation {
actions_list();
$submit_callback = $this->operationInfo['callback'] . '_submit';
- $this->formOptions = $submit_callback($form, $form_state);
+ // If the return value from the callback is an options array, store it for
+ // later union onto the context.
+ $options = $submit_callback($form, $form_state);
+ if ($options && is_array($options)) {
+ $this->formOptions = $options;
+ }
}
/**
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php
index 624c850..c40da8b 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php
+++ b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php
@@ -124,6 +124,8 @@ class ViewsBulkOperationsRulesComponent extends ViewsBulkOperationsBaseOperation
else {
$element = rules_action('component_' . $this->operationInfo['parameters']['component_key']);
}
- $element->execute($data);
+ $wrapper_type = is_array($data) ? "list<{$this->entityType}>" : $this->entityType;
+ $wrapper = entity_metadata_wrapper($wrapper_type, $data);
+ $element->execute($wrapper);
}
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations.views.inc b/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations.views.inc
index 1c7078a..e6c685a 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations.views.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations.views.inc
@@ -6,7 +6,8 @@
function views_bulk_operations_views_data_alter(&$data) {
foreach (entity_get_info() as $entity_type => $info) {
if (isset($info['base table']) && isset($data[$info['base table']]['table'])) {
- $data[$info['base table']]['views_bulk_operations'] = array(
+ $data[$info['base table']]['views_bulk_operations']['moved to'] = array('views_entity_' . $entity_type, 'views_bulk_operations');
+ $data['views_entity_' . $entity_type]['views_bulk_operations'] = array(
'title' => $data[$info['base table']]['table']['group'],
'group' => t('Bulk operations'),
'help' => t('Provide a checkbox to select the row for bulk operations.'),
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc b/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
index 9bb983f..9b1f88e 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
@@ -6,7 +6,7 @@
* Implements the Views Form API.
*/
-class views_bulk_operations_handler_field_operations extends views_handler_field {
+class views_bulk_operations_handler_field_operations extends views_handler_field_entity {
var $revision = FALSE;
function init(&$view, &$options) {
@@ -46,6 +46,12 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
unset($operation_options['use_queue']);
}
}
+
+ // Check whether this is a revision.
+ $table_data = views_fetch_data($this->table);
+ if (!empty($table_data['table']['revision'])) {
+ $this->revision = TRUE;
+ }
}
function option_definition() {
@@ -55,6 +61,7 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
'contains' => array(
'display_type' => array('default' => 0),
'enable_select_all_pages' => array('default' => TRUE),
+ 'row_clickable' => array('default' => TRUE),
'force_single' => array('default' => FALSE),
'entity_load_capacity' => array('default' => 10),
'skip_batching' => array('default' => 0),
@@ -63,11 +70,26 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
$options['vbo_operations'] = array(
'default' => array(),
'unpack_translatable' => 'unpack_operations',
+ 'export' => 'export_vbo_operations',
);
return $options;
}
+ function export_vbo_operations($indent, $prefix, $storage, $option, $definition, $parents) {
+ // Anti-recursion, since we use the parent export helper.
+ unset($definition['export']);
+
+ // Find and remove all unselected/disabled operations.
+ foreach ($storage['vbo_operations'] as $operation_id => $operation) {
+ if (empty($operation['selected'])) {
+ unset($storage['vbo_operations'][$operation_id]);
+ }
+ }
+
+ return parent::export_option($indent, $prefix, $storage, $option, $definition, $parents);
+ }
+
function unpack_operations(&$translatable, $storage, $option, $definition, $parents, $keys) {
$translatable[] = array(
'value' => t('- Choose an operation -'),
@@ -107,6 +129,12 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
'#default_value' => $this->options['vbo_settings']['enable_select_all_pages'],
'#description' => t('Check this box to enable the ability to select all items on all pages.'),
);
+ $form['vbo_settings']['row_clickable'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Make the whole row clickable'),
+ '#default_value' => $this->options['vbo_settings']['row_clickable'],
+ '#description' => t('Check this box to select an item when its row has been clicked. Requires JavaScript.'),
+ );
$form['vbo_settings']['force_single'] = array(
'#type' => 'checkbox',
'#title' => t('Force single'),
@@ -164,6 +192,14 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
$dom_id . '-selected' => array(1),
),
);
+ $form['vbo_operations'][$operation_id]['skip_permission_check'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Skip permission step'),
+ '#default_value' => !empty($operation_options['skip_permission_check']),
+ '#dependency' => array(
+ $dom_id . '-selected' => array(1),
+ ),
+ );
$form['vbo_operations'][$operation_id] += $operation->adminOptionsForm($dom_id, $this);
}
@@ -241,19 +277,21 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
// At this point, the query has already been run, so we can access the results
// in order to get the base key value (for example, nid for nodes).
foreach ($this->view->result as $row_index => $row) {
- $entity_id = $this->get_value($row);
+ $this->view->row_index = $row_index;
+ $id = $this->get_value($row, $this->real_field);
if ($this->options['vbo_settings']['force_single']) {
$form[$this->options['id']][$row_index] = array(
'#type' => 'radio',
'#parents' => array($this->options['id']),
- '#return_value' => $entity_id,
+ '#return_value' => $id,
+ '#attributes' => array('class' => array('vbo-select')),
);
}
else {
$form[$this->options['id']][$row_index] = array(
'#type' => 'checkbox',
- '#return_value' => $entity_id,
+ '#return_value' => $id,
'#default_value' => FALSE,
'#attributes' => array('class' => array('vbo-select')),
);
@@ -271,9 +309,12 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
if (empty($options['selected'])) {
continue;
}
-
$operation = views_bulk_operations_get_operation($operation_id, $entity_type, $options);
- if (!$operation || !$operation->access($user)) {
+ if (!$operation) {
+ continue;
+ }
+ $skip_permission_check = $operation->getAdminOption('skip_permission_check', FALSE);
+ if (!$operation->access($user) && !$skip_permission_check) {
continue;
}
$selected[$operation_id] = $operation;
@@ -296,29 +337,7 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
* the entity type that VBO is operating on.
*/
public function get_entity_type() {
- $base_table = $this->view->base_table;
-
- // If the current field is under a relationship you can't be sure that the
- // base table of the view is the base table of the current field.
- // For example a field from a node author on a node view does have users as base table.
- if (!empty($this->options['relationship']) && $this->options['relationship'] != 'none') {
- $relationships = $this->view->display_handler->get_option('relationships');
- $options = $relationships[$this->options['relationship']];
- $data = views_fetch_data($options['table']);
- $base_table = $data[$options['field']]['relationship']['base'];
- }
- // The base table is now known, use it to determine the entity type.
- foreach (entity_get_info() as $entity_type => $info) {
- if (isset($info['base table']) && $info['base table'] == $base_table) {
- return $entity_type;
- }
- elseif (isset($info['revision table']) && $info['revision table'] == $base_table) {
- $this->revision = TRUE;
- return $entity_type;
- }
- }
- // This should never happen.
- _views_bulk_operations_report_error("Could not determine the entity type for VBO field on views base table %table", array('%table' => $base_table));
- return FALSE;
+ return $this->entity_type;
}
+
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.drush.inc b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.drush.inc
index 09c4fb6..e9ca192 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.drush.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.drush.inc
@@ -154,7 +154,7 @@ function views_bulk_operations_drush_execute($vid = NULL, $operation_id = NULL)
$current = 1;
foreach ($view->result as $row_index => $result) {
$rows[$row_index] = array(
- 'entity_id' => $vbo->get_value($result),
+ 'entity_id' => $result->{$vbo->real_field},
'views_row' => array(),
'position' => array(
'current' => $current++,
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info
index 2f03a14..058bef7 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info
@@ -1,7 +1,7 @@
name = Views Bulk Operations
description = Provides a way of selecting multiple rows and applying operations to them.
dependencies[] = entity
-dependencies[] = views
+dependencies[] = views (>=3.12)
package = Views
core = 7.x
php = 5.2.9
@@ -9,9 +9,8 @@ php = 5.2.9
files[] = plugins/operation_types/base.class.php
files[] = views/views_bulk_operations_handler_field_operations.inc
-; Information added by Drupal.org packaging script on 2013-12-23
-version = "7.x-3.2"
+; Information added by Drupal.org packaging script on 2018-05-08
+version = "7.x-3.5"
core = "7.x"
project = "views_bulk_operations"
-datestamp = "1387798183"
-
+datestamp = "1525821486"
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module
index b25b661..081e540 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module
@@ -13,6 +13,7 @@ define('VBO_ACCESS_OP_DELETE', 0x08);
/**
* Implements hook_action_info().
+ *
* Registers custom VBO actions as Drupal actions.
*/
function views_bulk_operations_action_info() {
@@ -20,9 +21,14 @@ function views_bulk_operations_action_info() {
$files = views_bulk_operations_load_action_includes();
foreach ($files as $filename) {
$action_info_fn = 'views_bulk_operations_'. str_replace('.', '_', basename($filename, '.inc')).'_info';
- $action_info = call_user_func($action_info_fn);
- if (is_array($action_info)) {
- $actions += $action_info;
+ if (is_callable($action_info_fn)) {
+ $action_info = call_user_func($action_info_fn);
+ if (is_array($action_info)) {
+ $actions += $action_info;
+ }
+ }
+ else {
+ watchdog('views bulk operations', 'views_bulk_operations_action_info() expects action filenames to have a matching valid callback function named: %function', array('%function' => $action_info_fn), WATCHDOG_WARNING);
}
}
@@ -41,21 +47,21 @@ function views_bulk_operations_load_action_includes() {
// The list of VBO actions is fairly static, so it's hardcoded for better
// performance (hitting the filesystem with file_scan_directory(), and then
// caching the result has its cost).
- $path = drupal_get_path('module', 'views_bulk_operations') . '/actions/';
$files = array(
- 'archive.action.inc',
- 'argument_selector.action.inc',
- 'book.action.inc',
- 'delete.action.inc',
- 'modify.action.inc',
- 'script.action.inc',
- 'user_roles.action.inc',
- 'user_cancel.action.inc',
+ 'archive.action',
+ 'argument_selector.action',
+ 'book.action',
+ 'change_owner.action',
+ 'delete.action',
+ 'modify.action',
+ 'script.action',
+ 'user_roles.action',
+ 'user_cancel.action',
);
if (!$loaded) {
foreach ($files as $file) {
- include_once $path . $file;
+ module_load_include('inc', 'views_bulk_operations', 'actions/' . $file);
}
$loaded = TRUE;
}
@@ -76,8 +82,8 @@ function views_bulk_operations_load_action_includes() {
*/
function views_bulk_operations_cron() {
db_delete('queue')
- ->condition('name', db_like('views_bulk_operations_active_queue_'), 'LIKE')
- ->condition('created', REQUEST_TIME - 864000, '<')
+ ->condition('name', db_like('views_bulk_operations_active_queue_') . '%', 'LIKE')
+ ->condition('created', REQUEST_TIME - 86400, '<')
->execute();
}
@@ -190,7 +196,7 @@ function views_bulk_operations_get_operation_info($operation_id = NULL) {
$operations += $plugin['list callback']();
}
- uasort($operations, create_function('$a, $b', 'return strcasecmp($a["label"], $b["label"]);'));
+ uasort($operations, '_views_bulk_operations_sort_operations_by_label');
}
if (!empty($operation_id)) {
@@ -201,6 +207,16 @@ function views_bulk_operations_get_operation_info($operation_id = NULL) {
}
}
+/**
+ * Sort function used by uasort in views_bulk_operations_get_operation_info().
+ *
+ * A closure would be better suited for this, but closure support was added in
+ * PHP 5.3 and D7 supports 5.2.
+ */
+function _views_bulk_operations_sort_operations_by_label($a, $b) {
+ return strcasecmp($a['label'], $b['label']);
+}
+
/**
* Returns an operation instance.
*
@@ -215,7 +231,12 @@ function views_bulk_operations_get_operation_info($operation_id = NULL) {
function views_bulk_operations_get_operation($operation_id, $entity_type, $options) {
$operations = &drupal_static(__FUNCTION__);
- if (!isset($operations[$operation_id])) {
+ // Create a unique hash of the options.
+ $cid = md5(serialize($options));
+
+ // See if there's a cached copy of the operation, including entity type and
+ // options.
+ if (!isset($operations[$operation_id][$entity_type][$cid])) {
// Intentionally not using views_bulk_operations_get_operation_info() here
// since it's an expensive function that loads all the operations on the
// system, despite the fact that we might only need a few.
@@ -224,14 +245,14 @@ function views_bulk_operations_get_operation($operation_id, $entity_type, $optio
$operation_info = $plugin['list callback']($operation_id);
if ($operation_info) {
- $operations[$operation_id] = new $plugin['handler']['class']($operation_id, $entity_type, $operation_info, $options);
+ $operations[$operation_id][$entity_type][$cid] = new $plugin['handler']['class']($operation_id, $entity_type, $operation_info, $options);
}
else {
- $operations[$operation_id] = FALSE;
+ $operations[$operation_id][$entity_type][$cid] = FALSE;
}
}
- return $operations[$operation_id];
+ return $operations[$operation_id][$entity_type][$cid];
}
/**
@@ -358,7 +379,7 @@ function views_bulk_operations_form_alter(&$form, &$form_state, $form_id) {
*/
function views_bulk_operations_views_post_build(&$view) {
$vbo = _views_bulk_operations_get_field($view);
- if ($vbo && $vbo->get_selected_operations() < 1) {
+ if ($vbo && count($vbo->get_selected_operations()) < 1) {
$vbo->options['exclude'] = TRUE;
}
}
@@ -420,7 +441,7 @@ function theme_views_bulk_operations_select_all($variables) {
if ($enable_select_all_pages) {
$form['select_all']['or'] = array(
'#type' => 'markup',
- '#markup' => 'OR',
+ '#markup' => '' . t('OR') . '',
);
$form['select_all']['all_pages'] = array(
'#type' => 'checkbox',
@@ -443,6 +464,13 @@ function theme_views_bulk_operations_select_all($variables) {
*/
function views_bulk_operations_form($form, &$form_state, $vbo) {
$form['#attached']['js'][] = drupal_get_path('module', 'views_bulk_operations') . '/js/views_bulk_operations.js';
+ $form['#attached']['js'][] = array(
+ 'data' => array('vbo' => array(
+ 'row_clickable' => $vbo->get_vbo_option('row_clickable'),
+ )),
+ 'type' => 'setting',
+ );
+
$form['#attached']['css'][] = drupal_get_path('module', 'views_bulk_operations') . '/css/views_bulk_operations.css';
// Wrap the form in a div with specific classes for JS targeting and theming.
$class = 'vbo-views-form';
@@ -511,7 +539,7 @@ function views_bulk_operations_form($form, &$form_state, $vbo) {
$enable_select_all_pages = FALSE;
// If the view is paginated, and "select all items on all pages" is
// enabled, tell that to the theme function.
- if (count($vbo->view->result) != $vbo->view->total_rows && $vbo->get_vbo_option('enable_select_all_pages')) {
+ if (isset($vbo->view->total_rows) && count($vbo->view->result) != $vbo->view->total_rows && $vbo->get_vbo_option('enable_select_all_pages')) {
$enable_select_all_pages = TRUE;
}
$form['select_all_markup'] = array(
@@ -595,14 +623,23 @@ function views_bulk_operations_confirm_form($form, &$form_state, $view, $output)
$operation = $form_state['operation'];
$rows = $form_state['selection'];
$query = drupal_get_query_parameters($_GET, array('q'));
+ $title = t('Are you sure you want to perform %operation on the selected items?', array('%operation' => $operation->label()));
$form = confirm_form($form,
- t('Are you sure you want to perform %operation on the selected items?', array('%operation' => $operation->label())),
+ $title,
array('path' => $view->get_url(), 'query' => $query),
theme('views_bulk_operations_confirmation', array('rows' => $rows, 'vbo' => $vbo, 'operation' => $operation, 'select_all_pages' => $form_state['select_all_pages']))
);
// Add VBO's submit handler to the Confirm button added by config_form().
$form['actions']['submit']['#submit'] = array('views_bulk_operations_form_submit');
+ // We can't set the View title here as $view is just a copy of the original,
+ // and our settings changes won't "stick" for the first page load of the
+ // confirmation form. We also can't just call drupal_set_title() directly
+ // because our title will be clobbered by the actual View title later. So
+ // let's tuck the title away in the form for use later.
+ // @see views_bulk_operations_preprocess_views_view()
+ $form['#vbo_confirm_form_title'] = $title;
+
return $form;
}
@@ -618,19 +655,42 @@ function theme_views_bulk_operations_confirmation($variables) {
// Load the entities from the current page, and show their titles.
$entities = _views_bulk_operations_entity_load($entity_type, array_values($rows), $vbo->revision);
foreach ($entities as $entity) {
- $items[] = check_plain(_views_bulk_operations_entity_label($entity_type, $entity));
+ $items[] = check_plain(entity_label($entity_type, $entity));
}
// All rows on all pages have been selected, so show a count of additional items.
if ($select_all_pages) {
$more_count = $vbo->view->total_rows - count($vbo->view->result);
- $items[] = t('...and !count more.', array('!count' => $more_count));
+ $items[] = t('...and %count more.', array('%count' => $more_count));
}
$count = format_plural(count($entities), 'item', '@count items');
- $output = theme('item_list', array('items' => $items, 'title' => t('You selected the following !count:', array('!count' => $count))));
+ $output = theme('item_list', array('items' => $items, 'title' => t('You selected the following %count:', array('%count' => $count))));
return $output;
}
+/**
+ * Implements hook_preprocess_page().
+ *
+ * Hide action links on the configure and confirm pages.
+ */
+function views_bulk_operations_preprocess_page(&$variables) {
+ if (isset($_POST['select_all'], $_POST['operation'])) {
+ $variables['action_links'] = array();
+ }
+}
+
+/**
+ * Implements hook_preprocess_views_view().
+ */
+function views_bulk_operations_preprocess_views_view($variables) {
+ // If we've stored a title for the confirmation form, retrieve it here and
+ // retitle the View.
+ // @see views_bulk_operations_confirm_form()
+ if (array_key_exists('rows', $variables) && is_array($variables['rows']) && array_key_exists('#vbo_confirm_form_title', $variables['rows'])) {
+ $variables['view']->set_title($variables['rows']['#vbo_confirm_form_title']);
+ }
+}
+
/**
* Goes through the submitted values, and returns
* an array of selected rows, in the form of
@@ -798,7 +858,7 @@ function views_bulk_operations_execute($vbo, $operation, $selection, $select_all
// All items on all pages should be selected, add a batch job to gather
// and enqueue them.
- if ($select_all_pages && $vbo->view->query->pager->has_more_records()) {
+ if ($select_all_pages && ($vbo->view->query->pager->has_more_records() || $vbo->view->query->pager->get_current_page() > 0)) {
$total_rows = $vbo->view->total_rows;
$batch['operations'][] = array(
@@ -864,14 +924,20 @@ function views_bulk_operations_adjust_selection($queue_name, $operation, $option
}
$vbo = _views_bulk_operations_get_field($view);
+
+ // Call views_handler_field_entity::pre_render() to get the entities.
+ $vbo->pre_render($view->result);
+
$rows = array();
foreach ($view->result as $row_index => $result) {
+ // Set the row index.
+ $view->row_index = $row_index;
$rows[$row_index] = array(
- 'entity_id' => $vbo->get_value($result),
+ 'entity_id' => $vbo->get_value($result, $vbo->real_field),
'views_row' => array(),
'position' => array(
'current' => ++$context['sandbox']['progress'],
- 'total' => $view->total_rows,
+ 'total' => $context['sandbox']['max'],
),
);
// Some operations require full selected rows.
@@ -1037,12 +1103,13 @@ function views_bulk_operations_queue_item_process($queue_item_data, &$log = NULL
}
// If the current entity can't be accessed, skip it and log a notice.
- if (!_views_bulk_operations_entity_access($operation, $entity_type, $entity, $account)) {
+ $skip_permission_check = $operation->getAdminOption('skip_permission_check');
+ if (!$skip_permission_check && !_views_bulk_operations_entity_access($operation, $entity_type, $entity, $account)) {
$message = 'Skipped %operation on @type %title due to insufficient permissions.';
$arguments = array(
'%operation' => $operation->label(),
'@type' => $entity_type,
- '%title' => _views_bulk_operations_entity_label($entity_type, $entity),
+ '%title' => entity_label($entity_type, $entity),
);
if ($log) {
@@ -1089,12 +1156,22 @@ function views_bulk_operations_direct_adjust(&$selection, $vbo) {
if ($field_name != $vbo->options['id']) {
unset($view->field[$field_name]);
}
+ else {
+ // Get hold of the new VBO field.
+ $new_vbo = $view->field[$field_name];
+ }
}
$view->execute($vbo->view->current_display);
+
+ // Call views_handler_field_entity::pre_render() to get the entities.
+ $new_vbo->pre_render($view->result);
+
$results = array();
foreach ($view->result as $row_index => $result) {
- $results[$row_index] = $vbo->get_value($result);
+ // Set the row index.
+ $view->row_index = $row_index;
+ $results[$row_index] = $new_vbo->get_value($result, $new_vbo->real_field);
}
$selection = $results;
}
@@ -1122,13 +1199,14 @@ function views_bulk_operations_direct_process($operation, $rows, $options) {
}
$entities = _views_bulk_operations_entity_load($entity_type, $entity_ids, $options['revision']);
+ $skip_permission_check = $operation->getAdminOption('skip_permission_check');
// Filter out entities that can't be accessed.
foreach ($entities as $id => $entity) {
- if (!_views_bulk_operations_entity_access($operation, $entity_type, $entity)) {
+ if (!$skip_permission_check && !_views_bulk_operations_entity_access($operation, $entity_type, $entity, $user)) {
$context['results']['log'][] = t('Skipped %operation on @type %title due to insufficient permissions.', array(
'%operation' => $operation->label(),
'@type' => $entity_type,
- '%title' => _views_bulk_operations_entity_label($entity_type, $entity),
+ '%title' => entity_label($entity_type, $entity),
));
unset($entities[$id]);
}
@@ -1236,29 +1314,6 @@ function _views_bulk_operations_entity_load($entity_type, $ids, $revision = FALS
return $entities;
}
-/**
- * Label function for entities.
- * Core entities don't declare the "label" key, so entity_label() fails,
- * and a fallback is needed. This function provides that fallback.
- */
-function _views_bulk_operations_entity_label($entity_type, $entity) {
- $label = entity_label($entity_type, $entity);
- if (!$label) {
- $entity_info = entity_get_info($entity_type);
- $id_key = $entity_info['entity keys']['id'];
- // Many entity types (e.g. "user") have a name which fits the label perfectly.
- if (isset($entity->name)) {
- $label = $entity->name;
- }
- elseif (isset($entity->{$id_key})) {
- // Fallback to the id key.
- $label = $entity->{$id_key};
- }
- }
-
- return $label;
-}
-
/**
* Helper function to report an error.
*/
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.rules.inc b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.rules.inc
index b3a6418..78fae20 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.rules.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.rules.inc
@@ -114,15 +114,25 @@ function views_bulk_operations_rules_action_info() {
function views_bulk_operations_views_list() {
$selectable_displays = array();
foreach (views_get_enabled_views() as $name => $base_view) {
+ $view = $base_view->clone_view();
foreach ($base_view->display as $display_name => $display) {
- $view = $base_view->clone_view();
- $view->build($display_name);
- $vbo = _views_bulk_operations_get_field($view);
- if ($vbo) {
- $selectable_displays[$view->name . '|' . $display_name] = check_plain($view->human_name) . ' | ' . check_plain($display->display_title);
+ if (!$view->set_display($display_name)) {
+ continue;
+ }
+
+ // Initialize the style plugin and only continue to initialize handlers
+ // if the style uses fields.
+ if (!$view->init_style() || !$view->style_plugin->uses_fields()) {
+ continue;
+ }
+
+ $view->init_handlers($display_name);
+ if (_views_bulk_operations_get_field($view)) {
+ $selectable_displays[$view->name . '|' . $display_name] = check_plain($view->human_name . ' | ' . $display->display_title);
}
}
}
+
return $selectable_displays;
}
@@ -163,7 +173,11 @@ function views_bulk_operations_action_load_list($view, $args) {
$entity_type = $vbo->get_entity_type();
$entities = entity_metadata_wrapper("list<$entity_type>", array());
foreach ($vbo->view->result as $row_index => $result) {
- $entities[] = entity_metadata_wrapper($entity_type, $vbo->get_value($result));
+ // Grab the entire entity if it's already loaded or fall back to the
+ // entity identifier.
+ $entity = $vbo->get_value($result);
+ $data = $entity ? $entity : $result->{$vbo->real_field};
+ $entities[] = entity_metadata_wrapper($entity_type, $data);
}
return array('entity_list' => $entities);