summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/views/modules
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/views/modules')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator.views.inc25
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_fid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_iid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_category.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_title_link.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_xss.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_plugin_row_aggregator_rss.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book.views.inc24
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book/views_plugin_argument_default_book_root.inc21
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment.views.inc42
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_argument_comment_user_uid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment.inc10
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_depth.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_approve.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_delete.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_edit.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_reply.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_node_link.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_last_comment_timestamp.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_comment_name.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_updated.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_comment.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_comment_user_uid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_ncs_last_updated.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_node_comment.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_comment_thread.inc10
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_updated.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_rss.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_view.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact.views.inc11
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact/views_handler_field_contact_link.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field.views.inc35
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list_string.inc59
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_field_field.inc81
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_filter_field_list.inc21
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_relationship_entity_reverse.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/file.views.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter.views.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter/views_handler_field_filter_format_name.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/image.views.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale.views.inc29
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_group.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_language.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_group.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_language.inc11
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_link_edit.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_node_language.inc (renamed from kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_language.inc)7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_group.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_language.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_version.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_node_language.inc (renamed from kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_language.inc)6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views.inc58
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views_template.inc2
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc2
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc66
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc28
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc26
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc11
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc4
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc17
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/poll.views.inc16
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile.views.inc17
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_date.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_list.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_filter_profile_selection.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search.views.inc19
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_argument_search.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_field_search_score.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_filter_search.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_sort_search_score.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_plugin_row_search_view.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics.views.inc16
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics/views_handler_field_accesslog_path.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system.views.inc41
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_argument_file_fid.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_extension.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_filemime.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_status.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_uri.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_file_status.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_system_type.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy.views.inc55
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc11
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc15
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation.views.inc33
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_argument_node_tnid.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_link_translate.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_translation_link.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid_child.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_relationship_translation.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user.views.inc27
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_user_uid.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_users_roles_rid.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_language.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_cancel.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_edit.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_mail.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_name.inc10
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_permissions.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_picture.inc7
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_roles.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_current.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc21
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_permissions.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_roles.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_current_user.inc1
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_user.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_validate_user.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc29
153 files changed, 1244 insertions, 414 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator.views.inc
index 0ca9e33..0fcae2c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator.views.inc
@@ -1,20 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for aggregator.module
- */
/**
- * @defgroup views_aggregator_module aggregator.module handlers
- *
- * Includes the core 'aggregator_feed,' 'aggregator_category,' and 'aggregator_item'
- * tables.
+ * @file
+ * Provide views data and handlers for aggregator.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function aggregator_views_data() {
// ----------------------------------------------------------------------
@@ -249,6 +243,9 @@ function aggregator_views_data() {
'filter' => array(
'handler' => 'views_handler_filter_string',
),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_string',
+ ),
);
// link
@@ -263,7 +260,6 @@ function aggregator_views_data() {
'sort' => array(
'handler' => 'views_handler_sort',
),
- // Information for accepting a title as a filter
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -281,7 +277,6 @@ function aggregator_views_data() {
'sort' => array(
'handler' => 'views_handler_sort_date',
),
- // Information for accepting a title as a filter
'filter' => array(
'handler' => 'views_handler_filter_date',
),
@@ -299,7 +294,6 @@ function aggregator_views_data() {
'handler' => 'views_handler_field_xss',
'click sortable' => FALSE,
),
- // Information for accepting a title as a filter
'filter' => array(
'handler' => 'views_handler_filter_string',
),
@@ -390,7 +384,7 @@ function aggregator_views_data() {
}
/**
- * Implements hook_views_plugins
+ * Implements hook_views_plugins().
*/
function aggregator_views_plugins() {
return array(
@@ -410,6 +404,3 @@ function aggregator_views_plugins() {
),
);
}
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
index c67832c..92ae8b7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_aggregator_category_cid.
+ */
+
+/**
* Argument handler to accept an aggregator category id.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_fid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_fid.inc
index ed11288..4147626 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_fid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_fid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_aggregator_fid.
+ */
+
+/**
* Argument handler to accept an aggregator feed id.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_iid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_iid.inc
index fe19ab6..d959b04 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_iid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_argument_aggregator_iid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_aggregator_iid.
+ */
+
+/**
* Argument handler to accept an aggregator item id.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_category.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_category.inc
index 0564810..99fffa1 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_category.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_category.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_aggregator_category.
+ */
+
+/**
* Field handler to provide simple renderer that allows linking to aggregator
* category.
*
@@ -17,7 +22,7 @@ class views_handler_field_aggregator_category extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_category'] = array('default' => FALSE);
+ $options['link_to_category'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_title_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_title_link.inc
index d428f44..d8bf578 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_title_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_title_link.inc
@@ -1,6 +1,11 @@
<?php
- /**
+/**
+ * @file
+ * Definition of views_handler_field_aggregator_title_link.
+ */
+
+/**
* Field handler that turns an item's title into a clickable link to the original
* source article.
*
@@ -15,7 +20,7 @@ class views_handler_field_aggregator_title_link extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['display_as_link'] = array('default' => TRUE);
+ $options['display_as_link'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_xss.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_xss.inc
index 0813e35..d39b101 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_xss.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_field_aggregator_xss.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_aggregator_xss.
+ */
+
/**
* Filters htmls tags from item.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
index 27cf674..f9931c8 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_aggregator_category_cid.
+ */
+
/**
* Filter by aggregator category cid
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_plugin_row_aggregator_rss.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_plugin_row_aggregator_rss.inc
index 35aadec..672952e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_plugin_row_aggregator_rss.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/aggregator/views_plugin_row_aggregator_rss.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the Aggregator Item RSS row style plugin.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book.views.inc
index 2b1a82a..15a2183 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book.views.inc
@@ -1,17 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for book.module
- */
/**
- * @defgroup views_book_module book.module handlers
+ * @file
+ * Provide views data and handlers for book.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function book_views_data() {
// ----------------------------------------------------------------------
@@ -119,5 +116,16 @@ 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'
+ ),
+ ),
+ );
+}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book/views_plugin_argument_default_book_root.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book/views_plugin_argument_default_book_root.inc
new file mode 100644
index 0000000..1ce3046
--- /dev/null
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/book/views_plugin_argument_default_book_root.inc
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file
+ * Contains the book root from current node argument default plugin.
+ */
+
+/**
+ * Default argument plugin to get the current node's book root.
+ */
+class views_plugin_argument_default_book_root extends views_plugin_argument_default_node {
+ function get_argument() {
+ // Use the argument_default_node plugin to get the nid argument.
+ $nid = parent::get_argument();
+ if (!empty($nid)) {
+ $node = node_load($nid);
+ if (isset($node->book['bid'])) {
+ return $node->book['bid'];
+ }
+ }
+ }
+}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment.views.inc
index e22ccd5..65ef18c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment.views.inc
@@ -1,18 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for comment.module
- */
/**
- * @defgroup views_comment_module comment.module handlers
+ * @file
+ * Provide views data and handlers for comment.module.
*
- * Includes the tables 'comment' and 'node_comment_statistics'
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function comment_views_data() {
@@ -172,6 +168,28 @@ function comment_views_data() {
),
);
+
+ // Language field
+ if (module_exists('locale')) {
+ $data['comment']['language'] = array(
+ 'title' => t('Language'),
+ 'help' => t('The language the comment is in.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_locale_language',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_locale_language',
+ ),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_locale_language',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ );
+ }
+
$data['comments']['timestamp']['moved to'] = array('comment', 'changed');
// changed (when comment was last updated)
$data['comment']['changed'] = array(
@@ -505,7 +523,7 @@ function comment_views_data() {
'handler' => 'views_handler_argument_numeric',
),
'field' => array(
- 'handler' => 'views_handler_filter_user_name',
+ 'handler' => 'views_handler_field_numeric',
),
);
@@ -585,7 +603,7 @@ function comment_views_data_alter(&$data) {
}
/**
- * Implements hook_views_plugins
+ * Implements hook_views_plugins().
*/
function comment_views_plugins() {
return array(
@@ -642,7 +660,3 @@ function template_preprocess_views_view_row_comment(&$vars) {
}
$vars['comment'] = drupal_render($build);
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_argument_comment_user_uid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_argument_comment_user_uid.inc
index 11144a9..d821f32 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_argument_comment_user_uid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_argument_comment_user_uid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_comment_user_uid.
+ */
+
+/**
* Argument handler to accept a user id to check for nodes that
* user posted or commented on.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment.inc
index b855b63..7ca3256 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment.
+ */
+
/**
* Field handler to allow linking to a comment.
*
@@ -18,8 +24,8 @@ class views_handler_field_comment extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_comment'] = array('default' => TRUE);
- $options['link_to_node'] = array('default' => FALSE);
+ $options['link_to_comment'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['link_to_node'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_depth.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_depth.inc
index 8872a6a..4840a1e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_depth.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_depth.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment_depth.
+ */
+
/**
* Field handler to display the depth of a comment.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link.inc
index e0e0ba7..162924e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment_link.
+ */
+
/**
* Base field handler to present a link.
*
@@ -12,7 +18,7 @@ class views_handler_field_comment_link extends views_handler_field_entity {
function option_definition() {
$options = parent::option_definition();
$options['text'] = array('default' => '', 'translatable' => TRUE);
- $options['link_to_node'] = array('default' => FALSE);
+ $options['link_to_node'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_approve.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_approve.inc
index 8063e20..0953d0c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_approve.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_approve.inc
@@ -1,6 +1,11 @@
<?php
+
/**
* @file
+ * Definition of views_handler_field_comment_link_approve.
+ */
+
+/**
* Provides a comment approve link.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_delete.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_delete.inc
index b74661b..c55ac1c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_delete.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_delete.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment_link_delete.
+ */
+
/**
* Field handler to present a link to delete a node.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_edit.inc
index ffd1f93..0b06c0e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_edit.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment_link_edit.
+ */
+
/**
* Field handler to present a link node edit.
*
@@ -7,7 +13,7 @@
class views_handler_field_comment_link_edit extends views_handler_field_comment_link {
function option_definition() {
$options = parent::option_definition();
- $options['destination'] = array('default' => FALSE);
+ $options['destination'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_reply.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_reply.inc
index 1564164..47d0f17 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_reply.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_link_reply.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_comment_link_reply.
+ */
+
+/**
* Field handler to present a link to delete a node.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_node_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_node_link.inc
index 0e4f610..7feecfb 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_node_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_node_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment_node_link.
+ */
+
/**
* Handler for showing comment module's node link.
*
@@ -22,7 +28,7 @@ class views_handler_field_comment_node_link extends views_handler_field_entity {
function option_definition() {
$options = parent::option_definition();
- $options['teaser'] = array('default' => 0);
+ $options['teaser'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -32,7 +38,6 @@ class views_handler_field_comment_node_link extends views_handler_field_entity {
'#title' => t('Show teaser-style link'),
'#default_value' => $this->options['teaser'],
'#description' => t('Show the comment link in the form used on standard node teasers, rather than the full node form.'),
- '#fieldset' => 'more',
);
parent::options_form($form, $form_state);
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
index 6b6186e..887a74e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_comment_username.
+ */
+
/**
* Field handler to allow linking to a user account or homepage.
*
@@ -16,7 +22,7 @@ class views_handler_field_comment_username extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_user'] = array('default' => TRUE);
+ $options['link_to_user'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_last_comment_timestamp.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_last_comment_timestamp.inc
index 2bfa970..e7cf8bd 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_last_comment_timestamp.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_last_comment_timestamp.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_last_comment_timestamp.
+ */
+
+/**
* Field handler to display the timestamp of a comment with the count of comments.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_comment_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_comment_name.inc
index 63f948f..c9c6885 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_comment_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_comment_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_ncs_last_comment_name.
+ */
+
+/**
* Field handler to present the name of the last comment poster.
*
* @ingroup views_field_handlers
@@ -28,7 +33,7 @@ class views_handler_field_ncs_last_comment_name extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_user'] = array('default' => TRUE);
+ $options['link_to_user'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_updated.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_updated.inc
index 3950ffb..d1d7306 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_updated.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_ncs_last_updated.inc
@@ -1,4 +1,9 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_ncs_last_updated.
+ */
/**
* Field handler to display the newer of last comment / node updated.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_comment.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_comment.inc
index 6892fed..d863c44 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_comment.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_comment.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_node_comment.
+ */
+
+/**
* Display node comment status.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc
index 0ecdfc6..70b0581 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_node_new_comments.
+ */
+
+/**
* Field handler to display the number of new comments.
*
* @ingroup views_field_handlers
@@ -26,7 +31,7 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
function option_definition() {
$options = parent::option_definition();
- $options['link_to_comment'] = array('default' => TRUE);
+ $options['link_to_comment'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_comment_user_uid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_comment_user_uid.inc
index 4f9e711..e76ebb7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_comment_user_uid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_comment_user_uid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_comment_user_uid.
+ */
+
+/**
* Filter handler to accept a user id to check for nodes that user posted or
* commented on.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_ncs_last_updated.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_ncs_last_updated.inc
index 3818db9..2319edf 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_ncs_last_updated.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_ncs_last_updated.inc
@@ -1,6 +1,12 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_ncs_last_updated.
+ */
+
/**
- * Filter handler for the newer of last comment / node updated
+ * Filter handler for the newer of last comment / node updated.
*
* @ingroup views_filter_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_node_comment.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_node_comment.inc
index 659eaa6..befce10 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_node_comment.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_filter_node_comment.inc
@@ -1,7 +1,12 @@
<?php
/**
- * Filter based on comment node status
+ * @file
+ * Definition of views_handler_filter_node_comment.
+ */
+
+/**
+ * Filter based on comment node status.
*
* @ingroup views_filter_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_comment_thread.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_comment_thread.inc
index e529b2a..e513a93 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_comment_thread.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_comment_thread.inc
@@ -1,6 +1,14 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_sort_comment_thread.
+ */
+
/**
- * Sort handler for ordering by thread
+ * Sort handler for ordering by thread.
+ *
+ * @ingroup views_sort_handlers
*/
class views_handler_sort_comment_thread extends views_handler_sort {
function query() {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc
index 8eca177..613045a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_sort_ncs_last_comment_name.
+ */
+
/**
* Sort handler to sort by last comment name which might be in 2 different
* fields.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_updated.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_updated.inc
index 04b01a1..83f0f54 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_updated.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_handler_sort_ncs_last_updated.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_sort_ncs_last_updated.
+ */
+
/**
* Sort handler for the newer of last comment / node updated.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_rss.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_rss.inc
index 7576bb5..d287b8e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_rss.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_rss.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the comment RSS row style plugin.
@@ -15,7 +16,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
$options = parent::option_definition();
$options['item_length'] = array('default' => 'default');
- $options['links'] = FALSE;
+ $options['links'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_view.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_view.inc
index 284fa5f..f78fa36 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_view.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/comment/views_plugin_row_comment_view.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node RSS row style plugin.
@@ -27,7 +28,7 @@ class views_plugin_row_comment_view extends views_plugin_row {
function option_definition() {
$options = parent::option_definition();
- $options['links'] = array('default' => TRUE);
+ $options['links'] = array('default' => TRUE, 'bool' => TRUE);
$options['view_mode'] = array('default' => 'full');
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact.views.inc
index 85bcb94..412d824 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact.views.inc
@@ -1,10 +1,16 @@
<?php
+
/**
* @file
- * Provide views data and handlers for contact.module
+ * Provide views data and handlers for contact.module.
+ *
+ * @ingroup views_module_handlers
*/
-function contact_views_data() {
+/**
+ * Implements hook_views_data_alter().
+ */
+function contact_views_data_alter(&$data) {
$data['users']['contact'] = array(
'field' => array(
'title' => t('Link to contact page'),
@@ -12,5 +18,4 @@ function contact_views_data() {
'handler' => 'views_handler_field_contact_link',
),
);
- return $data;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact/views_handler_field_contact_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact/views_handler_field_contact_link.inc
index 0a44f21..9d22f01 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact/views_handler_field_contact_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/contact/views_handler_field_contact_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_contact_link.
+ */
+
/**
* A field that links to the user contact page, if access is permitted.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field.views.inc
index dd4363f..fe1968b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field.views.inc
@@ -2,17 +2,13 @@
/**
* @file
- * Provide Views data and handlers for field.module
- */
-
-/**
- * @defgroup views_field_module field.module handlers
+ * Provide Views data and handlers for field.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*
* Field modules can implement hook_field_views_data() to override
* the default behavior for adding fields.
@@ -41,7 +37,7 @@ function field_views_data() {
}
/**
- * Implements hook_views_data_alter()
+ * Implements hook_views_data_alter().
*
* Field modules can implement hook_field_views_data_views_data_alter() to
* alter the views data on a per field basis. This is weirdly named so as
@@ -342,7 +338,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' => t('- No value -'),
);
$data[$table][$column_real_name]['filter'] = array(
'field' => $column_real_name,
@@ -381,7 +377,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' => t('- No value -'),
'field_name' => $field['field_name'],
);
$data[$table]['delta']['filter'] = array(
@@ -412,18 +408,19 @@ function field_views_field_default_views_data($field) {
function list_field_views_data($field) {
$data = field_views_field_default_views_data($field);
foreach ($data as $table_name => $table_data) {
- foreach ($table_data as $field => $field_data) {
- if (isset($field_data['filter']) && $field != 'delta') {
- $data[$table_name][$field]['filter']['handler'] = 'views_handler_filter_field_list';
+ foreach ($table_data as $field_name => $field_data) {
+ if (isset($field_data['filter']) && $field_name != 'delta') {
+ $data[$table_name][$field_name]['filter']['handler'] = 'views_handler_filter_field_list';
}
- if (isset($field_data['argument']) && $field != 'delta') {
- $data[$table_name][$field]['argument']['handler'] = 'views_handler_argument_field_list';
+ if (isset($field_data['argument']) && $field_name != 'delta') {
+ if ($field['type'] == 'list_text') {
+ $data[$table_name][$field_name]['argument']['handler'] = 'views_handler_argument_field_list_string';
+ }
+ else {
+ $data[$table_name][$field_name]['argument']['handler'] = 'views_handler_argument_field_list';
+ }
}
}
}
return $data;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list.inc
index f8f10e9..e0f7abe 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list.inc
@@ -1,18 +1,21 @@
<?php
+
/**
* @file
- * Contains views_handler_argument_field_list handler
+ * Definition of views_handler_argument_field_list.
*/
/**
- * Argument handler for list field to show the human readable name in the summary.
+ * Argument handler for list field to show the human readable name in the
+ * summary.
*
* @ingroup views_argument_handlers
*/
class views_handler_argument_field_list extends views_handler_argument_numeric {
/**
- * @var array
* Stores the allowed values of this field.
+ *
+ * @var array
*/
var $allowed_values = NULL;
@@ -24,7 +27,7 @@ class views_handler_argument_field_list extends views_handler_argument_numeric {
function option_definition() {
$options = parent::option_definition();
- $options['summary']['contains']['human'] = array('default' => FALSE);
+ $options['summary']['contains']['human'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -35,7 +38,7 @@ class views_handler_argument_field_list extends views_handler_argument_numeric {
$form['summary']['human'] = array(
'#title' => t('Display list value as human readable'),
'#type' => 'checkbox',
- '#default_value' => $this->options['summary']['human'],#
+ '#default_value' => $this->options['summary']['human'],
'#dependency' => array('radio:options[default_action]' => array('summary')),
);
}
@@ -53,4 +56,3 @@ class views_handler_argument_field_list extends views_handler_argument_numeric {
}
}
}
-
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list_string.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list_string.inc
new file mode 100644
index 0000000..67a9f2d
--- /dev/null
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_argument_field_list_string.inc
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_field_list_text.
+ */
+
+/**
+ * Argument handler for list field to show the human readable name in the
+ * summary.
+ *
+ * @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;
+
+ 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() {
+ $options = parent::option_definition();
+
+ $options['summary']['contains']['human'] = array('default' => FALSE, 'bool' => TRUE);
+
+ return $options;
+ }
+
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+
+ $form['summary']['human'] = array(
+ '#title' => t('Display list value as human readable'),
+ '#type' => 'checkbox',
+ '#default_value' => $this->options['summary']['human'],
+ '#dependency' => array('radio:options[default_action]' => array('summary')),
+ );
+ }
+
+
+ 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 {
+ return $this->case_transform(check_plain($value), $this->options['case']);
+ }
+ }
+}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_field_field.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_field_field.inc
index 8e0b767..b50a0ae 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_field_field.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_field_field.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_field.
+ */
+
+/**
* Helper function: Return an array of formatter options for a field type.
*
* Borrowed from field_ui.
@@ -28,19 +33,54 @@ function _field_view_formatter_options($field_type = NULL) {
}
/**
- * A field that displays fields.
+ * A field that displays fieldapi fields.
+ *
+ * @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.
+ *
+ * @var array
*/
public $items = array();
/**
- * Store the field informations.
+ * Store the field information.
+ *
+ * @var array
*/
public $field_info = array();
+
+ /**
+ * Does the field supports multiple field values.
+ *
+ * @var bool
+ */
+ public $multiple;
+
+ /**
+ * Does the rendered fields get limited.
+ *
+ * @var bool
+ */
+ public $limit_values;
+
+ /**
+ * A shortcut for $view->base_table.
+ *
+ * @var string
+ */
+ public $base_table;
+
+ /**
+ * Store the field instance.
+ *
+ * @var array
+ */
+ public $instance;
+
function init(&$view, &$options) {
parent::init($view, $options);
@@ -68,10 +108,19 @@ class views_handler_field_field extends views_handler_field {
$this->limit_values = TRUE;
}
}
+
+ // Convert old style entity id group column to new format.
+ // @todo Remove for next major version.
+ if ($this->options['group_column'] == 'entity id') {
+ $this->options['group_column'] = 'entity_id';
+ }
}
/**
- * Return TRUE if the user has access to view this field.
+ * Check whether current user has access to this handler.
+ *
+ * @return bool
+ * Return TRUE if the user has access to view this field.
*/
function access() {
$base_table = $this->get_base_table();
@@ -80,6 +129,9 @@ class views_handler_field_field extends views_handler_field {
/**
* Set the base_table and base_table_alias.
+ *
+ * @return string
+ * The base table which is used in the current view "context".
*/
function get_base_table() {
if (!isset($this->base_table)) {
@@ -170,7 +222,7 @@ class views_handler_field_field extends views_handler_field {
$options = array($this->options['group_column'] => $this->options['group_column']);
}
- $options += $this->options['group_columns'];
+ $options += is_array($this->options['group_columns']) ? $this->options['group_columns'] : array();
$fields = array();
@@ -206,7 +258,8 @@ class views_handler_field_field extends views_handler_field {
$this->view->display_handler->options['field_language']);
$placeholder = $this->placeholder();
$language_fallback_candidates = array($language);
- if (variable_get('locale_field_language_fallback', TRUE) && module_exists('locale')) {
+ if (variable_get('locale_field_language_fallback', TRUE)) {
+ require_once DRUPAL_ROOT . '/includes/language.inc';
$language_fallback_candidates = array_merge($language_fallback_candidates, language_fallback_get_candidates());
}
else {
@@ -312,6 +365,7 @@ class views_handler_field_field extends views_handler_field {
// Options used for multiple value fields.
$options['group_rows'] = array(
'default' => TRUE,
+ 'bool' => TRUE,
);
// If we know the exact number of allowed values, then that can be
// the default. Otherwise, default to 'all'.
@@ -323,9 +377,11 @@ class views_handler_field_field extends views_handler_field {
);
$options['delta_reversed'] = array(
'default' => FALSE,
+ 'bool' => TRUE,
);
$options['delta_first_last'] = array(
'default' => FALSE,
+ 'bool' => TRUE,
);
$options['multi_type'] = array(
@@ -337,6 +393,7 @@ class views_handler_field_field extends views_handler_field {
$options['field_api_classes'] = array(
'default' => FALSE,
+ 'bool' => TRUE,
);
return $options;
@@ -364,7 +421,7 @@ class views_handler_field_field extends views_handler_field {
else {
$form['click_sort_column'] = array(
'#type' => 'select',
- '#title' => t('Click sort column'),
+ '#title' => t('Column used for click sorting'),
'#options' => drupal_map_assoc($column_names),
'#default_value' => $this->options['click_sort_column'],
'#description' => t('Used by Style: Table to determine the actual column to click sort the field on. The default is usually fine.'),
@@ -405,10 +462,10 @@ class views_handler_field_field extends views_handler_field {
// Provide an instance array for hook_field_formatter_settings_form().
ctools_include('fields');
- $instance = ctools_fields_fake_field_instance($this->definition['field_name'], '_dummy', $formatter, $settings);
+ $this->instance = ctools_fields_fake_field_instance($this->definition['field_name'], '_custom', $formatter, $settings);
- // Store the settings in a '_dummy' view mode.
- $instance['display']['_dummy'] = array(
+ // Store the settings in a '_custom' view mode.
+ $this->instance['display']['_custom'] = array(
'type' => $format,
'settings' => $settings,
);
@@ -417,7 +474,7 @@ class views_handler_field_field extends views_handler_field {
$settings_form = array('#value' => array());
$function = $formatter['module'] . '_field_formatter_settings_form';
if (function_exists($function)) {
- $settings_form = $function($field, $instance, '_dummy', $form, $form_state);
+ $settings_form = $function($field, $this->instance, '_custom', $form, $form_state);
}
$form['settings'] = $settings_form;
}
@@ -574,7 +631,7 @@ class views_handler_field_field extends views_handler_field {
$entities_by_type = array();
$revisions_by_type = array();
foreach ($values as $key => $object) {
- if (isset($object->{$this->field_alias}) && !isset($values[$key]->_field_data[$this->field_alias])) {
+ if (isset($this->aliases['entity_type']) && isset($object->{$this->aliases['entity_type']}) && isset($object->{$this->field_alias}) && !isset($values[$key]->_field_data[$this->field_alias])) {
$entity_type = $object->{$this->aliases['entity_type']};
if (empty($this->definition['is revision'])) {
$entity_id = $object->{$this->field_alias};
@@ -804,7 +861,7 @@ class views_handler_field_field extends views_handler_field {
if (isset($render_array['#access'])) {
$items[$count]['rendered']['#access'] = $render_array['#access'];
}
- // Only add the raw field items (for use in tokens) if the curent user
+ // Only add the raw field items (for use in tokens) if the current user
// has access to view the field content.
if ((!isset($items[$count]['rendered']['#access']) || $items[$count]['rendered']['#access']) && !empty($render_array['#items'][$count])) {
$items[$count]['raw'] = $render_array['#items'][$count];
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_filter_field_list.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_filter_field_list.inc
index 971fb35..440d55b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_filter_field_list.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_filter_field_list.inc
@@ -1,11 +1,30 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_field_list.
+ */
+
+/**
* Filter handler which uses list-fields as options.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_field_list extends views_handler_filter_in_operator {
+class views_handler_filter_field_list extends views_handler_filter_many_to_one {
+
+ function init(&$view, &$options) {
+ parent::init($view, $options);
+ // Migrate the settings from the old filter_in_operator values to filter_many_to_one.
+ if ($this->options['operator'] == 'in') {
+ $this->options['operator'] = 'or';
+ }
+ if ($this->options['operator'] == 'not in') {
+ $this->options['operator'] = 'not';
+ }
+ $this->operator = $this->options['operator'];
+ }
+
+
function get_value_options() {
$field = field_info_field($this->definition['field_name']);
$this->value_options = list_allowed_values($field);
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_relationship_entity_reverse.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_relationship_entity_reverse.inc
index c83fa11..89f2483 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_relationship_entity_reverse.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/field/views_handler_relationship_entity_reverse.inc
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * Views' relationship handlers.
+ * Definition of views_handler_relationship_entity_reverse.
*/
/**
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/file.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/file.views.inc
index 30db20b..8556938 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/file.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/file.views.inc
@@ -1,14 +1,10 @@
<?php
-/**
- * @file
- *
- * Provide views data and handlers for file.module
- */
/**
- * @defgroup views_file_module file.module handlers
+ * @file
+ * Provide views data and handlers for file.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
@@ -75,7 +71,3 @@ function file_field_views_data_views_data_alter(&$data, $field) {
);
}
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter.views.inc
index c13d887..0a3b4fc 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter.views.inc
@@ -1,18 +1,14 @@
<?php
+
/**
* @file
* Provide basic views data for filter.module.
- */
-
-/**
- * @defgroup views_filter_module filter.module handlers
*
- * Only includes the table 'filter_formats'.
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function filter_views_data() {
// ----------------------------------------------------------------------
@@ -35,7 +31,3 @@ function filter_views_data() {
return $data;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter/views_handler_field_filter_format_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter/views_handler_field_filter_format_name.inc
index 9b7b457..0a7bf3b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter/views_handler_field_filter_format_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/filter/views_handler_field_filter_format_name.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_filter_format_name.
+ */
+
/**
* Field handler to output the name of an input format.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/image.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/image.views.inc
index 1dec9e4..6fc6565 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/image.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/image.views.inc
@@ -1,14 +1,10 @@
<?php
-/**
- * @file
- *
- * Provide views data and handlers for image.module
- */
/**
- * @defgroup views_image_module image.module handlers
+ * @file
+ * Provide views data and handlers for image.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
@@ -74,7 +70,3 @@ function image_field_views_data_views_data_alter(&$data, $field) {
);
}
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale.views.inc
index 057b2a6..3bff7db 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale.views.inc
@@ -2,14 +2,9 @@
/**
* @file
- *
* Provides views data and handlers for locale.module.
- */
-
-/**
- * @defgroup views_locale_module locale.module handlers
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
@@ -202,5 +197,25 @@ function locale_views_data() {
}
/**
- * @}
+ * Implements hook_views_data_alter().
*/
+function locale_views_data_alter(&$data) {
+ // Language field
+ $data['node']['language'] = array(
+ 'title' => t('Language'),
+ 'help' => t('The language the content is in.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_node_language',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_node_language',
+ ),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_node_language',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ );
+}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_group.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_group.inc
index 1525560..7ced836 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_group.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_group.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_locale_group.
+ */
+
+/**
* Argument handler to accept a language.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_language.inc
index 8d4f38c..316d4b1 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_argument_locale_language.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_locale_language.
+ */
+
+/**
* Argument handler to accept a language.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_group.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_group.inc
index 22339e8..393a948 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_group.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_group.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_locale_group.
+ */
+
+/**
* Field handler to translate a group into its readable form.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_language.inc
index 0ff36a8..8038e2b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_language.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_locale_language.
+ */
+
+/**
* Field handler to translate a language into its readable form.
*
* @ingroup views_field_handlers
@@ -8,7 +13,7 @@
class views_handler_field_locale_language extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['native_language'] = array('default' => FALSE);
+ $options['native_language'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -24,8 +29,8 @@ class views_handler_field_locale_language extends views_handler_field {
}
function render($values) {
- $languages = locale_language_list(empty($this->$options['native_language']) ? 'name' : 'native');
+ $languages = locale_language_list(empty($this->options['native_language']) ? 'name' : 'native');
$value = $this->get_value($values);
- return isset($languages[$value]) ? $languages[$value]->name : '';
+ return isset($languages[$value]) ? $languages[$value] : '';
}
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_link_edit.inc
index 6c8f8f4..3789355 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_locale_link_edit.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_locale_link_edit.
+ */
+
+/**
* Field handler to present a link to edit a translation.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_node_language.inc
index b2e8d9c..467605b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_field_node_language.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_node_language.
+ */
+
+/**
* Field handler to translate a language into its readable form.
*
* @ingroup views_field_handlers
@@ -8,7 +13,7 @@
class views_handler_field_node_language extends views_handler_field_node {
function option_definition() {
$options = parent::option_definition();
- $options['native_language'] = array('default' => FALSE);
+ $options['native_language'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_group.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_group.inc
index 1941549..5ec1e92 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_group.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_group.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_locale_group.
+ */
+
+/**
* Filter by locale group.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_language.inc
index 9c7ba90..eee12a6 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_language.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_locale_language.
+ */
+
+/**
* Filter by language.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_version.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_version.inc
index d828b2c..7170860 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_version.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_locale_version.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_locale_version.
+ */
+
+/**
* Filter by version.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_node_language.inc
index 73af163..7592577 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/locale/views_handler_filter_node_language.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_language.
+ */
+
/**
* Filter by language.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views.inc
index bff3544..ebba3d3 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views.inc
@@ -1,18 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for node.module
- */
/**
- * @defgroup views_node_module node.module handlers
+ * @file
+ * Provide views data and handlers for node.module.
*
- * Includes the tables 'node', 'node_revision' and 'history'.
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function node_views_data() {
// ----------------------------------------------------------------
@@ -34,23 +30,11 @@ function node_views_data() {
);
$data['node']['table']['entity type'] = 'node';
-
- // For other base tables, explain how we join
- $data['node']['table']['join'] = array(
- // this explains how the 'node' table (named in the line above)
- // links toward the node_revision table.
+ $data['node']['table']['default_relationship'] = array(
'node_revision' => array(
- 'handler' => 'views_join', // this is actually optional
- 'left_table' => 'node_revision', // Because this is a direct link it could be left out.
- 'left_field' => 'nid',
- 'field' => 'nid',
- // also supported:
- // 'type' => 'INNER',
- // 'extra' => array(array('field' => 'fieldname', 'value' => 'value', 'operator' => '='))
- // Unfortunately, you can't specify other tables here, but you can construct
- // alternative joins in the handlers that can do that.
- // 'table' => 'the actual name of this table in the database',
- ),
+ 'table' => 'node_revision',
+ 'field' => 'vid',
+ ),
);
// ----------------------------------------------------------------
@@ -221,7 +205,7 @@ function node_views_data() {
'handler' => 'views_handler_field_boolean',
'click sortable' => TRUE,
'output formats' => array(
- 'sticky' => array(t('Sticky'), ''),
+ 'sticky' => array(t('Sticky'), t('Not sticky')),
),
),
'filter' => array(
@@ -239,6 +223,8 @@ function node_views_data() {
// table so they can be re-used with other query backends.
// @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');
$data['views_entity_node']['view_node'] = array(
'field' => array(
@@ -426,6 +412,7 @@ function node_views_data() {
// 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']['group'] = t('Content revision');
// Support the conversion of the field body
$data['node_revisions']['body']['moved to'] = array('field_revision_data', 'body-revision_id');
@@ -449,6 +436,13 @@ function node_views_data() {
),
);
+ $data['node_revision']['table']['default_relationship'] = array(
+ 'node' => array(
+ 'table' => 'node',
+ 'field' => 'vid',
+ ),
+ );
+
// uid field for node revision
$data['node_revision']['uid'] = array(
'title' => t('User'),
@@ -543,6 +537,14 @@ function node_views_data() {
),
);
+ $data['node_revision']['link_to_revision'] = array(
+ 'field' => array(
+ 'title' => t('Link'),
+ 'help' => t('Provide a simple link to the revision.'),
+ 'handler' => 'views_handler_field_node_revision_link',
+ ),
+ );
+
$data['node_revision']['revert_revision'] = array(
'field' => array(
'title' => t('Revert link'),
@@ -665,7 +667,7 @@ function node_views_plugins() {
}
/**
- * Implements hook_preprocess_node
+ * Implements hook_preprocess_node().
*/
function node_row_node_view_preprocess_node(&$vars) {
$node = $vars['node'];
@@ -747,7 +749,3 @@ function node_views_analyze($view) {
return $ret;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views_template.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views_template.inc
index ca0ed75..b2b184d 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views_template.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node.views_template.inc
@@ -1,8 +1,10 @@
<?php
+
/**
* @file
* Contains views templates on behalf of the node module.
*/
+
function node_views_templates() {
// Only the standard install profile has the image field provided so only show it for it.
if (variable_get('install_profile', 'standard') != 'standard') {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc
index 95404f1..5f4e4b2 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_dates_various.inc
@@ -1,11 +1,13 @@
<?php
+
/**
- * @defgroup views_argument_handlers Handlers for arguments
- * @{
+ * @file
+ * Handlers for various date arguments.
+ *
+ * @ingroup views_argument_handlers
*/
/**
- * @file
* Argument handler for a full date (CCYYMMDD)
*/
class views_handler_argument_node_created_fulldate extends views_handler_argument_date {
@@ -173,7 +175,3 @@ class views_handler_argument_node_created_week extends views_handler_argument_da
return t('Week @week', array('@week' => $created));
}
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc
index 1978168..170388a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_language.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_node_language.
+ */
+
/**
* Argument handler to accept a language.
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc
index 991bc8d..b0dbee0 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_nid.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Provide node nid argument handler.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc
index 638973d..ea99d7c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_type.inc
@@ -1,8 +1,14 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_node_type.
+ */
+
/**
* Argument handler to accept a node type.
*/
-class views_handler_argument_node_type extends views_handler_argument {
+class views_handler_argument_node_type extends views_handler_argument_string {
function construct() {
parent::construct('type');
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc
index 995872c..142882a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_uid_revision.inc
@@ -1,5 +1,9 @@
<?php
-// $Id$
+
+/**
+ * @file
+ * Defintion of views_handler_argument_node_uid_revision.
+ */
/**
* Filter handler to accept a user id to check for nodes that
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc
index 55db56a..1f970ad 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_argument_node_vid.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Provide node vid argument handler.
@@ -16,7 +17,7 @@ class views_handler_argument_node_vid extends views_handler_argument_numeric {
function title_query() {
$titles = array();
- $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
+ $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.vid IN (:vids)", array(':vids' => $this->value));
foreach ($result as $term) {
$titles[] = check_plain($term->title);
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc
index 45f6c56..dfe4931 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_history_user_timestamp.inc
@@ -1,8 +1,15 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_history_user_timestamp.
+ */
+
/**
* Field handler to display the marker for new content.
*
- * The handler is named history_user, because of compability reasons, the table is history.
+ * The handler is named history_user, because of compability reasons, the table
+ * is history.
*
* @ingroup views_field_handlers
*/
@@ -22,7 +29,7 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
function option_definition() {
$options = parent::option_definition();
- $options['comments'] = array('default' => FALSE);
+ $options['comments'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -56,12 +63,11 @@ class views_handler_field_history_user_timestamp extends views_handler_field_nod
global $user;
if ($user->uid) {
$last_read = $this->get_value($values);
- $created = $this->get_value($values, 'created');
$changed = $this->get_value($values, 'changed');
$last_comment = module_exists('comment') && !empty($this->options['comments']) ? $this->get_value($values, 'last_comment') : 0;
- if (!$last_read && $created > NODE_NEW_LIMIT) {
+ if (!$last_read && $changed > NODE_NEW_LIMIT) {
$mark = MARK_NEW;
}
elseif ($changed > $last_read && $changed > NODE_NEW_LIMIT) {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc
index eb90f01..f712a53 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the basic 'node' field handler.
@@ -26,7 +27,7 @@ class views_handler_field_node extends views_handler_field {
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);
+ $options['link_to_node'] = array('default' => isset($this->definition['link_to_node default']) ? $this->definition['link_to_node default'] : FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc
index ee9c2b9..7e9bbd2 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link.
+ */
+
/**
* Field handler to present a link to the node.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc
index 3e8075c..8271c0b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_delete.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link_delete.
+ */
+
/**
* Field handler to present a link to delete a node.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc
index f082c31..4e8aad0 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_link_edit.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link_edit.
+ */
+
/**
* Field handler to present a link node edit.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc
index 725869b..f47f85f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_path.inc
@@ -14,7 +14,7 @@ class views_handler_field_node_path extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['absolute'] = array('default' => FALSE);
+ $options['absolute'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc
index 3195e64..c04693a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision.
+ */
+
/**
* Contains the basic 'node_revision' field handler.
*/
@@ -21,7 +27,7 @@ class views_handler_field_node_revision extends views_handler_field_node {
}
function option_definition() {
$options = parent::option_definition();
- $options['link_to_node_revision'] = array('default' => FALSE);
+ $options['link_to_node_revision'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc
new file mode 100644
index 0000000..69047bb
--- /dev/null
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link.inc
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision_link.
+ */
+
+/**
+ * Field handler to present a link to a node revision.
+ *
+ * @ingroup views_field_handlers
+ */
+class views_handler_field_node_revision_link extends views_handler_field_node_link {
+
+ function construct() {
+ parent::construct();
+ $this->additional_fields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid');
+ }
+
+ function access() {
+ return user_access('view revisions') || user_access('administer nodes');
+ }
+
+ function render_link($data, $values) {
+ list($node, $vid) = $this->get_revision_entity($values, 'view');
+ if (!isset($vid)) {
+ return;
+ }
+
+ // Current revision uses the node view path.
+ $path = 'node/' . $node->nid;
+ if ($node->vid != $vid) {
+ $path .= "/revisions/$vid/view";
+ }
+
+ $this->options['alter']['make_link'] = TRUE;
+ $this->options['alter']['path'] = $path;
+ $this->options['alter']['query'] = drupal_get_destination();
+
+ return !empty($this->options['text']) ? $this->options['text'] : t('view');
+ }
+
+ /**
+ * Returns the revision values of a node.
+ *
+ * @param object $values
+ * An object containing all retrieved values.
+ * @param string $op
+ * The operation being performed.
+ *
+ * @return array
+ * A numerically indexed array containing the current node object and the
+ * revision ID for this row.
+ */
+ function get_revision_entity($values, $op) {
+ $vid = $this->get_value($values, 'node_vid');
+ $node = $this->get_value($values);
+ // Unpublished nodes ignore access control.
+ $node->status = 1;
+ // Ensure user has access to perform the operation on this node.
+ if (!node_access($op, $node)) {
+ return array($node, NULL);
+ }
+ return array($node, $vid);
+ }
+}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc
index b005c2e..e0d00a7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc
@@ -1,38 +1,36 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision_link_delete.
+ */
+
/**
- * Field handler to present delete a node revision.
+ * Field handler to present link to delete a node revision.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_revision_link_delete extends views_handler_field_node_link {
- function construct() {
- parent::construct();
- $this->additional_fields['node_vid'] = array('table' => 'node', 'field' => 'vid');
- }
+class views_handler_field_node_revision_link_delete extends views_handler_field_node_revision_link {
function access() {
return user_access('delete revisions') || user_access('administer nodes');
}
function render_link($data, $values) {
- // ensure user has access to delete this node.
- $node = $this->get_value($values);
- $node->status = 1; // unpublished nodes ignore access control
- if (!node_access('delete', $node)) {
+ list($node, $vid) = $this->get_revision_entity($values, 'delete');
+ if (!isset($vid)) {
return;
}
// Current revision cannot be deleted.
- if ($node->vid == $this->get_value($values, 'node_vid')) {
+ if ($node->vid == $vid) {
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
-
$this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = "node/$node->nid/revisions/$node->vid/delete";
+ $this->options['alter']['path'] = 'node/' . $node->nid . "/revisions/$vid/delete";
$this->options['alter']['query'] = drupal_get_destination();
- return $text;
+ return !empty($this->options['text']) ? $this->options['text'] : t('delete');
}
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc
index f26c0a3..af20442 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc
@@ -1,38 +1,36 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_revision_link_revert.
+ */
+
/**
* Field handler to present a link to revert a node to a revision.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_revision_link_revert extends views_handler_field_node_link {
- function construct() {
- parent::construct();
- $this->additional_fields['node_vid'] = array('table' => 'node', 'field' => 'vid');
- }
+class views_handler_field_node_revision_link_revert extends views_handler_field_node_revision_link {
function access() {
return user_access('revert revisions') || user_access('administer nodes');
}
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
- if (!node_access('update', $node)) {
+ list($node, $vid) = $this->get_revision_entity($values, 'update');
+ if (!isset($vid)) {
return;
}
// Current revision cannot be reverted.
- if ($node->vid == $this->get_value($values, 'node_vid')) {
+ if ($node->vid == $vid) {
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('revert');
-
$this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = "node/$node->nid/revisions/$node->vid/revert";
+ $this->options['alter']['path'] = 'node/' . $node->nid . "/revisions/$vid/revert";
$this->options['alter']['query'] = drupal_get_destination();
- return $text;
+ return !empty($this->options['text']) ? $this->options['text'] : t('revert');
}
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc
index 6d6202a..ba8ee3e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_field_node_type.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_node_type.
+ */
+
+/**
* Field handler to translate a node type into its readable form.
*
* @ingroup views_field_handlers
@@ -8,7 +13,7 @@
class views_handler_field_node_type extends views_handler_field_node {
function option_definition() {
$options = parent::option_definition();
- $options['machine_name'] = array('default' => FALSE);
+ $options['machine_name'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -24,7 +29,6 @@ class views_handler_field_node_type extends views_handler_field_node {
'#description' => t('Display field as the content type machine name.'),
'#type' => 'checkbox',
'#default_value' => !empty($this->options['machine_name']),
- '#fieldset' => 'more',
);
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc
index a13f531..acdb831 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc
@@ -1,8 +1,15 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_history_user_timestamp.
+ */
+
/**
- * Filter for new content
+ * Filter for new content.
*
- * The handler is named history_user, because of compability reasons, the table is history.
+ * The handler is named history_user, because of compability reasons, the table
+ * is history.
*
* @ingroup views_filter_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
index 37306f8..a9ee85c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_access.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_access.
+ */
+
/**
* Filter by node_access records.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
index 0babe5b..2afb286 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_status.inc
@@ -1,6 +1,12 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_status.
+ */
+
/**
- * Filter by published status
+ * Filter by published status.
*
* @ingroup views_filter_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc
index 8312691..7f8ab4b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_type.inc
@@ -1,6 +1,12 @@
<?php
+
/**
- * Filter by node type
+ * @file
+ * Definition of views_handler_filter_node_type.
+ */
+
+/**
+ * Filter by node type.
*
* @ingroup views_filter_handlers
*/
@@ -9,6 +15,7 @@ class views_handler_filter_node_type extends views_handler_filter_in_operator {
if (!isset($this->value_options)) {
$this->value_title = t('Content types');
$types = node_type_get_types();
+ $options = array();
foreach ($types as $type => $info) {
$options[$type] = t($info->name);
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc
index 9c6055c..4d3d9a7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_handler_filter_node_uid_revision.inc
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * Contains handler views_handler_filter_node_uid_revision.
+ * Definition of views_handler_filter_node_uid_revision.
*/
/**
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc
index f88af08..65fc0eb 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_default_node.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node from URL argument default plugin.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc
index 498ee76..018965d 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_argument_validate_node.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the 'node' argument validator plugin.
@@ -11,7 +12,7 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
function option_definition() {
$options = parent::option_definition();
$options['types'] = array('default' => array());
- $options['access'] = array('default' => FALSE);
+ $options['access'] = array('default' => FALSE, 'bool' => TRUE);
$options['access_op'] = array('default' => 'view');
$options['nid_type'] = array('default' => 'nid');
@@ -20,6 +21,7 @@ class views_plugin_argument_validate_node extends views_plugin_argument_validate
function options_form(&$form, &$form_state) {
$types = node_type_get_types();
+ $options = array();
foreach ($types as $type => $info) {
$options[$type] = check_plain(t($info->name));
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc
index 189ff1f..5da746b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_rss.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node RSS row style plugin.
@@ -20,7 +21,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
$options = parent::option_definition();
$options['item_length'] = array('default' => 'default');
- $options['links'] = FALSE;
+ $options['links'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -135,8 +136,15 @@ class views_plugin_row_node_rss extends views_plugin_row {
if (!empty($node->rss_namespaces)) {
$this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, $node->rss_namespaces);
- } else if (module_exists('rdf')) {
- $this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, rdf_get_namespaces());
+ }
+ elseif (function_exists('rdf_get_namespaces')) {
+ // Merge RDF namespaces in the XML namespaces in case they are used
+ // further in the RSS content.
+ $xml_rdf_namespaces = array();
+ foreach (rdf_get_namespaces() as $prefix => $uri) {
+ $xml_rdf_namespaces['xmlns:' . $prefix] = $uri;
+ }
+ $this->view->style_plugin->namespaces += $xml_rdf_namespaces;
}
// Hide the links if desired.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc
index d745add..4aefe46 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/node/views_plugin_row_node_view.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the node view row style plugin.
@@ -35,8 +36,8 @@ class views_plugin_row_node_view extends views_plugin_row {
$options = parent::option_definition();
$options['view_mode'] = array('default' => 'teaser');
- $options['links'] = array('default' => TRUE);
- $options['comments'] = array('default' => FALSE);
+ $options['links'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['comments'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
@@ -98,10 +99,12 @@ class views_plugin_row_node_view extends views_plugin_row {
}
function render($row) {
- $node = $this->nodes[$row->{$this->field_alias}];
- $node->view = $this->view;
- $build = node_view($node, $this->options['view_mode']);
+ if (isset($this->nodes[$row->{$this->field_alias}])) {
+ $node = $this->nodes[$row->{$this->field_alias}];
+ $node->view = $this->view;
+ $build = node_view($node, $this->options['view_mode']);
- return drupal_render($build);
+ return drupal_render($build);
+ }
}
-}
+} \ No newline at end of file
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/poll.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/poll.views.inc
index 5819b7e..d3fd76a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/poll.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/poll.views.inc
@@ -1,18 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for poll.module
- */
/**
- * @defgroup views_poll_module poll.module handlers
+ * @file
+ * Provide views data and handlers for poll.module.
*
- * Includes only the core 'poll' table for now.
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function poll_views_data() {
// Basic table information.
@@ -49,7 +45,3 @@ function poll_views_data() {
return $data;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile.views.inc
index 65ad71d..89db913 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile.views.inc
@@ -1,17 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for user.module
- */
/**
- * @defgroup views_profile_module profile.module handlers
+ * @file
+ * Provide views data and handlers for user.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function profile_views_data() {
$data['profile_values']['moved to'] = 'profile_value';
@@ -82,7 +79,7 @@ function profile_views_get_fields() {
}
else {
// serialized fields or modified version
- $row->options = unserialize(db_decode_blob($row->options));
+ $row->options = unserialize($row->options);
}
}
$fields[$row->fid] = $row;
@@ -218,7 +215,3 @@ function profile_views_fetch_field($field) {
// @todo: add access control to hidden fields.
return $data;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_date.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_date.inc
index e6b5fbc..2d9fe96 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_date.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_date.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_profile_date.
+ */
+
/**
* Field handler display a profile date
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_list.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_list.inc
index e3eaa30..8917b93 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_list.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_field_profile_list.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_profile_list.
+ */
+
/**
* Field handler display a profile list item.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_filter_profile_selection.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_filter_profile_selection.inc
index 9906753..d3403c9 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_filter_profile_selection.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/profile/views_handler_filter_profile_selection.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_profile_selection.
+ */
+
+/**
* Filter by a selection widget in the profile.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search.views.inc
index 6f0bc1b..dad84bb 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search.views.inc
@@ -1,18 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for search.module
- */
/**
- * @defgroup views_search_module search.module handlers
+ * @file
+ * Provide views data and handlers for search.module.
*
- * Includes the tables 'search_index'
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function search_views_data() {
// Basic table information.
@@ -134,7 +130,7 @@ function search_views_data() {
}
/**
- * Implements hook_views_plugins
+ * Implements hook_views_plugins().
*/
function search_views_plugins() {
return;
@@ -204,8 +200,3 @@ function template_preprocess_views_view_row_search(&$vars) {
//$vars['score'] = $item->score;
$vars['snippet'] = search_excerpt($vars['view']->value, $node->body);
}
-
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_argument_search.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_argument_search.inc
index 1b2c6e5..f0a4a44 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_argument_search.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_argument_search.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_search.
+ */
+
+/**
* Argument that accepts query keys for search.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_field_search_score.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_field_search_score.inc
index 96f124d..0feddac 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_field_search_score.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_field_search_score.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_search_score.
+ */
+
/**
* Field handler to provide simple renderer that allows linking to a node.
*
@@ -72,5 +78,4 @@ class views_handler_field_search_score extends views_handler_field_numeric {
return parent::render($values);
}
}
-
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_filter_search.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_filter_search.inc
index c5defd8..7430494 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_filter_search.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_filter_search.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Contains a search filter handler.
+ */
+
+/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_filter_handlers
@@ -170,6 +175,9 @@ class views_handler_filter_search extends views_handler_filter {
}
}
+/**
+ * Extends the core SearchQuery.
+ */
class viewsSearchQuery extends SearchQuery {
public function &conditions() {
return $this->conditions;
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_sort_search_score.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_sort_search_score.inc
index 614d83a..d37fb65 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_sort_search_score.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_handler_sort_search_score.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_sort_search_score.
+ */
+
+/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_sort_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_plugin_row_search_view.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_plugin_row_search_view.inc
index 7383344..e4aacdc 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_plugin_row_search_view.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/search/views_plugin_row_search_view.inc
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * Contains the search row style plugin.
+ * Definition of views_plugin_row_search_view.
*/
/**
@@ -11,7 +12,7 @@ class views_plugin_row_search_view extends views_plugin_row {
function option_definition() {
$options = parent::option_definition();
- $options['score'] = array('default' => TRUE);
+ $options['score'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics.views.inc
index 187d9f1..d6637f3 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics.views.inc
@@ -1,18 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for statistics.module
- */
/**
- * @defgroup views_statistics_module statistics.module handlers
+ * @file
+ * Provide views data and handlers for statistics.module.
*
- * Includes the ability to create views of just the statistics table.
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function statistics_views_data() {
// Basic table information.
@@ -265,7 +261,3 @@ function statistics_views_data() {
return $data;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics/views_handler_field_accesslog_path.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics/views_handler_field_accesslog_path.inc
index d0daa69..85b2352 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics/views_handler_field_accesslog_path.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/statistics/views_handler_field_accesslog_path.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_accesslog_path.
+ */
+
/**
* Field handler to provide simple renderer that turns a URL into a clickable link.
*
@@ -18,7 +24,7 @@ class views_handler_field_accesslog_path extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['display_as_link'] = array('default' => TRUE);
+ $options['display_as_link'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system.views.inc
index d49385c..243cbc7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system.views.inc
@@ -1,19 +1,14 @@
<?php
-/**
- * @file
- *
- * Provide views data and handlers for system tables that are not represented by
- * their own module.
- */
/**
- * @defgroup views_system_module system.module handlers
+ * @file
+ * Provide views data and handlers for system.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function system_views_data() {
$data = array();
@@ -35,11 +30,6 @@ function system_views_data() {
);
$data['file_managed']['table']['entity type'] = 'file';
-
- // The file table does not inherently join to the node table,
- // but may things (such as upload.module) can add relationships
- // that allow file fields to be used.
-
// fid
$data['file_managed']['fid'] = array(
'title' => t('File ID'),
@@ -253,7 +243,7 @@ function system_views_data() {
'base' => 'node',
'base field' => 'nid',
'relationship field' => 'id',
- 'extra' => array(array('field' => 'type', 'value' => 'node')),
+ 'extra' => array(array('table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'node')),
),
);
$data['file_usage']['node_to_file'] = array(
@@ -431,6 +421,23 @@ function system_views_data() {
'handler' => 'views_handler_sort',
),
);
+ $data['file_usage']['id'] = array(
+ 'title' => t('Entity ID'),
+ 'help' => t('The ID of the entity that is related to the file.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_numeric',
+ 'click sortable' => TRUE,
+ ),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_numeric',
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_numeric',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ );
$data['file_usage']['count'] = array(
'title' => t('Use count'),
'help' => t('The number of times the file is used by this entity.'),
@@ -569,7 +576,3 @@ function _views_file_status($choice = NULL) {
return $status;
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_argument_file_fid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_argument_file_fid.inc
index 8a4088f..aa2d947 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_argument_file_fid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_argument_file_fid.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_file_fid.
+ */
+
/**
* Argument handler to accept multiple file ids.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file.inc
index f642b89..4168acf 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_file.
+ */
+
/**
* Field handler to provide simple renderer that allows linking to a file.
*
@@ -17,7 +23,7 @@ class views_handler_field_file extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_file'] = array('default' => FALSE);
+ $options['link_to_file'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_extension.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_extension.inc
index e64fbc9..6f9a03f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_extension.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_extension.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_file_extension.
+ */
+
+/**
* Returns a pure file extension of the file, for example 'module'.
* @ingroup views_field_handlers
*/
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_filemime.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_filemime.inc
index 0b29c79..318fdcf 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_filemime.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_filemime.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_file_filemime.
+ */
+
+/**
* Field handler to add rendering MIME type images as an option on the filemime field.
*
* @ingroup views_field_handlers
@@ -8,7 +13,7 @@
class views_handler_field_file_filemime extends views_handler_field_file {
function option_definition() {
$options = parent::option_definition();
- $options['filemime_image'] = array('default' => FALSE);
+ $options['filemime_image'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_status.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_status.inc
index 84d9148..ac1022c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_status.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_status.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_file_status.
+ */
+
/**
* Field handler to translate a node type into its readable form.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_uri.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_uri.inc
index d36aba3..334e505 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_uri.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_field_file_uri.inc
@@ -1,12 +1,17 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_file_uri.
+ */
+
+/**
* 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() {
$options = parent::option_definition();
- $options['file_download_path'] = array('default' => FALSE);
+ $options['file_download_path'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_file_status.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_file_status.inc
index 3133755..6194395 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_file_status.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_file_status.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_file_status.
+ */
+
/**
* Filter by file status.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_system_type.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_system_type.inc
index 5a9a811..84d4bcd 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_system_type.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/system/views_handler_filter_system_type.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_system_type.
+ */
+
+/**
* Filter by system type.
*/
class views_handler_filter_system_type extends views_handler_filter_in_operator {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy.views.inc
index 7dd225b..58d62d1 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy.views.inc
@@ -1,18 +1,14 @@
<?php
-/**
- * @file
- *
- * Provide views data and handlers for taxonomy.module
- */
/**
- * @defgroup views_taxonomy_module taxonomy.module handlers
+ * @file
+ * Provide views data and handlers for taxonomy.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function taxonomy_views_data() {
$data = array();
@@ -90,6 +86,24 @@ function taxonomy_views_data() {
'handler' => 'views_handler_field',
),
);
+ $data['taxonomy_vocabulary']['weight'] = array(
+ 'title' => t('Weight'),
+ 'help' => t('The taxonomy vocabulary weight'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_numeric',
+ 'click sortable' => TRUE,
+ ),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_numeric',
+ 'name field' => 'weight',
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort',
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_numeric',
+ ),
+ );
// ----------------------------------------------------------------------
// taxonomy_term_data table
@@ -152,6 +166,17 @@ function taxonomy_views_data() {
),
);
+ // raw tid field
+ $data['taxonomy_term_data']['tid_raw'] = array(
+ 'title' => t('Term ID'),
+ 'help' => t('The tid of a taxonomy term.'),
+ 'real field' => 'tid',
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_numeric',
+ 'allow empty' => TRUE,
+ ),
+ );
+
$data['taxonomy_term_data']['tid_representative'] = array(
'relationship' => array(
'title' => t('Representative node'),
@@ -204,6 +229,9 @@ function taxonomy_views_data() {
'filter' => array(
'handler' => 'views_handler_filter_numeric',
),
+ 'argument' => array(
+ 'handler' => 'views_handler_argument_numeric',
+ ),
);
// Term description
@@ -332,6 +360,10 @@ function taxonomy_views_data() {
'field' => 'parent',
'label' => t('Parent'),
),
+ 'filter' => array(
+ 'help' => t('Filter the results of "Taxonomy: Term" by the parent pid.'),
+ 'handler' => 'views_handler_filter_numeric',
+ ),
'argument' => array(
'help' => t('The parent term of the term.'),
'handler' => 'views_handler_argument_taxonomy',
@@ -457,7 +489,7 @@ function taxonomy_field_views_data_views_data_alter(&$data, $field) {
}
/**
- * Implements hook_views_plugins
+ * Implements hook_views_plugins().
*/
function taxonomy_views_plugins() {
return array(
@@ -497,6 +529,7 @@ function views_taxonomy_set_breadcrumb(&$breadcrumb, &$argument) {
}
if (!empty($argument->options['use_taxonomy_term_path'])) {
$path = taxonomy_term_uri($parent);
+ $path = $path['path'];
}
else {
$args[$argument->position] = $parent->tid;
@@ -505,7 +538,3 @@ function views_taxonomy_set_breadcrumb(&$breadcrumb, &$argument) {
$breadcrumb[$path] = check_plain($parent->name);
}
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc
index 5c32ea4..10fc500 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_taxonomy.
+ */
+
+/**
* Argument handler for basic taxonomy tid.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
index e36c778..f47f08a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_term_node_tid.
+ */
+
/**
* Allow taxonomy term ID(s) as argument.
*
@@ -7,7 +13,7 @@
class views_handler_argument_term_node_tid extends views_handler_argument_many_to_one {
function option_definition() {
$options = parent::option_definition();
- $options['set_breadcrumb'] = array('default' => FALSE);
+ $options['set_breadcrumb'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
index 03b1409..116a4de 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_term_node_tid_depth.
+ */
+
/**
* Argument handler for taxonomy terms with depth.
*
@@ -12,9 +18,9 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
$options = parent::option_definition();
$options['depth'] = array('default' => 0);
- $options['break_phrase'] = array('default' => FALSE);
- $options['set_breadcrumb'] = array('default' => FALSE);
- $options['use_taxonomy_term_path'] = array('default' => FALSE);
+ $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;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
index da71796..2f9dd4e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_term_node_tid_depth_modif.
+ */
+
+/**
* Argument handler for to modify depth for a previous term.
*
* This handler is actually part of the node table and has some restrictions,
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
index b91b08f..427cf2b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_vocabulary_machine_name.
+ */
+
+/**
* Argument handler to accept a vocabulary machine name.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
index d79859b..c696640 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_vocabulary_vid.
+ */
+
+/**
* Argument handler to accept a vocabulary id.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc
index c1ccb6d..48da283 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_taxonomy.
+ */
+
+/**
* Field handler to provide simple renderer that allows linking to a taxonomy
* term.
*
@@ -25,8 +30,8 @@ class views_handler_field_taxonomy extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_taxonomy'] = array('default' => FALSE);
- $options['convert_spaces'] = array('default' => FALSE);
+ $options['link_to_taxonomy'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['convert_spaces'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
index ae1f0a5..75ab0f8 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_term_link_edit.
+ */
+
+/**
* Field handler to present a term edit link.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
index 4a6c7a4..4c6362e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_term_node_tid.
+ */
+
+/**
* Field handler to display all taxonomy terms of a node.
*
* @ingroup views_field_handlers
@@ -30,8 +35,8 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
function option_definition() {
$options = parent::option_definition();
- $options['link_to_taxonomy'] = array('default' => TRUE);
- $options['limit'] = array('default' => FALSE);
+ $options['link_to_taxonomy'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['limit'] = array('default' => FALSE, 'bool' => TRUE);
$options['vocabularies'] = array('default' => array());
return $options;
@@ -51,7 +56,6 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
'#type' => 'checkbox',
'#title' => t('Limit terms by vocabulary'),
'#default_value'=> $this->options['limit'],
- '#fieldset' => 'more',
);
$options = array();
@@ -68,7 +72,6 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
'#options' => $options,
'#default_value' => $this->options['vocabularies'],
'#dependency' => array('edit-options-limit' => array(TRUE)),
- '#fieldset' => 'more',
);
parent::options_form($form, $form_state);
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 25f9a7b..7eb868f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_term_node_tid.
+ */
+
+/**
* Filter by term id.
*
* @ingroup views_filter_handlers
@@ -33,10 +38,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$options = parent::option_definition();
$options['type'] = array('default' => 'textfield');
- $options['limit'] = array('default' => TRUE);
+ $options['limit'] = array('default' => TRUE, 'bool' => TRUE);
$options['vocabulary'] = array('default' => 0);
$options['hierarchy'] = array('default' => 0);
- $options['error_message'] = array('default' => TRUE);
+ $options['error_message'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
@@ -168,6 +173,11 @@ 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.
+ elseif ($default_value == array('')) {
+ $default_value = 'All';
+ }
else {
$copy = $default_value;
$default_value = array_shift($copy);
@@ -336,6 +346,7 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$this->value_options = array();
if ($this->value) {
+ $this->value = array_filter($this->value);
$result = db_select('taxonomy_term_data', 'td')
->fields('td')
->condition('td.tid', $this->value)
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
index 3955269..fe12780 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_term_node_tid_depth.
+ */
+
/**
* Filter handler for taxonomy terms with depth.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
index 5d2c9f5..062450c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_vocabulary_machine_name.
+ */
+
+/**
* Filter by vocabulary machine name.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
index a02f7b2..2759ee1 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_vocabulary_vid.
+ */
+
+/**
* Filter by vocabulary id.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
index 1855cae..d7fbb4c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -1,10 +1,10 @@
<?php
+
/**
* @file
- * Views' relationship handlers.
+ * Definition of views_handler_relationship_node_term_data.
*/
-
/**
* Relationship handler to return the taxonomy terms of nodes.
*
@@ -58,8 +58,8 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
$def['table'] = 'taxonomy_term_data';
if (!array_filter($this->options['vocabularies'])) {
- $term_node = $this->query->add_table('taxonomy_index', $this->relationship);
- $def['left_table'] = 'taxonomy_index';
+ $taxonomy_index = $this->query->add_table('taxonomy_index', $this->relationship);
+ $def['left_table'] = $taxonomy_index;
$def['left_field'] = 'tid';
$def['field'] = 'tid';
$def['type'] = empty($this->options['required']) ? 'LEFT' : 'INNER';
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index 17ee634..9c1d81f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -1,9 +1,13 @@
<?php
+
/**
* @file
- * Taxonomy tid default argument.
+ * Definition of views_plugin_argument_default_taxonomy_tid.
*/
+/**
+ * Taxonomy tid default argument.
+ */
class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_default {
function init(&$view, &$argument, $options) {
parent::init($view, $argument, $options);
@@ -22,10 +26,10 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
function option_definition() {
$options = parent::option_definition();
- $options['term_page'] = array('default' => TRUE);
- $options['node'] = array('default' => FALSE);
+ $options['term_page'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['node'] = array('default' => FALSE, 'bool' => TRUE);
$options['anyall'] = array('default' => ',');
- $options['limit'] = array('default' => FALSE);
+ $options['limit'] = array('default' => FALSE, 'bool' => TRUE);
$options['vocabularies'] = array('default' => array());
return $options;
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
index c81c619..3a88199 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the 'taxonomy term' argument validator plugin.
@@ -26,7 +27,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
$options = parent::option_definition();
$options['vocabularies'] = array('default' => array());
$options['type'] = array('default' => 'tid');
- $options['transform'] = array('default' => FALSE);
+ $options['transform'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation.views.inc
index 8189faa..b36c7a7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation.views.inc
@@ -2,14 +2,9 @@
/**
* @file
+ * Provide views data and handlers for translation.module.
*
- * Provide views data and handlers for translation.module
- */
-
-/**
- * @defgroup views_translation_module translation.module handlers
- *
- * @{
+ * @ingroup views_module_handlers
*/
/**
@@ -25,26 +20,6 @@ function translation_views_data_alter(&$data) {
'field' => 'tnid',
);
- // Language field
- $data['node']['language'] = array(
- 'group' => t('Content translation'),
- 'title' => t('Language'),
- 'help' => t('The language the content is in.'),
- 'field' => array(
- 'handler' => 'views_handler_field_node_language',
- 'click sortable' => TRUE,
- ),
- 'filter' => array(
- 'handler' => 'views_handler_filter_node_language',
- ),
- 'argument' => array(
- 'handler' => 'views_handler_argument_node_language',
- ),
- 'sort' => array(
- 'handler' => 'views_handler_sort',
- ),
- );
-
// The translation ID (nid of the "source" translation)
$data['node']['tnid'] = array(
'group' => t('Content translation'),
@@ -144,7 +119,3 @@ function translation_views_data_alter(&$data) {
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_argument_node_tnid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_argument_node_tnid.inc
index 9dd29a1..61e9eba 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_argument_node_tnid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_argument_node_tnid.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Provide node tnid argument handler.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_link_translate.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_link_translate.inc
index 962b4f9..3e30725 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_link_translate.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_link_translate.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_link_translate.
+ */
+
/**
* Field handler to present a link node translate.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_translation_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_translation_link.inc
index 537ba60..9d50369 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_translation_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_field_node_translation_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_node_translation_link.
+ */
+
/**
* Field handler to present a link to the node.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid.inc
index 6d8cfe7..ed4d6a9 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_tnid.
+ */
+
/**
* Filter by whether the node is the original translation.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid_child.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid_child.inc
index f0d953b..51316eb 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid_child.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_filter_node_tnid_child.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_node_tnid_child.
+ */
+
/**
* Filter by whether the node is not the original translation.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_relationship_translation.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_relationship_translation.inc
index b7d2641..509a935 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_relationship_translation.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/translation/views_handler_relationship_translation.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_relationship_translation.
+ */
+
+/**
* Handles relationships for content translation sets and provides multiple
* options.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user.views.inc
index 1d7f161..7077104 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user.views.inc
@@ -1,17 +1,14 @@
<?php
-/**
- * @file
- * Provide views data and handlers for user.module
- */
/**
- * @defgroup views_user_module user.module handlers
+ * @file
+ * Provide views data and handlers for user.module.
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function user_views_data() {
// ----------------------------------------------------------------
@@ -75,6 +72,16 @@ function user_views_data() {
),
);
+ // uid_raw
+ $data['users']['uid_raw'] = array(
+ 'help' => t('The raw numeric user ID.'),
+ 'real field' => 'uid',
+ 'filter' => array(
+ 'title' => t('The user ID'),
+ 'handler' => 'views_handler_filter_numeric',
+ ),
+ );
+
// uid
$data['users']['uid_representative'] = array(
'relationship' => array(
@@ -521,7 +528,7 @@ function user_views_data() {
}
/**
- * Implements hook_views_plugins
+ * Implements hook_views_plugins().
*/
function user_views_plugins() {
return array(
@@ -566,7 +573,3 @@ function user_views_query_substitutions($view) {
global $user;
return array('***CURRENT_USER***' => intval($user->uid));
}
-
-/**
- * @}
- */
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_user_uid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_user_uid.inc
index 21785a9..6ab9167 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_user_uid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_user_uid.inc
@@ -1,7 +1,8 @@
<?php
+
/**
* @file
- * Provide user uid argument handler.
+ * Definition of views_handler_argument_user_uid.
*/
/**
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_users_roles_rid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_users_roles_rid.inc
index 89b3704..31c5814 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_users_roles_rid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_argument_users_roles_rid.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_users_roles_rid.
+ */
+
/**
* Allow role ID(s) as argument.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user.inc
index f90a6f9..f6b15b5 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_user.
+ */
+
+/**
* Field handler to provide simple renderer that allows linking to a user.
*
* @ingroup views_field_handlers
@@ -18,7 +23,7 @@ class views_handler_field_user extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_user'] = array('default' => TRUE);
+ $options['link_to_user'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_language.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_language.inc
index 96b784b..e29da31 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_language.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_language.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_user_language.
+ */
+
+/**
* Views field handler for user language.
*
* @ingroup views_field_handlers
@@ -9,9 +14,12 @@ class views_handler_field_user_language extends views_handler_field_user {
function render_link($data, $values) {
$uid = $this->get_value($values, 'uid');
- if (!empty($this->options['link_to_user']) && user_access('access user profiles') && $uid) {
- $this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = 'user/' . $uid;
+ if (!empty($this->options['link_to_user'])) {
+ $uid = $this->get_value($values, 'uid');
+ if (user_access('access user profiles') && $uid) {
+ $this->options['alter']['make_link'] = TRUE;
+ $this->options['alter']['path'] = 'user/' . $uid;
+ }
}
if (empty($data)) {
$lang = language_default();
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link.inc
index 36135d5..03b5e0d 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_link.
+ */
+
/**
* Field handler to present a link to the user.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_cancel.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_cancel.inc
index 4debce9..9129c01 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_cancel.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_cancel.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_link_cancel.
+ */
+
/**
* Field handler to present a link to user cancel.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_edit.inc
index 4f25bf6..e37feae 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_link_edit.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_link_edit.
+ */
+
/**
* Field handler to present a link to user edit.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_mail.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_mail.inc
index 8408e64..82d1933 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_mail.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_mail.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_mail.
+ */
+
/**
* Field handler to provide acess control for the email field.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_name.inc
index 26cdbce..4551451 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_name.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_name.
+ */
+
/**
* Field handler to provide simple renderer that allows using a themed user link.
*
@@ -18,9 +24,9 @@ class views_handler_field_user_name extends views_handler_field_user {
function option_definition() {
$options = parent::option_definition();
- $options['overwrite_anonymous'] = array('default' => FALSE);
+ $options['overwrite_anonymous'] = array('default' => FALSE, 'bool' => TRUE);
$options['anonymous_text'] = array('default' => '', 'translatable' => TRUE);
- $options['format_username'] = array('default' => TRUE);
+ $options['format_username'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_permissions.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_permissions.inc
index e20f27f..edc9c44 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_permissions.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_permissions.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_permissions.
+ */
+
/**
* Field handler to provide a list of permissions.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_picture.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_picture.inc
index 940a89a..babbae5 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_picture.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_picture.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_user_picture.
+ */
+
+/**
* Field handler to provide simple renderer that allows using a themed user link.
*
* @ingroup views_field_handlers
@@ -37,7 +42,7 @@ class views_handler_field_user_picture extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_photo_to_profile'] = array('default' => TRUE);
+ $options['link_photo_to_profile'] = array('default' => TRUE, 'bool' => TRUE);
$options['image_style'] = array('default' => '');
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_roles.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_roles.inc
index f556107..e6571cd 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_roles.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_field_user_roles.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_field_user_roles.
+ */
+
/**
* Field handler to provide a list of roles.
*
@@ -43,7 +49,9 @@ class views_handler_field_user_roles extends views_handler_field_prerender_list
}
function add_self_tokens(&$tokens, $item) {
- $tokens['[' . $this->options['id'] . '-role' . ']'] = $item['role'];
- $tokens['[' . $this->options['id'] . '-rid' . ']'] = $item['rid'];
+ if (!empty($item['role'])) {
+ $tokens['[' . $this->options['id'] . '-role' . ']'] = $item['role'];
+ $tokens['[' . $this->options['id'] . '-rid' . ']'] = $item['rid'];
+ }
}
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_current.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_current.inc
index 14deb0d..5f8fe4c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_current.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_current.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_user_current.
+ */
+
+/**
* Filter handler for the current user.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
index c885e1b..300607f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_user_name.
+ */
+
+/**
* Filter handler for usernames.
*
* @ingroup views_filter_handlers
@@ -69,9 +74,21 @@ class views_handler_filter_user_name extends views_handler_filter_in_operator {
}
$identifier = $this->options['expose']['identifier'];
- $values = drupal_explode_tags($form_state['values'][$identifier]);
+ $input = $form_state['values'][$identifier];
+
+ if ($this->options['is_grouped'] && isset($this->options['group_info']['group_items'][$input])) {
+ $this->operator = $this->options['group_info']['group_items'][$input]['operator'];
+ $input = $this->options['group_info']['group_items'][$input]['value'];
+ }
+
+ $values = drupal_explode_tags($input);
- $uids = $this->validate_user_strings($form[$identifier], $values);
+ if (!$this->options['is_grouped'] || ($this->options['is_grouped'] && ($input != 'All'))) {
+ $uids = $this->validate_user_strings($form[$identifier], $values);
+ }
+ else {
+ $uids = FALSE;
+ }
if ($uids) {
$this->validated_exposed_input = $uids;
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_permissions.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_permissions.inc
index 4cf51db..f999045 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_permissions.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_permissions.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_user_permissions.
+ */
+
/**
* Filter handler for user roles.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_roles.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_roles.inc
index cbf985d..ab9b8a2 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_roles.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_handler_filter_user_roles.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_user_roles.
+ */
+
/**
* Filter handler for user roles.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_current_user.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_current_user.inc
index d79226c..e11c702 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_current_user.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_current_user.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the current user argument default plugin.
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_user.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_user.inc
index d14e345..bb10429 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_user.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_default_user.inc
@@ -1,11 +1,12 @@
<?php
+
/**
* @file
* Contains the user from URL argument default plugin.
*/
/**
- * Default argument plugin to extract a user via menu_get_object
+ * 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() {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_validate_user.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_validate_user.inc
index 4dfa4bc..b727094 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_validate_user.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/user/views_plugin_argument_validate_user.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_plugin_argument_validate_user.
+ */
+
+/**
* Validate whether an argument is a valid user.
*
* This supports either numeric arguments (UID) or strings (username) and
@@ -11,7 +16,7 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
function option_definition() {
$options = parent::option_definition();
$options['type'] = array('default' => 'uid');
- $options['restrict_roles'] = array('default' => FALSE);
+ $options['restrict_roles'] = array('default' => FALSE, 'bool' => TRUE);
$options['roles'] = array('default' => array());
return $options;
@@ -117,7 +122,7 @@ class views_plugin_argument_validate_user extends views_plugin_argument_validate
}
$this->argument->argument = $account->uid;
- $this->argument->validated_title = isset($account->name) ? check_plain($account->name) : check_plain(variable_get('anonymous', t('Anonymous')));
+ $this->argument->validated_title = check_plain(format_username($account));
return TRUE;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
index 6aa8a09..2029aa8 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/views.views.inc
@@ -1,17 +1,14 @@
<?php
+
/**
* @file
* Provide views data and handlers that aren't tied to any other module.
- */
-
-/**
- * @defgroup views_views_module miscellaneous handlers
*
- * @{
+ * @ingroup views_module_handlers
*/
/**
- * Implements hook_views_data()
+ * Implements hook_views_data().
*/
function views_views_data() {
$data['views']['table']['group'] = t('Global');
@@ -60,6 +57,14 @@ function views_views_data() {
),
);
+ $data['views']['area_text_custom'] = array(
+ 'title' => t('Unfiltered text'),
+ 'help' => t('Add unrestricted, custom text or markup. This is similar to the custom text field.'),
+ 'area' => array(
+ 'handler' => 'views_handler_area_text_custom',
+ ),
+ );
+
$data['views']['view'] = array(
'title' => t('View area'),
'help' => t('Insert a view inside an area.'),
@@ -86,6 +91,14 @@ function views_views_data() {
);
}
+ $data['views']['combine'] = array(
+ 'title' => t('Combine fields filter'),
+ 'help' => t('Combine two fields together and search by them.'),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_combine',
+ ),
+ );
+
if (module_invoke('ctools', 'api_version', '1.7.1')) {
$data['views']['expression'] = array(
'title' => t('Math expression'),
@@ -99,7 +112,3 @@ function views_views_data() {
return $data;
}
-
-/**
- * @}
- */