Index: views.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/views.info,v retrieving revision 1.7 diff -u -p -r1.7 views.info --- views.info 12 Aug 2007 06:52:14 -0000 1.7 +++ views.info 20 May 2009 00:52:05 -0000 @@ -2,4 +2,221 @@ name = Views description = Create customized lists and queries from your database. package = Views -core = 6.x +core = 7.x +files[] = views.module +; Handlers +files[] = handlers/views_handler_argument.inc +files[] = handlers/views_handler_argument_date.inc +files[] = handlers/views_handler_argument_formula.inc +files[] = handlers/views_handler_argument_many_to_one.inc +files[] = handlers/views_handler_argument_null.inc +files[] = handlers/views_handler_argument_numeric.inc +files[] = handlers/views_handler_argument_string.inc +files[] = handlers/views_handler_field.inc +files[] = handlers/views_handler_field_boolean.inc +files[] = handlers/views_handler_field_custom.inc +files[] = handlers/views_handler_field_date.inc +files[] = handlers/views_handler_field_markup.inc +files[] = handlers/views_handler_field_numeric.inc +files[] = handlers/views_handler_field_prerender_list.inc +files[] = handlers/views_handler_field_url.inc +files[] = handlers/views_handler_filter.inc +files[] = handlers/views_handler_filter_boolean_operator.inc +files[] = handlers/views_handler_filter_boolean_operator_string.inc +files[] = handlers/views_handler_filter_date.inc +files[] = handlers/views_handler_filter_equality.inc +files[] = handlers/views_handler_filter_in_operator.inc +files[] = handlers/views_handler_filter_many_to_one.inc +files[] = handlers/views_handler_filter_numeric.inc +files[] = handlers/views_handler_filter_string.inc +files[] = handlers/views_handler_relationship.inc +files[] = handlers/views_handler_sort.inc +files[] = handlers/views_handler_sort_date.inc +files[] = handlers/views_handler_sort_formula.inc +files[] = handlers/views_handler_sort_menu_hierarchy.inc +files[] = handlers/views_handler_sort_random.inc +; Includes +files[] = includes/admin.inc +files[] = includes/ajax.inc +files[] = includes/analyze.inc +files[] = includes/base.inc +files[] = includes/cache.inc +files[] = includes/convert.inc +files[] = includes/form.inc +files[] = includes/handlers.inc +files[] = includes/plugins.inc +files[] = includes/query.inc +files[] = includes/tabs.inc +files[] = includes/view.inc +; Modules +files[] = modules/aggregator.views.inc +files[] = modules/aggregator/views_handler_argument_aggregator_fid.inc +files[] = modules/aggregator/views_handler_field_aggregator_title_link.inc +files[] = modules/aggregator/views_plugin_row_aggregator_rss.inc +files[] = modules/book.views.inc +files[] = modules/comment.views.inc +files[] = modules/comment.views_convert.inc +files[] = modules/comment.views_default.inc +files[] = modules/comment/views_handler_argument_comment_user_uid.inc +files[] = modules/comment/views_handler_field_comment.inc +files[] = modules/comment/views_handler_field_comment_depth.inc +files[] = modules/comment/views_handler_field_comment_link.inc +files[] = modules/comment/views_handler_field_comment_link_delete.inc +files[] = modules/comment/views_handler_field_comment_link_edit.inc +files[] = modules/comment/views_handler_field_comment_link_reply.inc +files[] = modules/comment/views_handler_field_comment_username.inc +files[] = modules/comment/views_handler_field_ncs_last_comment_name.inc +files[] = modules/comment/views_handler_field_ncs_last_updated.inc +files[] = modules/comment/views_handler_field_node_comment.inc +files[] = modules/comment/views_handler_field_node_new_comments.inc +files[] = modules/comment/views_handler_filter_comment_user_uid.inc +files[] = modules/comment/views_handler_filter_ncs_last_updated.inc +files[] = modules/comment/views_handler_filter_node_comment.inc +files[] = modules/comment/views_handler_sort_comment_thread.inc +files[] = modules/comment/views_handler_sort_ncs_last_comment_name.inc +files[] = modules/comment/views_handler_sort_ncs_last_updated.inc +files[] = modules/comment/views_plugin_row_comment_rss.inc +files[] = modules/comment/views_plugin_row_comment_view.inc +files[] = modules/locale.views.inc +files[] = modules/locale/views_handler_argument_locale_group.inc +files[] = modules/locale/views_handler_argument_locale_language.inc +files[] = modules/locale/views_handler_field_locale_group.inc +files[] = modules/locale/views_handler_field_locale_language.inc +files[] = modules/locale/views_handler_field_locale_link_edit.inc +files[] = modules/locale/views_handler_filter_locale_group.inc +files[] = modules/locale/views_handler_filter_locale_language.inc +files[] = modules/locale/views_handler_filter_locale_version.inc +files[] = modules/node.views.inc +files[] = modules/node.views_convert.inc +files[] = modules/node.views_default.inc +files[] = modules/node/views_handler_argument_dates_various.inc +files[] = modules/node/views_handler_argument_node_language.inc +files[] = modules/node/views_handler_argument_node_nid.inc +files[] = modules/node/views_handler_argument_node_type.inc +files[] = modules/node/views_handler_argument_node_vid.inc +files[] = modules/node/views_handler_field_history_user_timestamp.inc +files[] = modules/node/views_handler_field_node.inc +files[] = modules/node/views_handler_field_node_link.inc +files[] = modules/node/views_handler_field_node_link_delete.inc +files[] = modules/node/views_handler_field_node_link_edit.inc +files[] = modules/node/views_handler_field_node_revision_link_delete.inc +files[] = modules/node/views_handler_field_node_revision_link_revert.inc +files[] = modules/node/views_handler_field_node_type.inc +files[] = modules/node/views_handler_filter_history_user_timestamp.inc +files[] = modules/node/views_handler_filter_node_status.inc +files[] = modules/node/views_handler_filter_node_type.inc +files[] = modules/node/views_plugin_argument_default_node.inc +files[] = modules/node/views_plugin_argument_validate_node.inc +files[] = modules/node/views_plugin_row_node_rss.inc +files[] = modules/node/views_plugin_row_node_view.inc +files[] = modules/poll.views.inc +files[] = modules/profile.views.inc +files[] = modules/profile/views_handler_field_profile_date.inc +files[] = modules/profile/views_handler_field_profile_list.inc +files[] = modules/profile/views_handler_filter_profile_selection.inc +files[] = modules/search.views.inc +files[] = modules/search.views_default.inc +files[] = modules/search/views_handler_field_search_score.inc +files[] = modules/search/views_handler_filter_search.inc +files[] = modules/search/views_handler_sort_search_score.inc +files[] = modules/search/views_plugin_row_search_view.inc +files[] = modules/statistics.views.inc +files[] = modules/statistics.views_default.inc +files[] = modules/statistics/views_handler_field_accesslog_path.inc +files[] = modules/system.views.inc +files[] = modules/system/views_handler_argument_file_fid.inc +files[] = modules/system/views_handler_field_file.inc +files[] = modules/system/views_handler_field_file_status.inc +files[] = modules/system/views_handler_filter_file_status.inc +files[] = modules/taxonomy.views.inc +files[] = modules/taxonomy.views_convert.inc +files[] = modules/taxonomy.views_default.inc +files[] = modules/taxonomy/views_handler_argument_taxonomy.inc +files[] = modules/taxonomy/views_handler_argument_term_node_tid.inc +files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth.inc +files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc +files[] = modules/taxonomy/views_handler_argument_vocabulary_vid.inc +files[] = modules/taxonomy/views_handler_field_taxonomy.inc +files[] = modules/taxonomy/views_handler_field_term_node_tid.inc +files[] = modules/taxonomy/views_handler_filter_term_node_tid.inc +files[] = modules/taxonomy/views_handler_filter_vocabulary_vid.inc +files[] = modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc +files[] = modules/translation.views.inc +files[] = modules/translation/views_handler_argument_node_language.inc +files[] = modules/translation/views_handler_argument_node_tnid.inc +files[] = modules/translation/views_handler_field_node_language.inc +files[] = modules/translation/views_handler_field_node_translation_link.inc +files[] = modules/translation/views_handler_filter_node_language.inc +files[] = modules/translation/views_handler_filter_node_tnid.inc +files[] = modules/translation/views_handler_filter_node_tnid_child.inc +files[] = modules/translation/views_handler_relationship_translation.inc +files[] = modules/upload.views.inc +files[] = modules/upload.views_convert.inc +files[] = modules/upload/views_handler_field_upload_description.inc +files[] = modules/upload/views_handler_field_upload_fid.inc +files[] = modules/upload/views_handler_filter_upload_fid.inc +files[] = modules/user.views.inc +files[] = modules/user/views_handler_argument_user_uid.inc +files[] = modules/user/views_handler_argument_users_roles_rid.inc +files[] = modules/user/views_handler_field_user.inc +files[] = modules/user/views_handler_field_user_link.inc +files[] = modules/user/views_handler_field_user_link_delete.inc +files[] = modules/user/views_handler_field_user_link_edit.inc +files[] = modules/user/views_handler_field_user_mail.inc +files[] = modules/user/views_handler_field_user_name.inc +files[] = modules/user/views_handler_field_user_picture.inc +files[] = modules/user/views_handler_field_user_roles.inc +files[] = modules/user/views_handler_filter_user_current.inc +files[] = modules/user/views_handler_filter_user_name.inc +files[] = modules/user/views_handler_filter_user_roles.inc +files[] = modules/user/views_plugin_argument_default_current_user.inc +files[] = modules/user/views_plugin_argument_default_user.inc +files[] = modules/user/views_plugin_argument_validate_user.inc +files[] = modules/views.views.inc +; Plugins +files[] = plugins/views_plugin_access.inc +files[] = plugins/views_plugin_access_none.inc +files[] = plugins/views_plugin_access_perm.inc +files[] = plugins/views_plugin_access_role.inc +files[] = plugins/views_plugin_argument_default.inc +files[] = plugins/views_plugin_argument_default_php.inc +files[] = plugins/views_plugin_argument_validate.inc +files[] = plugins/views_plugin_argument_validate_numeric.inc +files[] = plugins/views_plugin_argument_validate_php.inc +files[] = plugins/views_plugin_display.inc +files[] = plugins/views_plugin_display_attachment.inc +files[] = plugins/views_plugin_display_block.inc +files[] = plugins/views_plugin_display_default.inc +files[] = plugins/views_plugin_display_feed.inc +files[] = plugins/views_plugin_display_page.inc +files[] = plugins/views_plugin_row.inc +files[] = plugins/views_plugin_row_fields.inc +files[] = plugins/views_plugin_style.inc +files[] = plugins/views_plugin_style_default.inc +files[] = plugins/views_plugin_style_grid.inc +files[] = plugins/views_plugin_style_list.inc +files[] = plugins/views_plugin_style_rss.inc +files[] = plugins/views_plugin_style_summary.inc +files[] = plugins/views_plugin_style_summary_unformatted.inc +files[] = plugins/views_plugin_style_table.inc +; Theme +files[] = theme/theme.inc +files[] = theme/views-exposed-form.tpl.php +files[] = theme/views-more.tpl.php +files[] = theme/views-ui-edit-item.tpl.php +files[] = theme/views-ui-edit-tab.tpl.php +files[] = theme/views-ui-edit-view.tpl.php +files[] = theme/views-ui-list-views.tpl.php +files[] = theme/views-view-field.tpl.php +files[] = theme/views-view-fields.tpl.php +files[] = theme/views-view-grid.tpl.php +files[] = theme/views-view-list.tpl.php +files[] = theme/views-view-row-comment.tpl.php +files[] = theme/views-view-row-node.tpl.php +files[] = theme/views-view-row-rss.tpl.php +files[] = theme/views-view-rss.tpl.php +files[] = theme/views-view-summary-unformatted.tpl.php +files[] = theme/views-view-summary.tpl.php +files[] = theme/views-view-table.tpl.php +files[] = theme/views-view-unformatted.tpl.php +files[] = theme/views-view.tpl.php Index: views.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/views.module,v retrieving revision 1.332 diff -u -p -r1.332 views.module --- views.module 8 Apr 2009 16:11:51 -0000 1.332 +++ views.module 20 May 2009 00:52:05 -0000 @@ -20,33 +20,40 @@ function views_api_version() { * Implementation of hook_theme(). Register views theming functions. */ function views_theme() { - $path = drupal_get_path('module', 'views'); - require_once "./$path/theme/theme.inc"; - - // Some quasi clever array merging here. - $base = array( - 'file' => 'theme.inc', - 'path' => "$path/theme", - ); - // Our extra version of pager from pager.inc - $hooks['views_mini_pager'] = $base + array( - 'arguments' => array('tags' => array(), 'limit' => 10, 'element' => 0, 'parameters' => array()), + $hooks['views_mini_pager'] = array( + 'arguments' => array( + 'tags' => array(), + 'limit' => 10, + 'element' => 0, + 'parameters' => array(), + ), 'pattern' => 'views_mini_pager__', ); $arguments = array( 'display' => array('view' => NULL), - 'style' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL), - 'row' => array('view' => NULL, 'options' => NULL, 'row' => NULL, 'field_alias' => NULL), + 'style' => array( + 'view' => NULL, + 'options' => NULL, + 'rows' => NULL, + 'title' => NULL, + ), + 'row' => array( + 'view' => NULL, + 'options' => NULL, + 'row' => NULL, + 'field_alias' => NULL, + ), ); // Default view themes - $hooks['views_view_field'] = $base + array( + $hooks['views_view_field'] = array( 'pattern' => 'views_view_field__', 'arguments' => array('view' => NULL, 'field' => NULL, 'row' => NULL), ); + drupal_function_exists('views_fetch_plugin_data'); $plugins = views_fetch_plugin_data(); // Register theme functions for all style plugins @@ -55,17 +62,10 @@ function views_theme() { if (isset($def['theme'])) { $hooks[$def['theme']] = array( 'pattern' => $def['theme'] . '__', - 'file' => $def['theme file'], - 'path' => $def['theme path'], 'arguments' => $arguments[$type], ); - $include = './' . $def['theme path'] . '/' . $def['theme file']; - if (file_exists($include)) { - require_once $include; - } - - if (!function_exists('theme_' . $def['theme'])) { + if (!drupal_function_exists('theme_' . $def['theme'])) { $hooks[$def['theme']]['template'] = views_css_safe($def['theme']); } } @@ -78,12 +78,10 @@ function views_theme() { $hooks[$theme] = array( 'pattern' => $theme . '__', - 'file' => $def['theme file'], - 'path' => $def['theme path'], 'arguments' => $arguments[$theme_type], ); - if (!function_exists('theme_' . $theme)) { + if (!drupal_function_exists('theme_' . $theme)) { $hooks[$theme]['template'] = views_css_safe($theme); } } @@ -143,7 +141,16 @@ function views_preprocess_comment(&$vars * Implementation of hook_perm() */ function views_perm() { - return array('access all views', 'administer views'); + return array( + 'administer views' => array( + 'title' => t('Administer views'), + 'description' => t('Access the views administration pages.'), + ), + 'access all views' => array( + 'title' => t('Access all views'), + 'description' => t('Bypass access control when accessing views.'), + ), + ); } /** @@ -152,6 +159,7 @@ function views_perm() { function views_menu() { // Any event which causes a menu_rebuild could potentially mean that the // Views data is updated -- module changes, profile changes, etc. + drupal_function_exists('views_invalidate_cache'); views_invalidate_cache(); $items = array(); $items['views/ajax'] = array( @@ -160,7 +168,6 @@ function views_menu() { 'access callback' => 'user_access', 'access arguments' => array('access content'), 'description' => 'Ajax callback for view loading.', - 'file' => 'includes/ajax.inc', 'type' => MENU_CALLBACK, ); // Path is not admin/build/views due to menu complications with the wildcards from @@ -169,7 +176,6 @@ function views_menu() { 'page callback' => 'views_ajax_autocomplete_user', 'access callback' => 'user_access', 'access arguments' => array('access content'), - 'file' => 'includes/ajax.inc', 'type' => MENU_CALLBACK, ); return $items; @@ -180,6 +186,7 @@ function views_menu() { */ function views_menu_alter(&$callbacks) { $our_paths = array(); + drupal_function_exists('views_get_applicable_data'); $views = views_get_applicable_views('uses hook menu'); foreach ($views as $data) { list($view, $display_id) = $data; @@ -504,29 +511,6 @@ function &views_get_current_view() { // Include file helpers /** - * Include views .inc files as necessary. - */ -function views_include($file) { - static $used = array(); - if (!isset($used[$file])) { - require_once './' . drupal_get_path('module', 'views') . "/includes/$file.inc"; - } - - $used[$file] = TRUE; -} - -/** - * Load views files on behalf of modules. - */ -function views_module_include($file) { - foreach (views_get_module_apis() as $module => $info) { - if (file_exists("./$info[path]/$module.$file")) { - require_once "./$info[path]/$module.$file"; - } - } -} - -/** * Get a list of modules that support the current views API. */ function views_get_module_apis() { @@ -534,12 +518,8 @@ function views_get_module_apis() { if (!isset($cache)) { $cache = array(); foreach (module_implements('views_api') as $module) { - $function = $module . '_views_api'; - $info = $function(); + $info = module_invoke($module, 'views_api'); if (isset($info['api']) && $info['api'] == 2.000) { - if (!isset($info['path'])) { - $info['path'] = drupal_get_path('module', $module); - } $cache[$module] = $info; } } @@ -576,43 +556,6 @@ function views_add_js($file) { drupal_add_js(drupal_get_path('module', 'views') . "/js/$file.js"); } -/** - * Load views files on behalf of modules. - */ -function views_include_handlers() { - static $finished = FALSE; - // Ensure this only gets run once. - if ($finished) { - return; - } - - views_include('base'); - views_include('handlers'); - views_include('cache'); - views_include('plugins'); - _views_include_handlers(); - $finished = TRUE; -} - -/** - * Load default views files on behalf of modules. - */ -function views_include_default_views() { - static $finished = FALSE; - // Ensure this only gets run once. - if ($finished) { - return; - } - - // Default views hooks may be in the normal handler file, - // or in a separate views_default file at the discretion of - // the module author. - views_include_handlers(); - - _views_include_default_views(); - $finished = TRUE; -} - // ----------------------------------------------------------------------- // Views handler functions @@ -653,7 +596,7 @@ function views_get_handler($table, $fiel * Fetch Views' data from the cache */ function views_fetch_data($table = NULL) { - views_include('cache'); + drupal_function_exists('_views_fetch_data'); return _views_fetch_data($table); } @@ -1016,7 +959,7 @@ function views_exposed_form_submit(&$for * Build a list of theme function names for use most everywhere. */ function views_theme_functions($hook, $view, $display = NULL) { - require_once './' . drupal_get_path('module', 'views') . "/theme/theme.inc"; + drupal_function_exists('_views_theme_functions'); return _views_theme_functions($hook, $view, $display); } @@ -1033,7 +976,7 @@ function views_theme_functions($hook, $v * */ function drupal_build_form($form_id, &$form_state) { - views_include('form'); + drupal_function_exists('_drupal_build_form'); return _drupal_build_form($form_id, $form_state); } @@ -1044,7 +987,7 @@ function views_views_query_substitutions global $language; return array( '***CURRENT_VERSION***' => VERSION, - '***CURRENT_TIME***' => time(), + '***CURRENT_TIME***' => REQUEST_TIME, '***CURRENT_LANGUAGE***' => $language->language, '***DEFAULT_LANGUAGE***' => language_default('language'), '***NO_LANGUAGE***' => '', Index: views_ui.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/views_ui.info,v retrieving revision 1.10 diff -u -p -r1.10 views_ui.info --- views_ui.info 9 Jan 2008 00:05:08 -0000 1.10 +++ views_ui.info 20 May 2009 00:52:05 -0000 @@ -2,5 +2,6 @@ name = Views UI description = Administrative interface to views. Without this module, you cannot create or edit your views. package = Views -core = 6.x -dependencies[] = views +core = 7.x +files[] = views_ui.module +dependencies[] = views \ No newline at end of file Index: views_ui.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/views_ui.module,v retrieving revision 1.109 diff -u -p -r1.109 views_ui.module --- views_ui.module 30 Jan 2009 00:56:01 -0000 1.109 +++ views_ui.module 20 May 2009 00:52:05 -0000 @@ -15,13 +15,11 @@ function views_ui_menu() { $base = array( 'access callback' => 'user_access', 'access arguments' => array('administer views'), - 'file' => 'includes/admin.inc', ); $callback = $base + array('type' => MENU_CALLBACK); $convert = array('file' => 'includes/convert.inc') + $base; - $items['admin/build/views'] = $base + array( 'title' => 'Views', 'page callback' => 'views_ui_list_views', @@ -164,55 +162,43 @@ function views_ui_help($path, $arg = '') * Implementation of hook_theme() */ function views_ui_theme() { - $path = drupal_get_path('module', 'views'); - require_once "./$path/includes/admin.inc"; - return array( // edit a view 'views_ui_edit_view' => array( 'arguments' => array('view' => NULL), 'template' => 'views-ui-edit-view', - 'path' => "$path/theme", ), 'views_ui_edit_tab' => array( 'arguments' => array('view' => NULL, 'display' => NULL), 'template' => 'views-ui-edit-tab', - 'path' => "$path/theme", ), 'views_ui_edit_item' => array( 'arguments' => array('type' => NULL, 'view' => NULL, 'display' => NULL, 'no_fields' => FALSE), 'template' => 'views-ui-edit-item', - 'path' => "$path/theme", ), 'views_ui_rearrange_form' => array( 'arguments' => array('form' => NULL), - 'file' => 'includes/admin.inc', ), // list views 'views_ui_list_views' => array( 'template' => 'views-ui-list-views', - 'path' => "$path/theme", ), 'views_ui_list_views_form' => array( - 'file' => 'includes/admin.inc', 'arguments' => array('form' => NULL), ), // tab themes 'views_tabset' => array( 'arguments' => array('tabs' => NULL), - 'file' => 'includes/tabs.inc', ), 'views_tab' => array( 'arguments' => array('body' => NULL), - 'file' => 'includes/tabs.inc', ), // On behalf of a plugin 'views_ui_style_plugin_table' => array( 'arguments' => array('form' => NULL), - 'file' => 'includes/admin.inc', ), ); } @@ -222,8 +208,7 @@ function views_ui_theme() { * load it. */ function views_ui_cache_load($name) { - views_include('cache'); - views_include('view'); + drupal_function_exists('views_object_cache_get'); $view = views_object_cache_get('view', $name); if (empty($view)) { @@ -258,7 +243,6 @@ function views_ui_cache_set(&$view) { drupal_set_message(t('Changes cannot be made to a locked view.'), 'error'); return; } - views_include('cache'); $view->changed = TRUE; // let any future object know that this view has changed. // Unset handlers; we don't want to write these into the cache @@ -269,6 +253,8 @@ function views_ui_cache_set(&$view) { unset($view->display[$id]->handler); unset($view->display[$id]->default_display); } + + drupal_function_exists('views_object_cache_set'); views_object_cache_set('view', $view->name, $view); } Index: handlers/views_handler_argument.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument.inc,v retrieving revision 1.7 diff -u -p -r1.7 views_handler_argument.inc --- handlers/views_handler_argument.inc 20 Feb 2009 20:12:38 -0000 1.7 +++ handlers/views_handler_argument.inc 20 May 2009 00:52:06 -0000 @@ -122,11 +122,11 @@ class views_handler_argument extends vie ); $form['clear_start'] = array( - '#value' => '
' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '
', + '#markup' => '' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '
' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/theme/views-view-field.tpl.php')) . ''; $form['analysis'] = array( - '#prefix' => '