-
- ' . t('Viewing feeds') . ' '; - $output .= '
- ' . t('Feeds contain published content, and may be grouped in categories, generally by topic. Users view feed content in the main aggregator display, or by their source (usually via an RSS feed reader). The most recent content in a feed or category can be displayed as a block through the Blocks administration page.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@admin-block' => url('admin/structure/block'))) . '
- '),
- '#description' => t('A space-separated list of HTML tags allowed in the content of feed items. Disallowed tags are stripped from the content.'),
- );
-
- // Make sure configuration is sane.
- aggregator_sanitize_configuration();
-
- // Get all available fetchers.
- $fetchers = module_implements('aggregator_fetch');
- foreach ($fetchers as $k => $module) {
- if ($info = module_invoke($module, 'aggregator_fetch_info')) {
- $label = $info['title'] . ' ' . $info['description'] . '';
- }
- else {
- $label = $module;
- }
- unset($fetchers[$k]);
- $fetchers[$module] = $label;
- }
-
- // Get all available parsers.
- $parsers = module_implements('aggregator_parse');
- foreach ($parsers as $k => $module) {
- if ($info = module_invoke($module, 'aggregator_parse_info')) {
- $label = $info['title'] . ' ' . $info['description'] . '';
- }
- else {
- $label = $module;
- }
- unset($parsers[$k]);
- $parsers[$module] = $label;
- }
-
- // Get all available processors.
- $processors = module_implements('aggregator_process');
- foreach ($processors as $k => $module) {
- if ($info = module_invoke($module, 'aggregator_process_info')) {
- $label = $info['title'] . ' ' . $info['description'] . '';
- }
- else {
- $label = $module;
- }
- unset($processors[$k]);
- $processors[$module] = $label;
- }
-
- // Only show basic configuration if there are actually options.
- $basic_conf = array();
- if (count($fetchers) > 1) {
- $basic_conf['aggregator_fetcher'] = array(
- '#type' => 'radios',
- '#title' => t('Fetcher'),
- '#description' => t('Fetchers download data from an external source. Choose a fetcher suitable for the external source you would like to download from.'),
- '#options' => $fetchers,
- '#default_value' => variable_get('aggregator_fetcher', 'aggregator'),
- );
- }
- if (count($parsers) > 1) {
- $basic_conf['aggregator_parser'] = array(
- '#type' => 'radios',
- '#title' => t('Parser'),
- '#description' => t('Parsers transform downloaded data into standard structures. Choose a parser suitable for the type of feeds you would like to aggregate.'),
- '#options' => $parsers,
- '#default_value' => variable_get('aggregator_parser', 'aggregator'),
- );
- }
- if (count($processors) > 1) {
- $basic_conf['aggregator_processors'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Processors'),
- '#description' => t('Processors act on parsed feed data, for example they store feed items. Choose the processors suitable for your task.'),
- '#options' => $processors,
- '#default_value' => variable_get('aggregator_processors', array('aggregator')),
- );
- }
- if (count($basic_conf)) {
- $form['basic_conf'] = array(
- '#type' => 'fieldset',
- '#title' => t('Basic configuration'),
- '#description' => t('For most aggregation tasks, the default settings are fine.'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
- $form['basic_conf'] += $basic_conf;
- }
-
- // Implementing modules will expect an array at $form['modules'].
- $form['modules'] = array();
-
- $form['actions'] = array('#type' => 'actions');
- $form['actions']['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Save configuration'),
- );
-
- return $form;
-}
-
-/**
- * Form submission handler for aggregator_admin_form().
- */
-function aggregator_admin_form_submit($form, &$form_state) {
- if (isset($form_state['values']['aggregator_processors'])) {
- $form_state['values']['aggregator_processors'] = array_filter($form_state['values']['aggregator_processors']);
- }
- system_settings_form_submit($form, $form_state);
-}
-
-/**
- * Form constructor to add/edit/delete aggregator categories.
- *
- * @param $edit
- * An associative array containing:
- * - title: A string to use for the category title.
- * - description: A string to use for the category description.
- * - cid: The category ID.
- *
- * @ingroup forms
- * @see aggregator_form_category_validate()
- * @see aggregator_form_category_submit()
- */
-function aggregator_form_category($form, &$form_state, $edit = array('title' => '', 'description' => '', 'cid' => NULL)) {
- $form['title'] = array('#type' => 'textfield',
- '#title' => t('Title'),
- '#default_value' => $edit['title'],
- '#maxlength' => 64,
- '#required' => TRUE,
- );
- $form['description'] = array('#type' => 'textarea',
- '#title' => t('Description'),
- '#default_value' => $edit['description'],
- );
- $form['actions'] = array('#type' => 'actions');
- $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save'));
- if ($edit['cid']) {
- $form['actions']['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
- $form['cid'] = array('#type' => 'hidden', '#value' => $edit['cid']);
- }
-
- return $form;
-}
-
-/**
- * Form validation handler for aggregator_form_category().
- *
- * @see aggregator_form_category_submit()
- */
-function aggregator_form_category_validate($form, &$form_state) {
- if ($form_state['values']['op'] == t('Save')) {
- // Check for duplicate titles
- if (isset($form_state['values']['cid'])) {
- $category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title AND cid <> :cid", array(':title' => $form_state['values']['title'], ':cid' => $form_state['values']['cid']))->fetchObject();
- }
- else {
- $category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title", array(':title' => $form_state['values']['title']))->fetchObject();
- }
- if ($category) {
- form_set_error('title', t('A category named %category already exists. Enter a unique title.', array('%category' => $form_state['values']['title'])));
- }
- }
-}
-
-/**
- * Form submission handler for aggregator_form_category().
- *
- * @see aggregator_form_category_validate()
- *
- * @todo Add delete confirmation dialog.
- */
-function aggregator_form_category_submit($form, &$form_state) {
- if ($form_state['values']['op'] == t('Delete')) {
- $title = $form_state['values']['title'];
- // Unset the title.
- unset($form_state['values']['title']);
- }
- aggregator_save_category($form_state['values']);
- if (isset($form_state['values']['cid'])) {
- if (isset($form_state['values']['title'])) {
- drupal_set_message(t('The category %category has been updated.', array('%category' => $form_state['values']['title'])));
- if (arg(0) == 'admin') {
- $form_state['redirect'] = 'admin/config/services/aggregator/';
- return;
- }
- else {
- $form_state['redirect'] = 'aggregator/categories/' . $form_state['values']['cid'];
- return;
- }
- }
- else {
- watchdog('aggregator', 'Category %category deleted.', array('%category' => $title));
- drupal_set_message(t('The category %category has been deleted.', array('%category' => $title)));
- if (arg(0) == 'admin') {
- $form_state['redirect'] = 'admin/config/services/aggregator/';
- return;
- }
- else {
- $form_state['redirect'] = 'aggregator/categories/';
- return;
- }
- }
- }
- else {
- watchdog('aggregator', 'Category %category added.', array('%category' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/config/services/aggregator'));
- drupal_set_message(t('The category %category has been added.', array('%category' => $form_state['values']['title'])));
- }
-}
diff --git a/modules/aggregator/aggregator.api.php b/modules/aggregator/aggregator.api.php
deleted file mode 100644
index d5cac4e..0000000
--- a/modules/aggregator/aggregator.api.php
+++ /dev/null
@@ -1,220 +0,0 @@
-url
- * contains the link to the feed. Download the data at the URL and expose it
- * to other modules by attaching it to $feed->source_string.
- *
- * @return
- * TRUE if fetching was successful, FALSE otherwise.
- *
- * @see hook_aggregator_fetch_info()
- * @see hook_aggregator_parse()
- * @see hook_aggregator_process()
- *
- * @ingroup aggregator
- */
-function hook_aggregator_fetch($feed) {
- $feed->source_string = mymodule_fetch($feed->url);
-}
-
-/**
- * Specify the title and short description of your fetcher.
- *
- * The title and the description provided are shown within the configuration
- * page. Use as title the human readable name of the fetcher and as description
- * a brief (40 to 80 characters) explanation of the fetcher's functionality.
- *
- * This hook is only called if your module implements hook_aggregator_fetch().
- * If this hook is not implemented aggregator will use your module's file name
- * as title and there will be no description.
- *
- * @return
- * An associative array defining a title and a description string.
- *
- * @see hook_aggregator_fetch()
- *
- * @ingroup aggregator
- */
-function hook_aggregator_fetch_info() {
- return array(
- 'title' => t('Default fetcher'),
- 'description' => t('Default fetcher for resources available by URL.'),
- );
-}
-
-/**
- * Create an alternative parser for aggregator module.
- *
- * A parser converts feed item data to a common format. The parser is called
- * at the second of the three aggregation stages: first, data is downloaded
- * by the active fetcher; second, it is converted to a common format by the
- * active parser; and finally, it is passed to all active processors which
- * manipulate or store the data.
- *
- * Modules that define this hook can be set as the active parser within the
- * configuration page. Only one parser can be active at a time.
- *
- * @param $feed
- * An object describing the resource to be parsed. $feed->source_string
- * contains the raw feed data. The hook implementation should parse this data
- * and add the following properties to the $feed object:
- * - description: The human-readable description of the feed.
- * - link: A full URL that directly relates to the feed.
- * - image: An image URL used to display an image of the feed.
- * - etag: An entity tag from the HTTP header used for cache validation to
- * determine if the content has been changed.
- * - modified: The UNIX timestamp when the feed was last modified.
- * - items: An array of feed items. The common format for a single feed item
- * is an associative array containing:
- * - title: The human-readable title of the feed item.
- * - description: The full body text of the item or a summary.
- * - timestamp: The UNIX timestamp when the feed item was last published.
- * - author: The author of the feed item.
- * - guid: The global unique identifier (GUID) string that uniquely
- * identifies the item. If not available, the link is used to identify
- * the item.
- * - link: A full URL to the individual feed item.
- *
- * @return
- * TRUE if parsing was successful, FALSE otherwise.
- *
- * @see hook_aggregator_parse_info()
- * @see hook_aggregator_fetch()
- * @see hook_aggregator_process()
- *
- * @ingroup aggregator
- */
-function hook_aggregator_parse($feed) {
- if ($items = mymodule_parse($feed->source_string)) {
- $feed->items = $items;
- return TRUE;
- }
- return FALSE;
-}
-
-/**
- * Specify the title and short description of your parser.
- *
- * The title and the description provided are shown within the configuration
- * page. Use as title the human readable name of the parser and as description
- * a brief (40 to 80 characters) explanation of the parser's functionality.
- *
- * This hook is only called if your module implements hook_aggregator_parse().
- * If this hook is not implemented aggregator will use your module's file name
- * as title and there will be no description.
- *
- * @return
- * An associative array defining a title and a description string.
- *
- * @see hook_aggregator_parse()
- *
- * @ingroup aggregator
- */
-function hook_aggregator_parse_info() {
- return array(
- 'title' => t('Default parser'),
- 'description' => t('Default parser for RSS, Atom and RDF feeds.'),
- );
-}
-
-/**
- * Create a processor for aggregator.module.
- *
- * A processor acts on parsed feed data. Active processors are called at the
- * third and last of the aggregation stages: first, data is downloaded by the
- * active fetcher; second, it is converted to a common format by the active
- * parser; and finally, it is passed to all active processors that manipulate or
- * store the data.
- *
- * Modules that define this hook can be activated as a processor within the
- * configuration page.
- *
- * @param $feed
- * A feed object representing the resource to be processed. $feed->items
- * contains an array of feed items downloaded and parsed at the parsing stage.
- * See hook_aggregator_parse() for the basic format of a single item in the
- * $feed->items array. For the exact format refer to the particular parser in
- * use.
- *
- * @see hook_aggregator_process_info()
- * @see hook_aggregator_fetch()
- * @see hook_aggregator_parse()
- *
- * @ingroup aggregator
- */
-function hook_aggregator_process($feed) {
- foreach ($feed->items as $item) {
- mymodule_save($item);
- }
-}
-
-/**
- * Specify the title and short description of your processor.
- *
- * The title and the description provided are shown within the configuration
- * page. Use as title the natural name of the processor and as description a
- * brief (40 to 80 characters) explanation of the functionality.
- *
- * This hook is only called if your module implements hook_aggregator_process().
- * If this hook is not implemented aggregator will use your module's file name
- * as title and there will be no description.
- *
- * @return
- * An associative array defining a title and a description string.
- *
- * @see hook_aggregator_process()
- *
- * @ingroup aggregator
- */
-function hook_aggregator_process_info() {
- return array(
- 'title' => t('Default processor'),
- 'description' => t('Creates lightweight records of feed items.'),
- );
-}
-
-/**
- * Remove stored feed data.
- *
- * Aggregator calls this hook if either a feed is deleted or a user clicks on
- * "remove items".
- *
- * If your module stores feed items for example on hook_aggregator_process() it
- * is recommended to implement this hook and to remove data related to $feed
- * when called.
- *
- * @param $feed
- * The $feed object whose items are being removed.
- *
- * @ingroup aggregator
- */
-function hook_aggregator_remove($feed) {
- mymodule_remove_items($feed->fid);
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/aggregator/aggregator.css b/modules/aggregator/aggregator.css
deleted file mode 100644
index 4285631..0000000
--- a/modules/aggregator/aggregator.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Styles for theme in the Aggregator module.
- */
-
-#aggregator .feed-source .feed-title {
- margin-top: 0;
-}
-#aggregator .feed-source .feed-image img {
- margin-bottom: 0.75em;
-}
-#aggregator .feed-source .feed-icon {
- float: right; /* LTR */
- display: block;
-}
-#aggregator .feed-item {
- margin-bottom: 1.5em;
-}
-#aggregator .feed-item-title {
- margin-bottom: 0;
- font-size: 1.3em;
-}
-#aggregator .feed-item-meta,
-#aggregator .feed-item-body {
- margin-bottom: 0.5em;
-}
-#aggregator .feed-item-categories {
- font-size: 0.9em;
-}
-#aggregator td {
- vertical-align: bottom;
-}
-#aggregator td.categorize-item {
- white-space: nowrap;
-}
-#aggregator .categorize-item .news-item .body {
- margin-top: 0;
-}
-#aggregator .categorize-item h3 {
- margin-bottom: 1em;
- margin-top: 0;
-}
diff --git a/modules/aggregator/aggregator.fetcher.inc b/modules/aggregator/aggregator.fetcher.inc
deleted file mode 100644
index 0f72877..0000000
--- a/modules/aggregator/aggregator.fetcher.inc
+++ /dev/null
@@ -1,61 +0,0 @@
- t('Default fetcher'),
- 'description' => t('Downloads data from a URL using Drupal\'s HTTP request handler.'),
- );
-}
-
-/**
- * Implements hook_aggregator_fetch().
- */
-function aggregator_aggregator_fetch($feed) {
- $feed->source_string = FALSE;
-
- // Generate conditional GET headers.
- $headers = array();
- if ($feed->etag) {
- $headers['If-None-Match'] = $feed->etag;
- }
- if ($feed->modified) {
- $headers['If-Modified-Since'] = gmdate(DATE_RFC1123, $feed->modified);
- }
-
- // Request feed.
- $result = drupal_http_request($feed->url, array('headers' => $headers));
-
- // Process HTTP response code.
- switch ($result->code) {
- case 304:
- break;
- case 301:
- $feed->url = $result->redirect_url;
- // Do not break here.
- case 200:
- case 302:
- case 307:
- if (!isset($result->data)) {
- $result->data = '';
- }
- if (!isset($result->headers)) {
- $result->headers = array();
- }
- $feed->source_string = $result->data;
- $feed->http_headers = $result->headers;
- break;
- default:
- watchdog('aggregator', 'The feed from %site seems to be broken, due to "%error".', array('%site' => $feed->title, '%error' => $result->code . ' ' . $result->error), WATCHDOG_WARNING);
- drupal_set_message(t('The feed from %site seems to be broken, because of error "%error".', array('%site' => $feed->title, '%error' => $result->code . ' ' . $result->error)));
- }
-
- return $feed->source_string === FALSE ? FALSE : TRUE;
-}
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
deleted file mode 100644
index 988111e..0000000
--- a/modules/aggregator/aggregator.info
+++ /dev/null
@@ -1,8 +0,0 @@
-name = Aggregator
-description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
-package = Core
-version = VERSION
-core = 7.x
-files[] = aggregator.test
-configure = admin/config/services/aggregator/settings
-stylesheets[all][] = aggregator.css
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
deleted file mode 100644
index 70f8c5c..0000000
--- a/modules/aggregator/aggregator.module
+++ /dev/null
@@ -1,782 +0,0 @@
-' . t('About') . '';
- $output .= '
' . t('The Aggregator module is an on-site syndicator and news reader that gathers and displays fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines in feeds, using a number of standardized XML-based formats. For more information, see the online handbook entry for Aggregator module.', array('@aggregator-module' => 'http://drupal.org/documentation/modules/aggregator', '@aggregator' => url('aggregator'))) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
' . t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '
'; - $output .= '' . t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/config/services/aggregator/add/feed'), '@block' => url('admin/structure/block'))) . '
'; - return $output; - case 'admin/config/services/aggregator/add/feed': - return '' . t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') . '
'; - case 'admin/config/services/aggregator/add/category': - return '' . t('Categories allow feed items from different feeds to be grouped together. For example, several sport-related feeds may belong to a category named Sports. Feed items may be grouped automatically (by selecting a category when creating or editing a feed) or manually (via the Categorize page available from feed item listings). Each category provides its own feed page and block.') . '
'; - case 'admin/config/services/aggregator/add/opml': - return '' . t('OPML is an XML format used to exchange multiple feeds between aggregators. A single OPML document may contain a collection of many feeds. Drupal can parse such a file and import all feeds at once, saving you the effort of adding them manually. You may either upload a local file from your computer or enter a URL where Drupal can download it.') . '
'; - } -} - -/** - * Implements hook_theme(). - */ -function aggregator_theme() { - return array( - 'aggregator_wrapper' => array( - 'variables' => array('content' => NULL), - 'file' => 'aggregator.pages.inc', - 'template' => 'aggregator-wrapper', - ), - 'aggregator_categorize_items' => array( - 'render element' => 'form', - 'file' => 'aggregator.pages.inc', - ), - 'aggregator_feed_source' => array( - 'variables' => array('feed' => NULL), - 'file' => 'aggregator.pages.inc', - 'template' => 'aggregator-feed-source', - ), - 'aggregator_block_item' => array( - 'variables' => array('item' => NULL, 'feed' => 0), - ), - 'aggregator_summary_items' => array( - 'variables' => array('summary_items' => NULL, 'source' => NULL), - 'file' => 'aggregator.pages.inc', - 'template' => 'aggregator-summary-items', - ), - 'aggregator_summary_item' => array( - 'variables' => array('item' => NULL), - 'file' => 'aggregator.pages.inc', - 'template' => 'aggregator-summary-item', - ), - 'aggregator_item' => array( - 'variables' => array('item' => NULL), - 'file' => 'aggregator.pages.inc', - 'template' => 'aggregator-item', - ), - 'aggregator_page_opml' => array( - 'variables' => array('feeds' => NULL), - 'file' => 'aggregator.pages.inc', - ), - 'aggregator_page_rss' => array( - 'variables' => array('feeds' => NULL, 'category' => NULL), - 'file' => 'aggregator.pages.inc', - ), - ); -} - -/** - * Implements hook_menu(). - */ -function aggregator_menu() { - $items['admin/config/services/aggregator'] = array( - 'title' => 'Feed aggregator', - 'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.", - 'page callback' => 'aggregator_admin_overview', - 'access arguments' => array('administer news feeds'), - 'weight' => 10, - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/add/feed'] = array( - 'title' => 'Add feed', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_feed'), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/add/category'] = array( - 'title' => 'Add category', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_category'), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/add/opml'] = array( - 'title' => 'Import OPML', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_opml'), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/remove/%aggregator_feed'] = array( - 'title' => 'Remove items', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_admin_remove_feed', 5), - 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/update/%aggregator_feed'] = array( - 'title' => 'Update items', - 'page callback' => 'aggregator_admin_refresh_feed', - 'page arguments' => array(5), - 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/list'] = array( - 'title' => 'List', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['admin/config/services/aggregator/settings'] = array( - 'title' => 'Settings', - 'description' => 'Configure the behavior of the feed aggregator, including when to discard feed items and how to present feed items and categories.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_admin_form'), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'file' => 'aggregator.admin.inc', - ); - $items['aggregator'] = array( - 'title' => 'Feed aggregator', - 'page callback' => 'aggregator_page_last', - 'access arguments' => array('access news feeds'), - 'weight' => 5, - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/sources'] = array( - 'title' => 'Sources', - 'page callback' => 'aggregator_page_sources', - 'access arguments' => array('access news feeds'), - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/categories'] = array( - 'title' => 'Categories', - 'page callback' => 'aggregator_page_categories', - 'access callback' => '_aggregator_has_categories', - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/rss'] = array( - 'title' => 'RSS feed', - 'page callback' => 'aggregator_page_rss', - 'access arguments' => array('access news feeds'), - 'type' => MENU_CALLBACK, - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/opml'] = array( - 'title' => 'OPML feed', - 'page callback' => 'aggregator_page_opml', - 'access arguments' => array('access news feeds'), - 'type' => MENU_CALLBACK, - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/categories/%aggregator_category'] = array( - 'title callback' => '_aggregator_category_title', - 'title arguments' => array(2), - 'page callback' => 'aggregator_page_category', - 'page arguments' => array(2), - 'access arguments' => array('access news feeds'), - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/categories/%aggregator_category/view'] = array( - 'title' => 'View', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['aggregator/categories/%aggregator_category/categorize'] = array( - 'title' => 'Categorize', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_page_category_form', 2), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/categories/%aggregator_category/configure'] = array( - 'title' => 'Configure', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_category', 2), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 1, - 'file' => 'aggregator.admin.inc', - ); - $items['aggregator/sources/%aggregator_feed'] = array( - 'page callback' => 'aggregator_page_source', - 'page arguments' => array(2), - 'access arguments' => array('access news feeds'), - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/sources/%aggregator_feed/view'] = array( - 'title' => 'View', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['aggregator/sources/%aggregator_feed/categorize'] = array( - 'title' => 'Categorize', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_page_source_form', 2), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'file' => 'aggregator.pages.inc', - ); - $items['aggregator/sources/%aggregator_feed/configure'] = array( - 'title' => 'Configure', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_feed', 2), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 1, - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/edit/feed/%aggregator_feed'] = array( - 'title' => 'Edit feed', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_feed', 6), - 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', - ); - $items['admin/config/services/aggregator/edit/category/%aggregator_category'] = array( - 'title' => 'Edit category', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_category', 6), - 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', - ); - - return $items; -} - -/** - * Title callback: Returns a title for aggregator category pages. - * - * @param $category - * An aggregator category. - * - * @return - * A string with the aggregator category title. - */ -function _aggregator_category_title($category) { - return $category['title']; -} - -/** - * Determines whether there are any aggregator categories. - * - * @return - * TRUE if there is at least one category and the user has access to them; - * FALSE otherwise. - */ -function _aggregator_has_categories() { - return user_access('access news feeds') && (bool) db_query_range('SELECT 1 FROM {aggregator_category}', 0, 1)->fetchField(); -} - -/** - * Implements hook_permission(). - */ -function aggregator_permission() { - return array( - 'administer news feeds' => array( - 'title' => t('Administer news feeds'), - ), - 'access news feeds' => array( - 'title' => t('View news feeds'), - ), - ); -} - -/** - * Implements hook_cron(). - * - * Queues news feeds for updates once their refresh interval has elapsed. - */ -function aggregator_cron() { - $result = db_query('SELECT * FROM {aggregator_feed} WHERE queued = 0 AND checked + refresh < :time AND refresh <> :never', array( - ':time' => REQUEST_TIME, - ':never' => AGGREGATOR_CLEAR_NEVER - )); - $queue = DrupalQueue::get('aggregator_feeds'); - foreach ($result as $feed) { - if ($queue->createItem($feed)) { - // Add timestamp to avoid queueing item more than once. - db_update('aggregator_feed') - ->fields(array('queued' => REQUEST_TIME)) - ->condition('fid', $feed->fid) - ->execute(); - } - } - - // Remove queued timestamp after 6 hours assuming the update has failed. - db_update('aggregator_feed') - ->fields(array('queued' => 0)) - ->condition('queued', REQUEST_TIME - (3600 * 6), '<') - ->execute(); -} - -/** - * Implements hook_cron_queue_info(). - */ -function aggregator_cron_queue_info() { - $queues['aggregator_feeds'] = array( - 'worker callback' => 'aggregator_refresh', - 'time' => 60, - ); - return $queues; -} - -/** - * Implements hook_block_info(). - */ -function aggregator_block_info() { - $blocks = array(); - $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title'); - foreach ($result as $category) { - $blocks['category-' . $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title)); - } - $result = db_query('SELECT fid, title FROM {aggregator_feed} WHERE block <> 0 ORDER BY fid'); - foreach ($result as $feed) { - $blocks['feed-' . $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title)); - } - return $blocks; -} - -/** - * Implements hook_block_configure(). - */ -function aggregator_block_configure($delta = '') { - list($type, $id) = explode('-', $delta); - if ($type == 'category') { - $value = db_query('SELECT block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchField(); - $form['block'] = array( - '#type' => 'select', - '#title' => t('Number of news items in block'), - '#default_value' => $value, - '#options' => drupal_map_assoc(range(2, 20)), - ); - return $form; - } -} - -/** - * Implements hook_block_save(). - */ -function aggregator_block_save($delta = '', $edit = array()) { - list($type, $id) = explode('-', $delta); - if ($type == 'category') { - db_update('aggregator_category') - ->fields(array('block' => $edit['block'])) - ->condition('cid', $id) - ->execute(); - } -} - -/** - * Implements hook_block_view(). - * - * Generates blocks for the latest news items in each category and feed. - */ -function aggregator_block_view($delta = '') { - if (user_access('access news feeds')) { - $block = array(); - list($type, $id) = explode('-', $delta); - $result = FALSE; - switch ($type) { - case 'feed': - if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) { - $block['subject'] = check_plain($feed->title); - $result = db_query_range("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", 0, $feed->block, array(':fid' => $id)); - $read_more = theme('more_link', array('url' => 'aggregator/sources/' . $feed->fid, 'title' => t("View this feed's recent news."))); - } - break; - - case 'category': - if ($category = db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchObject()) { - $block['subject'] = check_plain($category->title); - $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = :cid ORDER BY i.timestamp DESC, i.iid DESC', 0, $category->block, array(':cid' => $category->cid)); - $read_more = theme('more_link', array('url' => 'aggregator/categories/' . $category->cid, 'title' => t("View this category's recent news."))); - } - break; - } - - $items = array(); - if (!empty($result)) { - foreach ($result as $item) { - $items[] = theme('aggregator_block_item', array('item' => $item)); - } - } - - // Only display the block if there are items to show. - if (count($items) > 0) { - $block['content'] = theme('item_list', array('items' => $items)) . $read_more; - } - return $block; - } -} - -/** - * Adds/edits/deletes aggregator categories. - * - * @param $edit - * An associative array describing the category to be added/edited/deleted. - */ -function aggregator_save_category($edit) { - $link_path = 'aggregator/categories/'; - if (!empty($edit['cid'])) { - $link_path .= $edit['cid']; - if (!empty($edit['title'])) { - db_merge('aggregator_category') - ->key(array('cid' => $edit['cid'])) - ->fields(array( - 'title' => $edit['title'], - 'description' => $edit['description'], - )) - ->execute(); - $op = 'update'; - } - else { - db_delete('aggregator_category') - ->condition('cid', $edit['cid']) - ->execute(); - // Make sure there is no active block for this category. - if (module_exists('block')) { - db_delete('block') - ->condition('module', 'aggregator') - ->condition('delta', 'category-' . $edit['cid']) - ->execute(); - } - $edit['title'] = ''; - $op = 'delete'; - } - } - elseif (!empty($edit['title'])) { - // A single unique id for bundles and feeds, to use in blocks. - $link_path .= db_insert('aggregator_category') - ->fields(array( - 'title' => $edit['title'], - 'description' => $edit['description'], - 'block' => 5, - )) - ->execute(); - $op = 'insert'; - } - if (isset($op)) { - menu_link_maintain('aggregator', $op, $link_path, $edit['title']); - } -} - -/** - * Add/edit/delete an aggregator feed. - * - * @param $edit - * An associative array describing the feed to be added/edited/deleted. - */ -function aggregator_save_feed($edit) { - if (!empty($edit['fid'])) { - // An existing feed is being modified, delete the category listings. - db_delete('aggregator_category_feed') - ->condition('fid', $edit['fid']) - ->execute(); - } - if (!empty($edit['fid']) && !empty($edit['title'])) { - db_update('aggregator_feed') - ->condition('fid', $edit['fid']) - ->fields(array( - 'title' => $edit['title'], - 'url' => $edit['url'], - 'refresh' => $edit['refresh'], - 'block' => $edit['block'], - )) - ->execute(); - } - elseif (!empty($edit['fid'])) { - $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $edit['fid']))->fetchCol(); - if ($iids) { - db_delete('aggregator_category_item') - ->condition('iid', $iids, 'IN') - ->execute(); - } - db_delete('aggregator_feed')-> - condition('fid', $edit['fid']) - ->execute(); - db_delete('aggregator_item') - ->condition('fid', $edit['fid']) - ->execute(); - // Make sure there is no active block for this feed. - if (module_exists('block')) { - db_delete('block') - ->condition('module', 'aggregator') - ->condition('delta', 'feed-' . $edit['fid']) - ->execute(); - } - } - elseif (!empty($edit['title'])) { - $edit['fid'] = db_insert('aggregator_feed') - ->fields(array( - 'title' => $edit['title'], - 'url' => $edit['url'], - 'refresh' => $edit['refresh'], - 'block' => $edit['block'], - 'link' => '', - 'description' => '', - 'image' => '', - )) - ->execute(); - - } - if (!empty($edit['title'])) { - // The feed is being saved, save the categories as well. - if (!empty($edit['category'])) { - foreach ($edit['category'] as $cid => $value) { - if ($value) { - db_insert('aggregator_category_feed') - ->fields(array( - 'fid' => $edit['fid'], - 'cid' => $cid, - )) - ->execute(); - } - } - } - } -} - -/** - * Removes all items from a feed. - * - * @param $feed - * An object describing the feed to be cleared. - */ -function aggregator_remove($feed) { - _aggregator_get_variables(); - // Call hook_aggregator_remove() on all modules. - module_invoke_all('aggregator_remove', $feed); - // Reset feed. - db_update('aggregator_feed') - ->condition('fid', $feed->fid) - ->fields(array( - 'checked' => 0, - 'hash' => '', - 'etag' => '', - 'modified' => 0, - )) - ->execute(); -} - -/** - * Gets the fetcher, parser, and processors. - * - * @return - * An array containing the fetcher, parser, and processors. - */ -function _aggregator_get_variables() { - // Fetch the feed. - $fetcher = variable_get('aggregator_fetcher', 'aggregator'); - if ($fetcher == 'aggregator') { - include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'aggregator') . '/aggregator.fetcher.inc'; - } - $parser = variable_get('aggregator_parser', 'aggregator'); - if ($parser == 'aggregator') { - include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'aggregator') . '/aggregator.parser.inc'; - } - $processors = variable_get('aggregator_processors', array('aggregator')); - if (in_array('aggregator', $processors)) { - include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'aggregator') . '/aggregator.processor.inc'; - } - return array($fetcher, $parser, $processors); -} - -/** - * Checks a news feed for new items. - * - * @param $feed - * An object describing the feed to be refreshed. - */ -function aggregator_refresh($feed) { - // Store feed URL to track changes. - $feed_url = $feed->url; - - // Fetch the feed. - list($fetcher, $parser, $processors) = _aggregator_get_variables(); - $success = module_invoke($fetcher, 'aggregator_fetch', $feed); - - // We store the hash of feed data in the database. When refreshing a - // feed we compare stored hash and new hash calculated from downloaded - // data. If both are equal we say that feed is not updated. - $hash = hash('sha256', $feed->source_string); - - if ($success && ($feed->hash != $hash)) { - // Parse the feed. - if (module_invoke($parser, 'aggregator_parse', $feed)) { - // Update feed with parsed data. - db_merge('aggregator_feed') - ->key(array('fid' => $feed->fid)) - ->fields(array( - 'url' => $feed->url, - 'link' => empty($feed->link) ? $feed->url : $feed->link, - 'description' => empty($feed->description) ? '' : $feed->description, - 'image' => empty($feed->image) ? '' : $feed->image, - 'hash' => $hash, - 'etag' => empty($feed->etag) ? '' : $feed->etag, - 'modified' => empty($feed->modified) ? 0 : $feed->modified, - )) - ->execute(); - - // Log if feed URL has changed. - if ($feed->url != $feed_url) { - watchdog('aggregator', 'Updated URL for feed %title to %url.', array('%title' => $feed->title, '%url' => $feed->url)); - } - - watchdog('aggregator', 'There is new syndicated content from %site.', array('%site' => $feed->title)); - drupal_set_message(t('There is new syndicated content from %site.', array('%site' => $feed->title))); - - // If there are items on the feed, let all enabled processors do their work on it. - if (@count($feed->items)) { - foreach ($processors as $processor) { - module_invoke($processor, 'aggregator_process', $feed); - } - } - } - } - else { - drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => $feed->title))); - } - - // Regardless of successful or not, indicate that this feed has been checked. - db_update('aggregator_feed') - ->fields(array('checked' => REQUEST_TIME, 'queued' => 0)) - ->condition('fid', $feed->fid) - ->execute(); - - // Expire old feed items. - if (function_exists('aggregator_expire')) { - aggregator_expire($feed); - } -} - -/** - * Loads an aggregator feed. - * - * @param $fid - * The feed id. - * - * @return - * An object describing the feed. - */ -function aggregator_feed_load($fid) { - $feeds = &drupal_static(__FUNCTION__); - if (!isset($feeds[$fid])) { - $feeds[$fid] = db_query('SELECT * FROM {aggregator_feed} WHERE fid = :fid', array(':fid' => $fid))->fetchObject(); - } - - return $feeds[$fid]; -} - -/** - * Loads an aggregator category. - * - * @param $cid - * The category id. - * - * @return - * An associative array describing the category. - */ -function aggregator_category_load($cid) { - $categories = &drupal_static(__FUNCTION__); - if (!isset($categories[$cid])) { - $categories[$cid] = db_query('SELECT * FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $cid))->fetchAssoc(); - } - - return $categories[$cid]; -} - -/** - * Returns HTML for an individual feed item for display in the block. - * - * @param $variables - * An associative array containing: - * - item: The item to be displayed. - * - feed: Not used. - * - * @ingroup themeable - */ -function theme_aggregator_block_item($variables) { - // Display the external link to the item. - return '' . check_plain($variables['item']->title) . "\n"; -} - -/** - * Renders the HTML content safely, as allowed. - * - * @param $value - * The content to be filtered. - * - * @return - * The filtered content. - */ -function aggregator_filter_xss($value) { - return filter_xss($value, preg_split('/\s+|<|>/', variable_get('aggregator_allowed_html_tags', '-
-
-
First example feed item title - http://example.com/example-turns-one -First example feed item description. -
- -
-
Second example feed item title. This title is extremely long so that it exceeds the 255 character limit for titles in feed item storage. In fact it's so long that this sentence isn't long enough so I'm rambling a bit to make it longer, nearly there now. Ah now it's long enough so I'll shut up. - http://example.com/example-turns-two -Second example feed item description. -
- -
-
Long link feed item title. - http://example.com/tomorrow/and/tomorrow/and/tomorrow/creeps/in/this/petty/pace/from/day/to/day/to/the/last/syllable/of/recorded/time/and/all/our/yesterdays/have/lighted/fools/the/way/to/dusty/death/out/out/brief/candle/life/is/but/a/walking/shadow/a/poor/player/that/struts/and/frets/his/hour/upon/the/stage/and/is/heard/no/more/it/is/a/tale/told/by/an/idiot/full/of/sound/and/fury/signifying/nothing -Long link feed item description. -
- -
-
Long author feed item title. - http://example.com/long/author -I wanted to get out and walk eastward toward the park through the soft twilight, but each time I tried to go I became entangled in some wild, strident argument which pulled me back, as if with ropes, into my chair. Yet high over the city our line of yellow windows must have contributed their share of human secrecy to the casual watcher in the darkening streets, and I was him too, looking up and wondering. I was within and without, simultaneously enchanted and repelled by the inexhaustible variety of life. -Long author feed item description. -
- - ' . t('Single-user blogs') . ' '; - $output .= '
- ' . t("Each user's blog entries are automatically displayed with a link to the user's main blog page. You can create as many single-user blogs as you have site users with permission to create blog content.") . ' '; - $output .= '
- ' . t('Multi-user blogs') . ' '; - $output .= '
- ' . t("Blog entries from each single-user blog are also aggregated into one central multi-user blog, which displays the blog content of all users in a single listing.") . ' '; - $output .= '
- ' . t('Navigation') . ' '; - $output .= '
- ' . t("There is an optional Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user's blog entries.") . ' '; - $output .= '
- ' . t('Blocks') . ' '; - $output .= '
- ' . t('The Blog module also creates a default Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . ' '; - $output .= '
- ' . t('Adding and managing book content') . ' '; - $output .= '
- ' . t('You can assign separate permissions for creating, editing, and deleting book content, as well as adding content to books, and creating new books. Users with the Administer book outlines permission can add any type of content to a book by selecting the appropriate book outline while editing the content. They can also view a list of all books, and edit and rearrange section titles on the Book administration page.', array('@admin-book' => url('admin/content/book'))) . ' '; - $output .= '
- ' . t('Book navigation') . ' '; - $output .= '
- ' . t("Book pages have a default book-specific navigation block. This navigation block contains links that lead to the previous and next pages in the book, and to the level above the current page in the book's structure. This block can be enabled on the Blocks administration page. For book pages to show up in the book navigation, they must be added to a book outline.", array('@admin-block' => url('admin/structure/block'))) . ' '; - $output .= '
- ' . t('Collaboration') . ' '; - $output .= '
- ' . t('Books can be created collaboratively, as they allow users with appropriate permissions to add pages into existing books, and add those pages to a custom table of contents menu.') . ' '; - $output .= '
- ' . t('Printing books') . ' '; - $output .= '
- ' . t("Users with the View printer-friendly books permission can select the printer-friendly version link visible at the bottom of a book page's content to generate a printer-friendly display of the page and all of its subsections.") . ' '; - $output .= '
- ', '#suffix' => check_plain($subject) . ' '); - $comment_counter++; - } - } - $form['operation'] = array('#type' => 'hidden', '#value' => 'delete'); - - if (!$comment_counter) { - drupal_set_message(t('There do not appear to be any comments to delete, or your selected comment was deleted by another administrator.')); - drupal_goto('admin/content/comment'); - } - else { - return confirm_form($form, - t('Are you sure you want to delete these comments and all their children?'), - 'admin/content/comment', t('This action cannot be undone.'), - t('Delete comments'), t('Cancel')); - } -} - -/** - * Process comment_multiple_delete_confirm form submissions. - */ -function comment_multiple_delete_confirm_submit($form, &$form_state) { - if ($form_state['values']['confirm']) { - comment_delete_multiple(array_keys($form_state['values']['comments'])); - cache_clear_all(); - $count = count($form_state['values']['comments']); - watchdog('content', 'Deleted @count comments.', array('@count' => $count)); - drupal_set_message(format_plural($count, 'Deleted 1 comment.', 'Deleted @count comments.')); - } - $form_state['redirect'] = 'admin/content/comment'; -} - -/** - * Page callback for comment deletions. - */ -function comment_confirm_delete_page($cid) { - if ($comment = comment_load($cid)) { - return drupal_get_form('comment_confirm_delete', $comment); - } - return MENU_NOT_FOUND; -} - -/** - * Form builder; Builds the confirmation form for deleting a single comment. - * - * @ingroup forms - * @see comment_confirm_delete_submit() - */ -function comment_confirm_delete($form, &$form_state, $comment) { - $form['#comment'] = $comment; - // Always provide entity id in the same form key as in the entity edit form. - $form['cid'] = array('#type' => 'value', '#value' => $comment->cid); - return confirm_form( - $form, - t('Are you sure you want to delete the comment %title?', array('%title' => $comment->subject)), - 'node/' . $comment->nid, - t('Any replies to this comment will be lost. This action cannot be undone.'), - t('Delete'), - t('Cancel'), - 'comment_confirm_delete'); -} - -/** - * Process comment_confirm_delete form submissions. - */ -function comment_confirm_delete_submit($form, &$form_state) { - $comment = $form['#comment']; - // Delete the comment and its replies. - comment_delete($comment->cid); - drupal_set_message(t('The comment and all its replies have been deleted.')); - watchdog('content', 'Deleted comment @cid and its replies.', array('@cid' => $comment->cid)); - // Clear the cache so an anonymous user sees that his comment was deleted. - cache_clear_all(); - - $form_state['redirect'] = "node/$comment->nid"; -} diff --git a/modules/comment/comment.api.php b/modules/comment/comment.api.php deleted file mode 100644 index 0591265..0000000 --- a/modules/comment/comment.api.php +++ /dev/null @@ -1,145 +0,0 @@ -subject = trim($comment->subject); -} - -/** - * The comment is being inserted. - * - * @param $comment - * The comment object. - */ -function hook_comment_insert($comment) { - // Reindex the node when comments are added. - search_touch_node($comment->nid); -} - -/** - * The comment is being updated. - * - * @param $comment - * The comment object. - */ -function hook_comment_update($comment) { - // Reindex the node when comments are updated. - search_touch_node($comment->nid); -} - -/** - * Comments are being loaded from the database. - * - * @param $comments - * An array of comment objects indexed by cid. - */ -function hook_comment_load($comments) { - $result = db_query('SELECT cid, foo FROM {mytable} WHERE cid IN (:cids)', array(':cids' => array_keys($comments))); - foreach ($result as $record) { - $comments[$record->cid]->foo = $record->foo; - } -} - -/** - * The comment is being viewed. This hook can be used to add additional data to the comment before theming. - * - * @param $comment - * Passes in the comment the action is being performed on. - * @param $view_mode - * View mode, e.g. 'full', 'teaser'... - * @param $langcode - * The language code used for rendering. - * - * @see hook_entity_view() - */ -function hook_comment_view($comment, $view_mode, $langcode) { - // how old is the comment - $comment->time_ago = time() - $comment->changed; -} - -/** - * The comment was built; the module may modify the structured content. - * - * This hook is called after the content has been assembled in a structured array - * and may be used for doing processing which requires that the complete comment - * content structure has been built. - * - * If the module wishes to act on the rendered HTML of the comment rather than the - * structured content array, it may use this hook to add a #post_render callback. - * Alternatively, it could also implement hook_preprocess_comment(). See - * drupal_render() and theme() documentation respectively for details. - * - * @param $build - * A renderable array representing the comment. - * - * @see comment_view() - * @see hook_entity_view_alter() - */ -function hook_comment_view_alter(&$build) { - // Check for the existence of a field added by another module. - if ($build['#view_mode'] == 'full' && isset($build['an_additional_field'])) { - // Change its weight. - $build['an_additional_field']['#weight'] = -10; - } - - // Add a #post_render callback to act on the rendered HTML of the comment. - $build['#post_render'][] = 'my_module_comment_post_render'; -} - -/** - * The comment is being published by the moderator. - * - * @param $comment - * Passes in the comment the action is being performed on. - * @return - * Nothing. - */ -function hook_comment_publish($comment) { - drupal_set_message(t('Comment: @subject has been published', array('@subject' => $comment->subject))); -} - -/** - * The comment is being unpublished by the moderator. - * - * @param $comment - * Passes in the comment the action is being performed on. - * @return - * Nothing. - */ -function hook_comment_unpublish($comment) { - drupal_set_message(t('Comment: @subject has been unpublished', array('@subject' => $comment->subject))); -} - -/** - * The comment is being deleted by the moderator. - * - * @param $comment - * Passes in the comment the action is being performed on. - * @return - * Nothing. - */ -function hook_comment_delete($comment) { - drupal_set_message(t('Comment: @subject has been deleted', array('@subject' => $comment->subject))); -} - -/** - * @} End of "addtogroup hooks". - */ diff --git a/modules/comment/comment.css b/modules/comment/comment.css deleted file mode 100644 index a55f527..0000000 --- a/modules/comment/comment.css +++ /dev/null @@ -1,13 +0,0 @@ - -#comments { - margin-top: 15px; -} -.indented { - margin-left: 25px; /* LTR */ -} -.comment-unpublished { - background-color: #fff4f4; -} -.comment-preview { - background-color: #ffffea; -} diff --git a/modules/comment/comment.info b/modules/comment/comment.info deleted file mode 100644 index 7cbe246..0000000 --- a/modules/comment/comment.info +++ /dev/null @@ -1,10 +0,0 @@ -name = Comment -description = Allows users to comment on and discuss published content. -package = Core -version = VERSION -core = 7.x -dependencies[] = text -files[] = comment.module -files[] = comment.test -configure = admin/content/comment -stylesheets[all][] = comment.css diff --git a/modules/comment/comment.install b/modules/comment/comment.install deleted file mode 100644 index e4da58f..0000000 --- a/modules/comment/comment.install +++ /dev/null @@ -1,578 +0,0 @@ -leftJoin('node_comment_statistics', 'ncs', 'ncs.nid = n.nid'); - $query->addField('n', 'created', 'last_comment_timestamp'); - $query->addField('n', 'uid', 'last_comment_uid'); - $query->addField('n', 'nid'); - $query->addExpression('0', 'comment_count'); - $query->addExpression('NULL', 'last_comment_name'); - $query->isNull('ncs.comment_count'); - - db_insert('node_comment_statistics') - ->from($query) - ->execute(); -} - -/** - * Implements hook_modules_enabled(). - * - * Creates comment body fields for node types existing before the comment module - * is enabled. We use hook_modules_enabled() rather than hook_enable() so we can - * react to node types of existing modules, and those of modules being enabled - * both before and after comment module in the loop of module_enable(). - * - * There is a separate comment bundle for each node type to allow for - * per-node-type customization of comment fields. Each one of these bundles - * needs a comment body field instance. A comment bundle is needed even for - * node types whose comments are disabled by default, because individual nodes - * may override that default. - * - * @see comment_node_type_insert() - */ -function comment_modules_enabled($modules) { - // Only react if comment module is one of the modules being enabled. - // hook_node_type_insert() is used to create body fields while the comment - // module is enabled. - if (in_array('comment', $modules)) { - // Ensure that the list of node types reflects newly enabled modules. - node_types_rebuild(); - - // Create comment body fields for each node type, if needed. - foreach (node_type_get_types() as $type => $info) { - _comment_body_field_create($info); - } - } -} - -/** - * Implements hook_update_dependencies(). - */ -function comment_update_dependencies() { - // comment_update_7005() creates the comment body field and therefore must - // run after all Field modules have been enabled, which happens in - // system_update_7027(). - $dependencies['comment'][7005] = array( - 'system' => 7027, - ); - - // comment_update_7006() needs to query the {filter_format} table to get a - // list of existing text formats, so it must run after filter_update_7000(), - // which creates that table. - $dependencies['comment'][7006] = array( - 'filter' => 7000, - ); - - return $dependencies; -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Rename comment display setting variables. - */ -function comment_update_7000() { - $types = _update_7000_node_get_types(); - foreach ($types as $type => $type_object) { - variable_del('comment_default_order' . $type); - - // Drupal 6 had four display modes: - // - COMMENT_MODE_FLAT_COLLAPSED = 1 - // - COMMENT_MODE_FLAT_EXPANDED = 2 - // - COMMENT_MODE_THREADED_COLLAPSED = 3 - // - COMMENT_MODE_THREADED_EXPANDED = 4 - // - // Drupal 7 doesn't support collapsed/expanded modes anymore, so we - // migrate all the flat modes to COMMENT_MODE_FLAT (0) and all the threaded - // modes to COMMENT_MODE_THREADED (1). - $setting = variable_get('comment_default_mode_' . $type, 4); - if ($setting == 3 || $setting == 4) { - variable_set('comment_default_mode_' . $type, 1); - } - else { - variable_set('comment_default_mode_' . $type, 0); - } - - // There were only two comment modes in the past: - // - 1 was 'required' previously, convert into DRUPAL_REQUIRED (2). - // - 0 was 'optional' previously, convert into DRUPAL_OPTIONAL (1). - $preview = variable_get('comment_preview_' . $type, 1) ? 2 : 1; - variable_set('comment_preview_' . $type, $preview); - } -} - -/** - * Change comment status from published being 0 to being 1 - */ -function comment_update_7001() { - // Choose a temporary status value different from the existing status values. - $tmp_status = db_query('SELECT MAX(status) FROM {comments}')->fetchField() + 1; - - $changes = array( - 0 => $tmp_status, - 1 => 0, - $tmp_status => 1, - ); - - foreach ($changes as $old => $new) { - db_update('comments') - ->fields(array('status' => $new)) - ->condition('status', $old) - ->execute(); - } -} - -/** - * Rename {comments} table to {comment} and upgrade it. - */ -function comment_update_7002() { - db_rename_table('comments', 'comment'); - - // Add user-related indexes. These may already exist from Drupal 6. - if (!db_index_exists('comment', 'comment_uid')) { - db_add_index('comment', 'comment_uid', array('uid')); - db_add_index('node_comment_statistics', 'last_comment_uid', array('last_comment_uid')); - } - - // Create a language column. - db_add_field('comment', 'language', array( - 'type' => 'varchar', - 'length' => 12, - 'not null' => TRUE, - 'default' => '', - )); - db_add_index('comment', 'comment_nid_language', array('nid', 'language')); -} - -/** - * Split {comment}.timestamp into 'created' and 'changed', improve indexing on {comment}. - */ -function comment_update_7003() { - // Drop the old indexes. - db_drop_index('comment', 'status'); - db_drop_index('comment', 'pid'); - - // Create a created column. - db_add_field('comment', 'created', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - )); - - // Rename the timestamp column to changed. - db_change_field('comment', 'timestamp', 'changed', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - )); - - // Migrate the data. - // @todo db_update() should support this. - db_query('UPDATE {comment} SET created = changed'); - - // Recreate the indexes. - // The 'comment_num_new' index is optimized for comment_num_new() - // and comment_new_page_count(). - db_add_index('comment', 'comment_num_new', array('nid', 'status', 'created', 'cid', 'thread')); - db_add_index('comment', 'comment_pid_status', array('pid', 'status')); -} - -/** - * Upgrade the {node_comment_statistics} table. - */ -function comment_update_7004() { - db_add_field('node_comment_statistics', 'cid', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {comment}.cid of the last comment.', - )); - db_add_index('node_comment_statistics', 'cid', array('cid')); - - // The comment_count index may have been added in Drupal 6. - if (!db_index_exists('node_comment_statistics', 'comment_count')) { - // Add an index on the comment_count. - db_add_index('node_comment_statistics', 'comment_count', array('comment_count')); - } -} - -/** - * Create the comment_body field. - */ -function comment_update_7005() { - // Create comment body field. - $field = array( - 'field_name' => 'comment_body', - 'type' => 'text_long', - 'module' => 'text', - 'entity_types' => array( - 'comment', - ), - 'settings' => array(), - 'cardinality' => 1, - ); - _update_7000_field_create_field($field); - - // Add the field to comments for all existing bundles. - $generic_instance = array( - 'entity_type' => 'comment', - 'label' => t('Comment'), - 'settings' => array( - 'text_processing' => 1, - ), - 'required' => TRUE, - 'display' => array( - 'default' => array( - 'label' => 'hidden', - 'type' => 'text_default', - 'weight' => 0, - 'settings' => array(), - 'module' => 'text', - ), - ), - 'widget' => array( - 'type' => 'text_textarea', - 'settings' => array( - 'rows' => 5, - ), - 'weight' => 0, - 'module' => 'text', - ), - 'description' => '', - ); - - $types = _update_7000_node_get_types(); - foreach ($types as $type => $type_object) { - $instance = $generic_instance; - $instance['bundle'] = 'comment_node_' . $type; - _update_7000_field_create_instance($field, $instance); - } -} - -/** - * Migrate data from the comment field to field storage. - */ -function comment_update_7006(&$sandbox) { - // This is a multipass update. First set up some comment variables. - if (empty($sandbox['total'])) { - $comments = (bool) db_query_range('SELECT 1 FROM {comment}', 0, 1)->fetchField(); - $sandbox['types'] = array(); - if ($comments) { - $sandbox['types'] = array_keys(_update_7000_node_get_types()); - } - $sandbox['total'] = count($sandbox['types']); - } - - if (!empty($sandbox['types'])) { - $type = array_shift($sandbox['types']); - - $query = db_select('comment', 'c'); - $query->innerJoin('node', 'n', 'c.nid = n.nid AND n.type = :type', array(':type' => $type)); - $query->addField('c', 'cid', 'entity_id'); - $query->addExpression("'comment_node_$type'", 'bundle'); - $query->addExpression("'comment'", 'entity_type'); - $query->addExpression('0', 'deleted'); - $query->addExpression("'" . LANGUAGE_NONE . "'", 'language'); - $query->addExpression('0', 'delta'); - $query->addField('c', 'comment', 'comment_body_value'); - $query->addField('c', 'format', 'comment_body_format'); - - db_insert('field_data_comment_body') - ->from($query) - ->execute(); - - $sandbox['#finished'] = 1 - count($sandbox['types']) / $sandbox['total']; - } - - // On the last pass of the update, $sandbox['types'] will be empty. - if (empty($sandbox['types'])) { - // Update the comment body text formats. For an explanation of these - // updates, see the code comments in user_update_7010(). - db_update('field_data_comment_body') - ->fields(array('comment_body_format' => NULL)) - ->condition('comment_body_value', '') - ->condition('comment_body_format', 0) - ->execute(); - $existing_formats = db_query("SELECT format FROM {filter_format}")->fetchCol(); - $default_format = variable_get('filter_default_format', 1); - db_update('field_data_comment_body') - ->fields(array('comment_body_format' => $default_format)) - ->isNotNull('comment_body_format') - ->condition('comment_body_format', $existing_formats, 'NOT IN') - ->execute(); - - // Finally, remove the old comment data. - db_drop_field('comment', 'comment'); - db_drop_field('comment', 'format'); - } -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Add an index to the created column. - */ -function comment_update_7007() { - db_add_index('comment', 'comment_created', array('created')); -} - -/** - * Update database to match Drupal 7 schema. - */ -function comment_update_7008() { - // Update default status to 1. - db_change_field('comment', 'status', 'status', array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 1, - 'size' => 'tiny', - )); - - // Realign indexes. - db_drop_index('comment', 'comment_status_pid'); - db_add_index('comment', 'comment_status_pid', array('pid', 'status')); - db_drop_index('comment', 'comment_pid_status'); - db_drop_index('comment', 'nid'); -} - -/** - * Change the last_comment_timestamp column description. - */ -function comment_update_7009() { - db_change_field('node_comment_statistics', 'last_comment_timestamp', 'last_comment_timestamp', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.changed.', - )); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ - -/** - * Implements hook_schema(). - */ -function comment_schema() { - $schema['comment'] = array( - 'description' => 'Stores comments and associated data.', - 'fields' => array( - 'cid' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'Primary Key: Unique comment ID.', - ), - 'pid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {comment}.cid to which this comment is a reply. If set to 0, this comment is not a reply to an existing comment.', - ), - 'nid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {node}.nid to which this comment is a reply.', - ), - 'uid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {users}.uid who authored the comment. If set to 0, this comment was created by an anonymous user.', - ), - 'subject' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The comment title.', - ), - 'hostname' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => "The author's host name.", - ), - 'created' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The time that the comment was created, as a Unix timestamp.', - ), - 'changed' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The time that the comment was last edited, as a Unix timestamp.', - ), - 'status' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 1, - 'size' => 'tiny', - 'description' => 'The published status of a comment. (0 = Not Published, 1 = Published)', - ), - 'thread' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'description' => "The vancode representation of the comment's place in a thread.", - ), - 'name' => array( - 'type' => 'varchar', - 'length' => 60, - 'not null' => FALSE, - 'description' => "The comment author's name. Uses {users}.name if the user is logged in, otherwise uses the value typed into the comment form.", - ), - 'mail' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => FALSE, - 'description' => "The comment author's e-mail address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on.", - ), - 'homepage' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - 'description' => "The comment author's home page address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on.", - ), - 'language' => array( - 'description' => 'The {languages}.language of this comment.', - 'type' => 'varchar', - 'length' => 12, - 'not null' => TRUE, - 'default' => '', - ), - ), - 'indexes' => array( - 'comment_status_pid' => array('pid', 'status'), - 'comment_num_new' => array('nid', 'status', 'created', 'cid', 'thread'), - 'comment_uid' => array('uid'), - 'comment_nid_language' => array('nid', 'language'), - 'comment_created' => array('created'), - ), - 'primary key' => array('cid'), - 'foreign keys' => array( - 'comment_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - 'comment_author' => array( - 'table' => 'users', - 'columns' => array('uid' => 'uid'), - ), - ), - ); - - $schema['node_comment_statistics'] = array( - 'description' => 'Maintains statistics of node and comments posts to show "new" and "updated" flags.', - 'fields' => array( - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {node}.nid for which the statistics are compiled.', - ), - 'cid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {comment}.cid of the last comment.', - ), - 'last_comment_timestamp' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.changed.', - ), - 'last_comment_name' => array( - 'type' => 'varchar', - 'length' => 60, - 'not null' => FALSE, - 'description' => 'The name of the latest author to post a comment on this node, from {comment}.name.', - ), - 'last_comment_uid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The user ID of the latest author to post a comment on this node, from {comment}.uid.', - ), - 'comment_count' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The total number of comments on this node.', - ), - ), - 'primary key' => array('nid'), - 'indexes' => array( - 'node_comment_timestamp' => array('last_comment_timestamp'), - 'comment_count' => array('comment_count'), - 'last_comment_uid' => array('last_comment_uid'), - ), - 'foreign keys' => array( - 'statistics_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - 'last_comment_author' => array( - 'table' => 'users', - 'columns' => array( - 'last_comment_uid' => 'uid', - ), - ), - ), - ); - - return $schema; -} diff --git a/modules/comment/comment.pages.inc b/modules/comment/comment.pages.inc deleted file mode 100644 index 482e3f2..0000000 --- a/modules/comment/comment.pages.inc +++ /dev/null @@ -1,123 +0,0 @@ -title, 'node/' . $node->nid))); - $op = isset($_POST['op']) ? $_POST['op'] : ''; - $build = array(); - - // The user is previewing a comment prior to submitting it. - if ($op == t('Preview')) { - if (user_access('post comments')) { - $build['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", (object) array('pid' => $pid, 'nid' => $node->nid)); - } - else { - drupal_set_message(t('You are not authorized to post comments.'), 'error'); - drupal_goto("node/$node->nid"); - } - } - else { - // $pid indicates that this is a reply to a comment. - if ($pid) { - if (user_access('access comments')) { - // Load the comment whose cid = $pid - $comment = db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.signature_format, u.picture, u.data FROM {comment} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = :cid AND c.status = :status', array( - ':cid' => $pid, - ':status' => COMMENT_PUBLISHED, - ))->fetchObject(); - if ($comment) { - // If that comment exists, make sure that the current comment and the - // parent comment both belong to the same parent node. - if ($comment->nid != $node->nid) { - // Attempting to reply to a comment not belonging to the current nid. - drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); - drupal_goto("node/$node->nid"); - } - // Display the parent comment - $comment->node_type = 'comment_node_' . $node->type; - field_attach_load('comment', array($comment->cid => $comment)); - $comment->name = $comment->uid ? $comment->registered_name : $comment->name; - $build['comment_parent'] = comment_view($comment, $node); - } - else { - drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); - drupal_goto("node/$node->nid"); - } - } - else { - drupal_set_message(t('You are not authorized to view comments.'), 'error'); - drupal_goto("node/$node->nid"); - } - } - // This is the case where the comment is in response to a node. Display the node. - elseif (user_access('access content')) { - $build['comment_node'] = node_view($node); - } - - // Should we show the reply box? - if ($node->comment != COMMENT_NODE_OPEN) { - drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error'); - drupal_goto("node/$node->nid"); - } - elseif (user_access('post comments')) { - $edit = array('nid' => $node->nid, 'pid' => $pid); - $build['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", (object) $edit); - } - else { - drupal_set_message(t('You are not authorized to post comments.'), 'error'); - drupal_goto("node/$node->nid"); - } - } - - return $build; -} - -/** - * Menu callback; publish specified comment. - * - * @param $cid - * A comment identifier. - */ -function comment_approve($cid) { - if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], "comment/$cid/approve")) { - return MENU_ACCESS_DENIED; - } - if ($comment = comment_load($cid)) { - $comment->status = COMMENT_PUBLISHED; - comment_save($comment); - - drupal_set_message(t('Comment approved.')); - drupal_goto('node/' . $comment->nid); - } - return MENU_NOT_FOUND; -} diff --git a/modules/comment/comment.tokens.inc b/modules/comment/comment.tokens.inc deleted file mode 100644 index c495ec3..0000000 --- a/modules/comment/comment.tokens.inc +++ /dev/null @@ -1,243 +0,0 @@ - t('Comments'), - 'description' => t('Tokens for comments posted on the site.'), - 'needs-data' => 'comment', - ); - - // Comment-related tokens for nodes - $node['comment-count'] = array( - 'name' => t("Comment count"), - 'description' => t("The number of comments posted on a node."), - ); - $node['comment-count-new'] = array( - 'name' => t("New comment count"), - 'description' => t("The number of comments posted on a node since the reader last viewed it."), - ); - - // Core comment tokens - $comment['cid'] = array( - 'name' => t("Comment ID"), - 'description' => t("The unique ID of the comment."), - ); - $comment['hostname'] = array( - 'name' => t("IP Address"), - 'description' => t("The IP address of the computer the comment was posted from."), - ); - $comment['name'] = array( - 'name' => t("Name"), - 'description' => t("The name left by the comment author."), - ); - $comment['mail'] = array( - 'name' => t("Email address"), - 'description' => t("The email address left by the comment author."), - ); - $comment['homepage'] = array( - 'name' => t("Home page"), - 'description' => t("The home page URL left by the comment author."), - ); - $comment['title'] = array( - 'name' => t("Title"), - 'description' => t("The title of the comment."), - ); - $comment['body'] = array( - 'name' => t("Content"), - 'description' => t("The formatted content of the comment itself."), - ); - $comment['url'] = array( - 'name' => t("URL"), - 'description' => t("The URL of the comment."), - ); - $comment['edit-url'] = array( - 'name' => t("Edit URL"), - 'description' => t("The URL of the comment's edit page."), - ); - - // Chained tokens for comments - $comment['created'] = array( - 'name' => t("Date created"), - 'description' => t("The date the comment was posted."), - 'type' => 'date', - ); - $comment['changed'] = array( - 'name' => t("Date changed"), - 'description' => t("The date the comment was most recently updated."), - 'type' => 'date', - ); - $comment['parent'] = array( - 'name' => t("Parent"), - 'description' => t("The comment's parent, if comment threading is active."), - 'type' => 'comment', - ); - $comment['node'] = array( - 'name' => t("Node"), - 'description' => t("The node the comment was posted to."), - 'type' => 'node', - ); - $comment['author'] = array( - 'name' => t("Author"), - 'description' => t("The author of the comment, if they were logged in."), - 'type' => 'user', - ); - - return array( - 'types' => array('comment' => $type), - 'tokens' => array( - 'node' => $node, - 'comment' => $comment, - ), - ); -} - -/** - * Implements hook_tokens(). - */ -function comment_tokens($type, $tokens, array $data = array(), array $options = array()) { - $url_options = array('absolute' => TRUE); - if (isset($options['language'])) { - $url_options['language'] = $options['language']; - $language_code = $options['language']->language; - } - else { - $language_code = NULL; - } - $sanitize = !empty($options['sanitize']); - - $replacements = array(); - - if ($type == 'comment' && !empty($data['comment'])) { - $comment = $data['comment']; - - foreach ($tokens as $name => $original) { - switch ($name) { - // Simple key values on the comment. - case 'cid': - $replacements[$original] = $comment->cid; - break; - - // Poster identity information for comments - case 'hostname': - $replacements[$original] = $sanitize ? check_plain($comment->hostname) : $comment->hostname; - break; - - case 'name': - $name = ($comment->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $comment->name; - $replacements[$original] = $sanitize ? filter_xss($name) : $name; - break; - - case 'mail': - if ($comment->uid != 0) { - $account = user_load($comment->uid); - $mail = $account->mail; - } - else { - $mail = $comment->mail; - } - $replacements[$original] = $sanitize ? check_plain($mail) : $mail; - break; - - case 'homepage': - $replacements[$original] = $sanitize ? check_url($comment->homepage) : $comment->homepage; - break; - - case 'title': - $replacements[$original] = $sanitize ? filter_xss($comment->subject) : $comment->subject; - break; - - case 'body': - if ($items = field_get_items('comment', $comment, 'comment_body', $language_code)) { - $instance = field_info_instance('comment', 'body', 'comment_body'); - $field_langcode = field_language('comment', $comment, 'comment_body', $language_code); - $replacements[$original] = $sanitize ? _text_sanitize($instance, $field_langcode, $items[0], 'value') : $items[0]['value']; - } - break; - - // Comment related URLs. - case 'url': - $url_options['fragment'] = 'comment-' . $comment->cid; - $replacements[$original] = url('comment/' . $comment->cid, $url_options); - break; - - case 'edit-url': - $url_options['fragment'] = NULL; - $replacements[$original] = url('comment/' . $comment->cid . '/edit', $url_options); - break; - - // Default values for the chained tokens handled below. - case 'author': - $replacements[$original] = $sanitize ? filter_xss($comment->name) : $comment->name; - break; - - case 'parent': - if (!empty($comment->pid)) { - $parent = comment_load($comment->pid); - $replacements[$original] = $sanitize ? filter_xss($parent->subject) : $parent->subject; - } - break; - - case 'created': - $replacements[$original] = format_date($comment->created, 'medium', '', NULL, $language_code); - break; - - case 'changed': - $replacements[$original] = format_date($comment->changed, 'medium', '', NULL, $language_code); - break; - - case 'node': - $node = node_load($comment->nid); - $title = $node->title; - $replacements[$original] = $sanitize ? filter_xss($title) : $title; - break; - } - } - - // Chained token relationships. - if ($node_tokens = token_find_with_prefix($tokens, 'node')) { - $node = node_load($comment->nid); - $replacements += token_generate('node', $node_tokens, array('node' => $node), $options); - } - - if ($date_tokens = token_find_with_prefix($tokens, 'created')) { - $replacements += token_generate('date', $date_tokens, array('date' => $comment->created), $options); - } - - if ($date_tokens = token_find_with_prefix($tokens, 'changed')) { - $replacements += token_generate('date', $date_tokens, array('date' => $comment->changed), $options); - } - - if (($parent_tokens = token_find_with_prefix($tokens, 'parent')) && $parent = comment_load($comment->pid)) { - $replacements += token_generate('comment', $parent_tokens, array('comment' => $parent), $options); - } - - if (($author_tokens = token_find_with_prefix($tokens, 'author')) && $account = user_load($comment->uid)) { - $replacements += token_generate('user', $author_tokens, array('user' => $account), $options); - } - } - elseif ($type == 'node' & !empty($data['node'])) { - $node = $data['node']; - - foreach ($tokens as $name => $original) { - switch($name) { - case 'comment-count': - $replacements[$original] = $node->comment_count; - break; - - case 'comment-count-new': - $replacements[$original] = comment_num_new($node->nid); - break; - } - } - } - - return $replacements; -} diff --git a/modules/comment/comment.tpl.php b/modules/comment/comment.tpl.php deleted file mode 100644 index 8298473..0000000 --- a/modules/comment/comment.tpl.php +++ /dev/null @@ -1,92 +0,0 @@ -created variable. - * - $changed: Formatted date and time for when the comment was last changed. - * Preprocess functions can reformat it by calling format_date() with the - * desired parameters on the $comment->changed variable. - * - $new: New comment marker. - * - $permalink: Comment permalink. - * - $submitted: Submission information created from $author and $created during - * template_preprocess_comment(). - * - $picture: Authors picture. - * - $signature: Authors signature. - * - $status: Comment status. Possible values are: - * comment-unpublished, comment-published or comment-preview. - * - $title: Linked title. - * - $classes: String of classes that can be used to style contextually through - * CSS. It can be manipulated through the variable $classes_array from - * preprocess functions. The default values can be one or more of the following: - * - comment: The current template type, i.e., "theming hook". - * - comment-by-anonymous: Comment by an unregistered user. - * - comment-by-node-author: Comment by the author of the parent node. - * - comment-preview: When previewing a new or edited comment. - * The following applies only to viewers who are registered users: - * - comment-unpublished: An unpublished comment visible only to administrators. - * - comment-by-viewer: Comment by the user currently viewing the page. - * - comment-new: New comment since last the visit. - * - $title_prefix (array): An array containing additional output populated by - * modules, intended to be displayed in front of the main title tag that - * appears in the template. - * - $title_suffix (array): An array containing additional output populated by - * modules, intended to be displayed after the main title tag that appears in - * the template. - * - * These two variables are provided for context: - * - $comment: Full comment object. - * - $node: Node object the comments are attached to. - * - * Other variables: - * - $classes_array: Array of html class attribute values. It is flattened - * into a string within the variable $classes. - * - * @see template_preprocess() - * @see template_preprocess_comment() - * @see template_process() - * @see theme_comment() - * - * @ingroup themeable - */ -?> -
- ' . t('User contact forms') . ' '; - $output .= '
- ' . t('Site users can be contacted with a user contact form that keeps their e-mail address private. Users may enable or disable their personal contact forms by editing their My account page. If enabled, a Contact tab leads to a personal contact form displayed on their user profile. Site administrators are still able to use the contact form, even if has been disabled. The Contact tab is not shown when you view your own profile.') . ' '; - $output .= '
- ' . t('Site-wide contact forms') . ' '; - $output .= '
- ' . t('The Contact page provides a simple form for users with the Use the site-wide contact form permission to send comments, feedback, or other requests. You can create categories for directing the contact form messages to a set of defined recipients. Common categories for a business site, for example, might include "Website feedback" (messages are forwarded to website administrators) and "Product information" (messages are forwarded to members of the sales department). E-mail addresses defined within a category are not displayed publicly.', array('@contact' => url('contact'))) . ''; - $output .= '
- ' . t('Navigation') . ' '; - $output .= '
- ' . t("When the site-wide contact form is enabled, a link in the main Navigation menu is created, but the link is disabled by default. This menu link can be enabled on the Menus administration page.", array('@contact' => url('contact'), '@menu' => url('admin/structure/menu'))) . ' '; - $output .= '
- ' . t('Customization') . ' '; - $output .= '
- ' . t('If you would like additional text to appear on the site-wide or personal contact page, use a block. You can create and edit blocks on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . ' '; - $output .= '
- ' . t('Displaying contextual links') . ' '; - $output .= '
- ' . t('Contextual links are supplied by modules, to give you quick access to tasks associated with regions of pages on your site. For instance, if you have a custom menu block displayed in a sidebar of your site, the Blocks and Menus modules will supply links to configure the block and edit the menu. The Contextual links module collects these links into a list for display by your theme, and also adds JavaScript code to the page to hide the links initially, and display them when your mouse hovers over the block.') . ' '; - $output .= '
- ' . t('Tracking user activity') . ' '; - $output .= '
- ' . t("By enabling blocks such as Who's online and Who's new, site users can track who is logged in and new user signups at a centralized location.") . ' '; - $output .= '
- ' . t('Tracking content activity') . ' '; - $output .= '
- ' . t('By enabling blocks such as Recent blog posts, New forum topics and Recent comments, site users can view newly added site content at a glance.') . ' '; - $output .= '
- ' . t('Monitoring your site') . ' '; - $output .= '
- ' . t('The Database logging module allows you to view an event log on the Recent log messages page. The log is a chronological list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the log on a regular basis to ensure their site is working properly.', array('@dblog' => url('admin/reports/dblog'))) . ' '; - $output .= '
- ' . t('Debugging site problems') . ' '; - $output .= '
- ' . t('In case of errors or problems with the site, the Recent log messages page can be useful for debugging, since it shows the sequence of events. The log messages include usage information, warnings, and errors.', array('@dblog' => url('admin/reports/dblog'))) . ' '; - $output .= '
-
- ',
- 'filter_html_help' => 1,
- 'filter_html_nofollow' => 0,
- ),
- 'tips callback' => '_filter_html_tips',
- );
- $filters['filter_autop'] = array(
- 'title' => t('Convert line breaks'),
- 'description' => t('Converts line breaks into HTML (i.e. <br> and <p>) tags.'),
- 'process callback' => '_filter_autop',
- 'tips callback' => '_filter_autop_tips',
- );
- return $filters;
-}
-
-/**
- * Perform alterations on filter definitions.
- *
- * @param $info
- * Array of information on filters exposed by hook_filter_info()
- * implementations.
- */
-function hook_filter_info_alter(&$info) {
- // Replace the PHP evaluator process callback with an improved
- // PHP evaluator provided by a module.
- $info['php_code']['process callback'] = 'my_module_php_evaluator';
-
- // Alter the default settings of the URL filter provided by core.
- $info['filter_url']['default settings'] = array(
- 'filter_url_length' => 100,
- );
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
-
-/**
- * Provide a settings form for filter settings.
- *
- * Callback for hook_filter_info().
- *
- * This callback function is used to provide a settings form for filter
- * settings, for filters that need settings on a per-text-format basis. This
- * function should return the form elements for the settings; the filter
- * module will take care of saving the settings in the database.
- *
- * If the filter's behavior depends on an extensive list and/or external data
- * (e.g. a list of smileys, a list of glossary terms), then the filter module
- * can choose to provide a separate, global configuration page rather than
- * per-text-format settings. In that case, the settings callback function
- * should provide a link to the separate settings page.
- *
- * @param $form
- * The prepopulated form array of the filter administration form.
- * @param $form_state
- * The state of the (entire) configuration form.
- * @param $filter
- * The filter object containing the current settings for the given format,
- * in $filter->settings.
- * @param $format
- * The format object being configured.
- * @param $defaults
- * The default settings for the filter, as defined in 'default settings' in
- * hook_filter_info(). These should be combined with $filter->settings to
- * define the form element defaults.
- * @param $filters
- * The complete list of filter objects that are enabled for the given format.
- *
- * @return
- * An array of form elements defining settings for the filter. Array keys
- * should match the array keys in $filter->settings and $defaults.
- *
- * @ingroup callbacks
- */
-function callback_filter_settings($form, &$form_state, $filter, $format, $defaults, $filters) {
- $filter->settings += $defaults;
-
- $elements = array();
- $elements['nofollow'] = array(
- '#type' => 'checkbox',
- '#title' => t('Add rel="nofollow" to all links'),
- '#default_value' => $filter->settings['nofollow'],
- );
- return $elements;
-}
-
-/**
- * Provide prepared text with special characters escaped.
- *
- * Callback for hook_filter_info().
- *
- * See hook_filter_info() for a description of the filtering process. Filters
- * should not use the 'prepare callback' step for anything other than escaping,
- * because that would short-circuit the control the user has over the order in
- * which filters are applied.
- *
- * @param $text
- * The text string to be filtered.
- * @param $filter
- * The filter object containing settings for the given format.
- * @param $format
- * The text format object assigned to the text to be filtered.
- * @param $langcode
- * The language code of the text to be filtered.
- * @param $cache
- * A Boolean indicating whether the filtered text is going to be cached in
- * {cache_filter}.
- * @param $cache_id
- * The ID of the filtered text in {cache_filter}, if $cache is TRUE.
- *
- * @return
- * The prepared, escaped text.
- *
- * @ingroup callbacks
- */
-function callback_filter_prepare($text, $filter, $format, $langcode, $cache, $cache_id) {
- // Escape
andtags. - $text = preg_replace('|(.+?)|se', "[codefilter_code]$1[/codefilter_code]", $text); - return $text; -} - -/** - * Provide text filtered to conform to the supplied format. - * - * Callback for hook_filter_info(). - * - * See hook_filter_info() for a description of the filtering process. This step - * is where the filter actually transforms the text. - * - * @param $text - * The text string to be filtered. - * @param $filter - * The filter object containing settings for the given format. - * @param $format - * The text format object assigned to the text to be filtered. - * @param $langcode - * The language code of the text to be filtered. - * @param $cache - * A Boolean indicating whether the filtered text is going to be cached in - * {cache_filter}. - * @param $cache_id - * The ID of the filtered text in {cache_filter}, if $cache is TRUE. - * - * @return - * The filtered text. - * - * @ingroup callbacks - */ -function callback_filter_process($text, $filter, $format, $langcode, $cache, $cache_id) { - $text = preg_replace('|\[codefilter_code\](.+?)\[/codefilter_code\]|se', "$1
", $text); - - return $text; -} - -/** - * Return help text for a filter. - * - * Callback for hook_filter_info(). - * - * A filter's tips should be informative and to the point. Short tips are - * preferably one-liners. - * - * @param $filter - * An object representing the filter. - * @param $format - * An object representing the text format the filter is contained in. - * @param $long - * Whether this callback should return a short tip to display in a form - * (FALSE), or whether a more elaborate filter tips should be returned for - * theme_filter_tips() (TRUE). - * - * @return - * Translated text to display as a tip. - * - * @ingroup callbacks - */ -function callback_filter_tips($filter, $format, $long) { - if ($long) { - return t('Lines and paragraphs are automatically recognized. The <br /> line break, <p> paragraph and </p> close paragraph tags are inserted automatically. If paragraphs are not recognized simply add a couple blank lines.'); - } - else { - return t('Lines and paragraphs break automatically.'); - } -} - -/** - * @addtogroup hooks - * @{ - */ - -/** - * Perform actions when a new text format has been created. - * - * @param $format - * The format object of the format being updated. - * - * @see hook_filter_format_update() - * @see hook_filter_format_disable() - */ -function hook_filter_format_insert($format) { - mymodule_cache_rebuild(); -} - -/** - * Perform actions when a text format has been updated. - * - * This hook allows modules to act when a text format has been updated in any - * way. For example, when filters have been reconfigured, disabled, or - * re-arranged in the text format. - * - * @param $format - * The format object of the format being updated. - * - * @see hook_filter_format_insert() - * @see hook_filter_format_disable() - */ -function hook_filter_format_update($format) { - mymodule_cache_rebuild(); -} - -/** - * Perform actions when a text format has been disabled. - * - * @param $format - * The format object of the format being disabled. - * - * @see hook_filter_format_insert() - * @see hook_filter_format_update() - */ -function hook_filter_format_disable($format) { - mymodule_cache_rebuild(); -} - -/** - * @} End of "addtogroup hooks". - */ diff --git a/modules/filter/filter.css b/modules/filter/filter.css deleted file mode 100644 index f731733..0000000 --- a/modules/filter/filter.css +++ /dev/null @@ -1,53 +0,0 @@ - -.text-format-wrapper .form-item { - margin-bottom: 0; -} -.filter-wrapper { - border-top: 0; - margin: 0; - padding: 1.5em 0 1.5em; -} -.filter-wrapper .form-item { - float: left; - padding: 0 0 0.5em 1.5em; -} -.filter-wrapper .form-item label { - display: inline; -} -.filter-help { - float: right; - padding: 0 1.5em 0.5em; -} -.filter-help p { - margin: 0; -} -.filter-help a { - background: transparent url(../../misc/help.png) right center no-repeat; - padding: 0 20px; -} -.filter-guidelines { - clear: left; - padding: 0 1.5em; -} -.text-format-wrapper .description { - margin-top: 0.5em; -} - -#filter-order tr .form-item { - padding: 0.5em 0 0 3em; - white-space: normal; -} -#filter-order tr .form-type-checkbox .description { - padding: 0 0 0 2.5em; -} -input#edit-filters-filter-html-settings-allowed-html { - width: 100%; -} - -.tips { - margin-top: 0; - margin-bottom: 0; - padding-top: 0; - padding-bottom: 0; - font-size: 0.9em; -} diff --git a/modules/filter/filter.info b/modules/filter/filter.info deleted file mode 100644 index 0aebbf8..0000000 --- a/modules/filter/filter.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Filter -description = Filters content in preparation for display. -package = Core -version = VERSION -core = 7.x -files[] = filter.test -required = TRUE -configure = admin/config/content/formats diff --git a/modules/filter/filter.install b/modules/filter/filter.install deleted file mode 100644 index 71ba97b..0000000 --- a/modules/filter/filter.install +++ /dev/null @@ -1,494 +0,0 @@ - 'Table that maps filters (HTML corrector) to text formats (Filtered HTML).', - 'fields' => array( - 'format' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'description' => 'Foreign key: The {filter_format}.format to which this filter is assigned.', - ), - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The origin module of the filter.', - ), - 'name' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Name of the filter being referenced.', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Weight of filter within format.', - ), - 'status' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Filter enabled status. (1 = enabled, 0 = disabled)', - ), - 'settings' => array( - 'type' => 'blob', - 'not null' => FALSE, - 'size' => 'big', - 'serialize' => TRUE, - 'description' => 'A serialized array of name value pairs that store the filter settings for the specific format.', - ), - ), - 'primary key' => array('format', 'name'), - 'indexes' => array( - 'list' => array('weight', 'module', 'name'), - ), - ); - $schema['filter_format'] = array( - 'description' => 'Stores text formats: custom groupings of filters, such as Filtered HTML.', - 'fields' => array( - 'format' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'description' => 'Primary Key: Unique machine name of the format.', - ), - 'name' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Name of the text format (Filtered HTML).', - 'translatable' => TRUE, - ), - 'cache' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Flag to indicate whether format is cacheable. (1 = cacheable, 0 = not cacheable)', - ), - 'status' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 1, - 'size' => 'tiny', - 'description' => 'The status of the text format. (1 = enabled, 0 = disabled)', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Weight of text format to use when listing.', - ), - ), - 'primary key' => array('format'), - 'unique keys' => array( - 'name' => array('name'), - ), - 'indexes' => array( - 'status_weight' => array('status', 'weight'), - ), - ); - - $schema['cache_filter'] = drupal_get_schema_unprocessed('system', 'cache'); - $schema['cache_filter']['description'] = 'Cache table for the Filter module to store already filtered pieces of text, identified by text format and hash of the text.'; - - return $schema; -} - -/** - * Implements hook_install(). - */ -function filter_install() { - // All sites require at least one text format (the fallback format) that all - // users have access to, so add it here. We initialize it as a simple, safe - // plain text format with very basic formatting, but it can be modified by - // installation profiles to have other properties. - $plain_text_format = array( - 'format' => 'plain_text', - 'name' => 'Plain text', - 'weight' => 10, - 'filters' => array( - // Escape all HTML. - 'filter_html_escape' => array( - 'weight' => 0, - 'status' => 1, - ), - // URL filter. - 'filter_url' => array( - 'weight' => 1, - 'status' => 1, - ), - // Line break filter. - 'filter_autop' => array( - 'weight' => 2, - 'status' => 1, - ), - ), - ); - $plain_text_format = (object) $plain_text_format; - filter_format_save($plain_text_format); - - // Set the fallback format to plain text. - variable_set('filter_fallback_format', $plain_text_format->format); -} - -/** - * Implements hook_update_dependencies(). - */ -function filter_update_dependencies() { - // filter_update_7005() migrates role permissions and therefore must run - // after the {role} and {role_permission} tables are properly set up, which - // happens in user_update_7007(). - $dependencies['filter'][7005] = array( - 'user' => 7007, - ); - - return $dependencies; -} -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Upgrade the {filter_formats} table and rename it to {filter_format}. - */ -function filter_update_7000() { - db_rename_table('filter_formats', 'filter_format'); - - // Add the new {filter_format}.status and {filter_format}.weight column. - db_add_field('filter_format', 'status', array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 1, - 'size' => 'tiny', - 'description' => 'The status of the text format. (1 = enabled, 0 = disabled)', - )); - db_add_field('filter_format', 'weight', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Weight of text format to use when listing.', - ), array( - 'indexes' => array( - 'status_weight' => array('status', 'weight'), - ), - )); -} - -/** - * Break out "escape HTML filter" option to its own filter. - */ -function filter_update_7001() { - $result = db_query("SELECT format FROM {filter_format}")->fetchCol(); - $insert = db_insert('filters')->fields(array('format', 'module', 'delta', 'weight')); - - foreach ($result as $format_id) { - // Deprecated constants FILTER_HTML_STRIP = 1 and FILTER_HTML_ESCAPE = 2. - if (variable_get('filter_html_' . $format_id, 1) == 2) { - $insert->values(array( - 'format' => $format_id, - 'module' => 'filter', - 'delta' => 4, - 'weight' => 0, - )); - } - variable_del('filter_html_' . $format_id); - } - - $insert->execute(); -} - -/** - * Upgrade the {filter} table for core filters. - */ -function filter_update_7003() { - // Duplicates the {filters} table since core cannot take care of the potential - // contributed module filters. - db_rename_table('filters', 'd6_upgrade_filter'); - // Creates the Drupal 7 filter table. - $filter_table = array( - 'description' => 'Table that maps filters (HTML corrector) to text formats (Filtered HTML).', - 'fields' => array( - 'format' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Foreign key: The {filter_format}.format to which this filter is assigned.', - ), - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The origin module of the filter.', - ), - 'name' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Name of the filter being referenced.', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Weight of filter within format.', - ), - 'status' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Filter enabled status. (1 = enabled, 0 = disabled)', - ), - 'settings' => array( - 'type' => 'blob', - 'not null' => FALSE, - 'size' => 'big', - 'serialize' => TRUE, - 'description' => 'A serialized array of name value pairs that store the filter settings for the specific format.', - ), - ), - 'primary key' => array('format', 'name'), - 'indexes' => array( - 'list' => array('weight', 'module', 'name'), - ), - ); - db_create_table('filter', $filter_table); - - // Get an array of the renamed filter deltas, organized by module. - $renamed_deltas = array( - 'filter' => array( - '0' => 'filter_html', - '1' => 'filter_autop', - '2' => 'filter_url', - '3' => 'filter_htmlcorrector', - '4' => 'filter_html_escape', - ), - 'php' => array( - '0' => 'php_code', - ), - ); - - // Loop through each filter and make changes to the core filter table by - // each record from the old to the new table. - foreach ($renamed_deltas as $module => $deltas) { - foreach ($deltas as $old_delta => $new_name) { - $query = db_select('d6_upgrade_filter') - ->fields('d6_upgrade_filter', array('format', 'weight')) - ->condition('module', $module) - ->condition('delta', $old_delta) - ->distinct(); - - foreach ($query->execute() as $record) { - // Port the filter settings. - $settings = array(); - if ($new_name == 'filter_html') { - if ($setting = variable_get("allowed_html_{$record->format}", NULL)) { - $settings['allowed_html'] = $setting; - variable_del("allowed_html_{$record->format}"); - } - if ($setting = variable_get("filter_html_help_{$record->format}", NULL)) { - $settings['filter_html_help'] = $setting; - variable_del("filter_html_help_{$record->format}"); - } - if ($setting = variable_get("filter_html_nofollow_{$record->format}", NULL)) { - $settings['filter_html_nofollow'] = $setting; - variable_del("filter_html_nofollow_{$record->format}"); - } - } - elseif ($new_name == 'filter_url') { - if ($setting = variable_get("filter_url_length_{$record->format}", NULL)) { - $settings['filter_url_length'] = $setting; - variable_del("filter_url_length_{$record->format}"); - } - } - - db_insert('filter') - ->fields(array( - 'format' => $record->format, - 'module' => $module, - 'name' => $new_name, - 'weight' => $record->weight, - 'settings' => serialize($settings), - 'status' => 1, - )) - ->execute(); - } - db_delete('d6_upgrade_filter') - ->condition('module', $module) - ->condition('delta', $old_delta) - ->execute(); - } - } -} - -/** - * Integrate text formats with the user permissions system. - * - * This function converts text format role assignments to use the new text - * format permissions introduced in Drupal 7, creates a fallback (plain text) - * format that is available to all users, and explicitly sets the text format - * in cases that used to rely on a single site-wide default. - */ -function filter_update_7005() { - // Move role data from the filter system to the user permission system. - $all_roles = array_keys(user_roles()); - $default_format = variable_get('filter_default_format', 1); - $result = db_query("SELECT * FROM {filter_format}"); - foreach ($result as $format) { - // We need to assign the default format to all roles (regardless of what - // was stored in the database) to preserve the behavior of the site at the - // moment of the upgrade. - $format_roles = ($format->format == $default_format ? $all_roles : explode(',', $format->roles)); - foreach ($format_roles as $format_role) { - if (in_array($format_role, $all_roles)) { - _update_7000_user_role_grant_permissions($format_role, array('use text format ' . $format->format), 'filter'); - } - } - } - - // Drop the roles field from the {filter_format} table. - db_drop_field('filter_format', 'roles'); - - // Add a fallback text format which outputs plain text and appears last on - // the list for all users. Generate a unique name for it, starting with - // "Plain text". - $start_name = 'Plain text'; - $format_name = $start_name; - while ($format = db_query('SELECT format FROM {filter_format} WHERE name = :name', array(':name' => $format_name))->fetchField()) { - $id = empty($id) ? 2 : $id + 1; - $format_name = $start_name . ' ' . $id; - } - - // Insert the filter format. - $format_id = db_insert('filter_format') - ->fields(array( - 'name' => $format_name, - 'cache' => 1, - 'weight' => 1, - 'status' => 1, - )) - ->execute(); - - // This format should output plain text, so we escape all HTML and apply the - // line break and URL filters only. - db_insert('filter') - ->fields(array( - 'format', - 'name', - 'weight', - 'status', - 'module', - 'settings', - )) - ->values(array( - 'format' => $format_id, - 'name' => 'filter_html_escape', - 'weight' => 0, - 'status' => 1, - 'module' => 'filter', - 'settings' => serialize(array()), - )) - ->values(array( - 'format' => $format_id, - 'name' => 'filter_url', - 'weight' => 1, - 'status' => 1, - 'module' => 'filter', - 'settings' => serialize(array()), - )) - ->values(array( - 'format' => $format_id, - 'name' => 'filter_autop', - 'weight' => 2, - 'status' => 1, - 'module' => 'filter', - 'settings' => serialize(array()), - )) - ->execute(); - - variable_set('filter_fallback_format', $format_id); - drupal_set_message('A new Plain text format has been created which will be available to all users. You can configure this text format on the text format configuration page.'); - - // Move the former site-wide default text format to the top of the list, so - // that it continues to be the default text format for all users. - db_update('filter_format') - ->fields(array('weight' => -1)) - ->condition('format', $default_format) - ->execute(); - - // We do not delete the 'filter_default_format' variable, since other modules - // need it in their update functions; for an example, see user_update_7010(). - // @todo This variable can be deleted in Drupal 8. -} - -/** - * Grant usage of all text formats to user roles having the 'administer filters' permission. - */ -function filter_update_7008() { - // Build the list of permissions to grant. - $permissions = array(); - foreach (db_query('SELECT format FROM {filter_format}')->fetchCol() as $format_id) { - if ($format_id != variable_get('filter_fallback_format')) { - $permissions[] = 'use text format ' . $format_id; - } - } - // Grant text format permissions to all roles that can 'administer filters'. - // Albeit anonymous users *should not* have the permission, we cannot presume - // that they do not or must not. - if ($roles = user_roles(FALSE, 'administer filters')) { - foreach ($roles as $rid => $name) { - _update_7000_user_role_grant_permissions($rid, $permissions, 'filter'); - } - } -} - -/** - * Converts fields that store serialized variables from text to blob. - */ -function filter_update_7009() { - $schema = system_schema_cache_7054(); - db_drop_table('cache_filter'); - db_create_table('cache_filter', $schema); -} - -/** - * Change {filter_format}.format and {filter}.format into varchar. - */ -function filter_update_7010() { - db_change_field('filter_format', 'format', 'format', array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'description' => 'Primary Key: Unique machine name of the format.', - )); - db_change_field('filter', 'format', 'format', array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'description' => 'Foreign key: The {filter_format}.format to which this filter is assigned.', - )); -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ diff --git a/modules/filter/filter.js b/modules/filter/filter.js deleted file mode 100644 index c286159..0000000 --- a/modules/filter/filter.js +++ /dev/null @@ -1,20 +0,0 @@ -(function ($) { - -/** - * Automatically display the guidelines of the selected text format. - */ -Drupal.behaviors.filterGuidelines = { - attach: function (context) { - $('.filter-guidelines', context).once('filter-guidelines') - .find(':header').hide() - .closest('.filter-wrapper').find('select.filter-list') - .bind('change', function () { - $(this).closest('.filter-wrapper') - .find('.filter-guidelines-item').hide() - .siblings('.filter-guidelines-' + this.value).show(); - }) - .change(); - } -}; - -})(jQuery); diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc deleted file mode 100644 index 50f8117..0000000 --- a/modules/filter/filter.pages.inc +++ /dev/null @@ -1,92 +0,0 @@ - _filter_tips($format_id, TRUE), 'long' => TRUE)); - } - else { - $output = theme('filter_tips', array('tips' => _filter_tips(-1, TRUE), 'long' => TRUE)); - } - return $output; -} - -/** - * Returns HTML for a set of filter tips. - * - * @param $variables - * An associative array containing: - * - tips: An array containing descriptions and a CSS ID in the form of - * 'module-name/filter-id' (only used when $long is TRUE) for each - * filter in one or more text formats. Example: - * @code - * array( - * 'Full HTML' => array( - * 0 => array( - * 'tip' => 'Web page addresses and e-mail addresses turn into links automatically.', - * 'id' => 'filter/2', - * ), - * ), - * ); - * @endcode - * - long: (optional) Whether the passed-in filter tips contain extended - * explanations, i.e. intended to be output on the path 'filter/tips' - * (TRUE), or are in a short format, i.e. suitable to be displayed below a - * form element. Defaults to FALSE. - * - * @see _filter_tips() - * @ingroup themeable - */ -function theme_filter_tips($variables) { - $tips = $variables['tips']; - $long = $variables['long']; - $output = ''; - - $multiple = count($tips) > 1; - if ($multiple) { - $output = '' . t('Text Formats') . '
'; - } - - if (count($tips)) { - if ($multiple) { - $output .= ''; - } - foreach ($tips as $name => $tiplist) { - if ($multiple) { - $output .= ''; - } - } - - return $output; -} diff --git a/modules/filter/filter.test b/modules/filter/filter.test deleted file mode 100644 index cc0295b..0000000 --- a/modules/filter/filter.test +++ /dev/null @@ -1,1972 +0,0 @@ - 'Filter CRUD operations', - 'description' => 'Test creation, loading, updating, deleting of text formats and filters.', - 'group' => 'Filter', - ); - } - - function setUp() { - parent::setUp('filter_test'); - } - - /** - * Tests CRUD operations for text formats and filters. - */ - function testTextFormatCRUD() { - // Add a text format with minimum data only. - $format = new stdClass(); - $format->format = 'empty_format'; - $format->name = 'Empty format'; - filter_format_save($format); - $this->verifyTextFormat($format); - $this->verifyFilters($format); - - // Add another text format specifying all possible properties. - $format = new stdClass(); - $format->format = 'custom_format'; - $format->name = 'Custom format'; - $format->filters = array( - 'filter_url' => array( - 'status' => 1, - 'settings' => array( - 'filter_url_length' => 30, - ), - ), - ); - filter_format_save($format); - $this->verifyTextFormat($format); - $this->verifyFilters($format); - - // Alter some text format properties and save again. - $format->name = 'Altered format'; - $format->filters['filter_url']['status'] = 0; - $format->filters['filter_autop']['status'] = 1; - filter_format_save($format); - $this->verifyTextFormat($format); - $this->verifyFilters($format); - - // Add a uncacheable filter and save again. - $format->filters['filter_test_uncacheable']['status'] = 1; - filter_format_save($format); - $this->verifyTextFormat($format); - $this->verifyFilters($format); - - // Disable the text format. - filter_format_disable($format); - - $db_format = db_query("SELECT * FROM {filter_format} WHERE format = :format", array(':format' => $format->format))->fetchObject(); - $this->assertFalse($db_format->status, 'Database: Disabled text format is marked as disabled.'); - $formats = filter_formats(); - $this->assertTrue(!isset($formats[$format->format]), 'filter_formats: Disabled text format no longer exists.'); - } - - /** - * Verifies that a text format is properly stored. - */ - function verifyTextFormat($format) { - $t_args = array('%format' => $format->name); - // Verify text format database record. - $db_format = db_select('filter_format', 'ff') - ->fields('ff') - ->condition('format', $format->format) - ->execute() - ->fetchObject(); - $this->assertEqual($db_format->format, $format->format, format_string('Database: Proper format id for text format %format.', $t_args)); - $this->assertEqual($db_format->name, $format->name, format_string('Database: Proper title for text format %format.', $t_args)); - $this->assertEqual($db_format->cache, $format->cache, format_string('Database: Proper cache indicator for text format %format.', $t_args)); - $this->assertEqual($db_format->weight, $format->weight, format_string('Database: Proper weight for text format %format.', $t_args)); - - // Verify filter_format_load(). - $filter_format = filter_format_load($format->format); - $this->assertEqual($filter_format->format, $format->format, format_string('filter_format_load: Proper format id for text format %format.', $t_args)); - $this->assertEqual($filter_format->name, $format->name, format_string('filter_format_load: Proper title for text format %format.', $t_args)); - $this->assertEqual($filter_format->cache, $format->cache, format_string('filter_format_load: Proper cache indicator for text format %format.', $t_args)); - $this->assertEqual($filter_format->weight, $format->weight, format_string('filter_format_load: Proper weight for text format %format.', $t_args)); - - // Verify the 'cache' text format property according to enabled filters. - $filter_info = filter_get_filters(); - $filters = filter_list_format($filter_format->format); - $cacheable = TRUE; - foreach ($filters as $name => $filter) { - // If this filter is not cacheable, update $cacheable accordingly, so we - // can verify $format->cache after iterating over all filters. - if ($filter->status && isset($filter_info[$name]['cache']) && !$filter_info[$name]['cache']) { - $cacheable = FALSE; - break; - } - } - $this->assertEqual($filter_format->cache, $cacheable, 'Text format contains proper cache property.'); - } - - /** - * Verifies that filters are properly stored for a text format. - */ - function verifyFilters($format) { - // Verify filter database records. - $filters = db_query("SELECT * FROM {filter} WHERE format = :format", array(':format' => $format->format))->fetchAllAssoc('name'); - $format_filters = $format->filters; - foreach ($filters as $name => $filter) { - $t_args = array('%format' => $format->name, '%filter' => $name); - - // Verify that filter status is properly stored. - $this->assertEqual($filter->status, $format_filters[$name]['status'], format_string('Database: Proper status for %filter in text format %format.', $t_args)); - - // Verify that filter settings were properly stored. - $this->assertEqual(unserialize($filter->settings), isset($format_filters[$name]['settings']) ? $format_filters[$name]['settings'] : array(), format_string('Database: Proper filter settings for %filter in text format %format.', $t_args)); - - // Verify that each filter has a module name assigned. - $this->assertTrue(!empty($filter->module), format_string('Database: Proper module name for %filter in text format %format.', $t_args)); - - // Remove the filter from the copy of saved $format to check whether all - // filters have been processed later. - unset($format_filters[$name]); - } - // Verify that all filters have been processed. - $this->assertTrue(empty($format_filters), 'Database contains values for all filters in the saved format.'); - - // Verify filter_list_format(). - $filters = filter_list_format($format->format); - $format_filters = $format->filters; - foreach ($filters as $name => $filter) { - $t_args = array('%format' => $format->name, '%filter' => $name); - - // Verify that filter status is properly stored. - $this->assertEqual($filter->status, $format_filters[$name]['status'], format_string('filter_list_format: Proper status for %filter in text format %format.', $t_args)); - - // Verify that filter settings were properly stored. - $this->assertEqual($filter->settings, isset($format_filters[$name]['settings']) ? $format_filters[$name]['settings'] : array(), format_string('filter_list_format: Proper filter settings for %filter in text format %format.', $t_args)); - - // Verify that each filter has a module name assigned. - $this->assertTrue(!empty($filter->module), format_string('filter_list_format: Proper module name for %filter in text format %format.', $t_args)); - - // Remove the filter from the copy of saved $format to check whether all - // filters have been processed later. - unset($format_filters[$name]); - } - // Verify that all filters have been processed. - $this->assertTrue(empty($format_filters), 'filter_list_format: Loaded filters contain values for all filters in the saved format.'); - } -} - -/** - * Tests the administrative functionality of the Filter module. - */ -class FilterAdminTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Filter administration functionality', - 'description' => 'Thoroughly test the administrative interface of the filter module.', - 'group' => 'Filter', - ); - } - - function setUp() { - parent::setUp(); - - // Create users. - $filtered_html_format = filter_format_load('filtered_html'); - $full_html_format = filter_format_load('full_html'); - $this->admin_user = $this->drupalCreateUser(array( - 'administer filters', - filter_permission_name($filtered_html_format), - filter_permission_name($full_html_format), - )); - - $this->web_user = $this->drupalCreateUser(array('create page content', 'edit own page content')); - $this->drupalLogin($this->admin_user); - } - - /** - * Tests the format administration functionality. - */ - function testFormatAdmin() { - // Add text format. - $this->drupalGet('admin/config/content/formats'); - $this->clickLink('Add text format'); - $format_id = drupal_strtolower($this->randomName()); - $name = $this->randomName(); - $edit = array( - 'format' => $format_id, - 'name' => $name, - ); - $this->drupalPost(NULL, $edit, t('Save configuration')); - - // Verify default weight of the text format. - $this->drupalGet('admin/config/content/formats'); - $this->assertFieldByName("formats[$format_id][weight]", 0, 'Text format weight was saved.'); - - // Change the weight of the text format. - $edit = array( - "formats[$format_id][weight]" => 5, - ); - $this->drupalPost('admin/config/content/formats', $edit, t('Save changes')); - $this->assertFieldByName("formats[$format_id][weight]", 5, 'Text format weight was saved.'); - - // Edit text format. - $this->drupalGet('admin/config/content/formats'); - $this->assertLinkByHref('admin/config/content/formats/' . $format_id); - $this->drupalGet('admin/config/content/formats/' . $format_id); - $this->drupalPost(NULL, array(), t('Save configuration')); - - // Verify that the custom weight of the text format has been retained. - $this->drupalGet('admin/config/content/formats'); - $this->assertFieldByName("formats[$format_id][weight]", 5, 'Text format weight was retained.'); - - // Disable text format. - $this->assertLinkByHref('admin/config/content/formats/' . $format_id . '/disable'); - $this->drupalGet('admin/config/content/formats/' . $format_id . '/disable'); - $this->drupalPost(NULL, array(), t('Disable')); - - // Verify that disabled text format no longer exists. - $this->drupalGet('admin/config/content/formats/' . $format_id); - $this->assertResponse(404, 'Disabled text format no longer exists.'); - - // Attempt to create a format of the same machine name as the disabled - // format but with a different human readable name. - $edit = array( - 'format' => $format_id, - 'name' => 'New format', - ); - $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration')); - $this->assertText('The machine-readable name is already in use. It must be unique.'); - - // Attempt to create a format of the same human readable name as the - // disabled format but with a different machine name. - $edit = array( - 'format' => 'new_format', - 'name' => $name, - ); - $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration')); - $this->assertRaw(t('Text format names must be unique. A format named %name already exists.', array( - '%name' => $name, - ))); - } - - /** - * Tests filter administration functionality. - */ - function testFilterAdmin() { - // URL filter. - $first_filter = 'filter_url'; - // Line filter. - $second_filter = 'filter_autop'; - - $filtered = 'filtered_html'; - $full = 'full_html'; - $plain = 'plain_text'; - - // Check that the fallback format exists and cannot be disabled. - $this->assertTrue($plain == filter_fallback_format(), 'The fallback format is set to plain text.'); - $this->drupalGet('admin/config/content/formats'); - $this->assertNoRaw('admin/config/content/formats/' . $plain . '/disable', 'Disable link for the fallback format not found.'); - $this->drupalGet('admin/config/content/formats/' . $plain . '/disable'); - $this->assertResponse(403, 'The fallback format cannot be disabled.'); - - // Verify access permissions to Full HTML format. - $this->assertTrue(filter_access(filter_format_load($full), $this->admin_user), 'Admin user may use Full HTML.'); - $this->assertFalse(filter_access(filter_format_load($full), $this->web_user), 'Web user may not use Full HTML.'); - - // Add an additional tag. - $edit = array(); - $edit['filters[filter_html][settings][allowed_html]'] = ''; - $output .= ''; - } - } - if ($multiple) { - $output .= '' . $name . '
'; - } - - if (count($tiplist) > 0) { - $output .= '- ';
- foreach ($tiplist as $tip) {
- $output .= '
-
-
'; - $this->drupalPost('admin/config/content/formats/' . $filtered, $edit, t('Save configuration')); - $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Allowed HTML tag added.'); - - $result = db_query('SELECT * FROM {cache_filter}')->fetchObject(); - $this->assertFalse($result, 'Cache cleared.'); - - $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array( - ':first' => 'filters[' . $first_filter . '][weight]', - ':second' => 'filters[' . $second_filter . '][weight]', - )); - $this->assertTrue(!empty($elements), 'Order confirmed in admin interface.'); - - // Reorder filters. - $edit = array(); - $edit['filters[' . $second_filter . '][weight]'] = 1; - $edit['filters[' . $first_filter . '][weight]'] = 2; - $this->drupalPost(NULL, $edit, t('Save configuration')); - $this->assertFieldByName('filters[' . $second_filter . '][weight]', 1, 'Order saved successfully.'); - $this->assertFieldByName('filters[' . $first_filter . '][weight]', 2, 'Order saved successfully.'); - - $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array( - ':first' => 'filters[' . $second_filter . '][weight]', - ':second' => 'filters[' . $first_filter . '][weight]', - )); - $this->assertTrue(!empty($elements), 'Reorder confirmed in admin interface.'); - - $result = db_query('SELECT * FROM {filter} WHERE format = :format ORDER BY weight ASC', array(':format' => $filtered)); - $filters = array(); - foreach ($result as $filter) { - if ($filter->name == $second_filter || $filter->name == $first_filter) { - $filters[] = $filter; - } - } - $this->assertTrue(($filters[0]->name == $second_filter && $filters[1]->name == $first_filter), 'Order confirmed in database.'); - - // Add format. - $edit = array(); - $edit['format'] = drupal_strtolower($this->randomName()); - $edit['name'] = $this->randomName(); - $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1; - $edit['filters[' . $second_filter . '][status]'] = TRUE; - $edit['filters[' . $first_filter . '][status]'] = TRUE; - $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration')); - $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.'); - - drupal_static_reset('filter_formats'); - $format = filter_format_load($edit['format']); - $this->assertNotNull($format, 'Format found in database.'); - - $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', '', 'Role found.'); - $this->assertFieldByName('filters[' . $second_filter . '][status]', '', 'Line break filter found.'); - $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'Url filter found.'); - - // Disable new filter. - $this->drupalPost('admin/config/content/formats/' . $format->format . '/disable', array(), t('Disable')); - $this->assertRaw(t('Disabled text format %format.', array('%format' => $edit['name'])), 'Format successfully disabled.'); - - // Allow authenticated users on full HTML. - $format = filter_format_load($full); - $edit = array(); - $edit['roles[' . DRUPAL_ANONYMOUS_RID . ']'] = 0; - $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1; - $this->drupalPost('admin/config/content/formats/' . $full, $edit, t('Save configuration')); - $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), 'Full HTML format successfully updated.'); - - // Switch user. - $this->drupalLogout(); - $this->drupalLogin($this->web_user); - - $this->drupalGet('node/add/page'); - $this->assertRaw('', 'Full HTML filter accessible.'); - - // Use filtered HTML and see if it removes tags that are not allowed. - $body = '' . $this->randomName() . ''; - $extra_text = 'text'; - $text = $body . '
' . $extra_text . ' '; - - $edit = array(); - $langcode = LANGUAGE_NONE; - $edit["title"] = $this->randomName(); - $edit["body[$langcode][0][value]"] = $text; - $edit["body[$langcode][0][format]"] = $filtered; - $this->drupalPost('node/add/page', $edit, t('Save')); - $this->assertRaw(t('Basic page %title has been created.', array('%title' => $edit["title"])), 'Filtered node created.'); - - $node = $this->drupalGetNodeByTitle($edit["title"]); - $this->assertTrue($node, 'Node found in database.'); - - $this->drupalGet('node/' . $node->nid); - $this->assertRaw($body . $extra_text, 'Filter removed invalid tag.'); - - // Use plain text and see if it escapes all tags, whether allowed or not. - $edit = array(); - $edit["body[$langcode][0][format]"] = $plain; - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $this->drupalGet('node/' . $node->nid); - $this->assertText(check_plain($text), 'The "Plain text" text format escapes all HTML tags.'); - - // Switch user. - $this->drupalLogout(); - $this->drupalLogin($this->admin_user); - - // Clean up. - // Allowed tags. - $edit = array(); - $edit['filters[filter_html][settings][allowed_html]'] = '-
- ';
- $this->drupalPost('admin/config/content/formats/' . $filtered, $edit, t('Save configuration'));
- $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Changes reverted.');
-
- // Full HTML.
- $edit = array();
- $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = FALSE;
- $this->drupalPost('admin/config/content/formats/' . $full, $edit, t('Save configuration'));
- $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), 'Full HTML format successfully reverted.');
- $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'], 'Changes reverted.');
-
- // Filter order.
- $edit = array();
- $edit['filters[' . $second_filter . '][weight]'] = 2;
- $edit['filters[' . $first_filter . '][weight]'] = 1;
- $this->drupalPost('admin/config/content/formats/' . $filtered, $edit, t('Save configuration'));
- $this->assertFieldByName('filters[' . $second_filter . '][weight]', $edit['filters[' . $second_filter . '][weight]'], 'Changes reverted.');
- $this->assertFieldByName('filters[' . $first_filter . '][weight]', $edit['filters[' . $first_filter . '][weight]'], 'Changes reverted.');
- }
-
- /**
- * Tests the URL filter settings form is properly validated.
- */
- function testUrlFilterAdmin() {
- // The form does not save with an invalid filter URL length.
- $edit = array(
- 'filters[filter_url][settings][filter_url_length]' => $this->randomName(4),
- );
- $this->drupalPost('admin/config/content/formats/filtered_html', $edit, t('Save configuration'));
- $this->assertNoRaw(t('The text format %format has been updated.', array('%format' => 'Filtered HTML')));
- }
-}
-
-/**
- * Tests the filter format access functionality in the Filter module.
- */
-class FilterFormatAccessTestCase extends DrupalWebTestCase {
- /**
- * A user with administrative permissions.
- *
- * @var object
- */
- protected $admin_user;
-
- /**
- * A user with 'administer filters' permission.
- *
- * @var object
- */
- protected $filter_admin_user;
-
- /**
- * A user with permission to create and edit own content.
- *
- * @var object
- */
- protected $web_user;
-
- /**
- * An object representing an allowed text format.
- *
- * @var object
- */
- protected $allowed_format;
-
- /**
- * An object representing a disallowed text format.
- *
- * @var object
- */
- protected $disallowed_format;
-
- public static function getInfo() {
- return array(
- 'name' => 'Filter format access',
- 'description' => 'Tests access to text formats.',
- 'group' => 'Filter',
- );
- }
-
- function setUp() {
- parent::setUp();
-
- // Create a user who can administer text formats, but does not have
- // specific permission to use any of them.
- $this->filter_admin_user = $this->drupalCreateUser(array(
- 'administer filters',
- 'create page content',
- 'edit any page content',
- ));
-
- // Create two text formats.
- $this->drupalLogin($this->filter_admin_user);
- $formats = array();
- for ($i = 0; $i < 2; $i++) {
- $edit = array(
- 'format' => drupal_strtolower($this->randomName()),
- 'name' => $this->randomName(),
- );
- $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->resetFilterCaches();
- $formats[] = filter_format_load($edit['format']);
- }
- list($this->allowed_format, $this->disallowed_format) = $formats;
- $this->drupalLogout();
-
- // Create a regular user with access to one of the formats.
- $this->web_user = $this->drupalCreateUser(array(
- 'create page content',
- 'edit any page content',
- filter_permission_name($this->allowed_format),
- ));
-
- // Create an administrative user who has access to use both formats.
- $this->admin_user = $this->drupalCreateUser(array(
- 'administer filters',
- 'create page content',
- 'edit any page content',
- filter_permission_name($this->allowed_format),
- filter_permission_name($this->disallowed_format),
- ));
- }
-
- /**
- * Tests the Filter format access permissions functionality.
- */
- function testFormatPermissions() {
- // Make sure that a regular user only has access to the text format they
- // were granted access to, as well to the fallback format.
- $this->assertTrue(filter_access($this->allowed_format, $this->web_user), 'A regular user has access to a text format they were granted access to.');
- $this->assertFalse(filter_access($this->disallowed_format, $this->web_user), 'A regular user does not have access to a text format they were not granted access to.');
- $this->assertTrue(filter_access(filter_format_load(filter_fallback_format()), $this->web_user), 'A regular user has access to the fallback format.');
-
- // Perform similar checks as above, but now against the entire list of
- // available formats for this user.
- $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_formats($this->web_user))), 'The allowed format appears in the list of available formats for a regular user.');
- $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_formats($this->web_user))), 'The disallowed format does not appear in the list of available formats for a regular user.');
- $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_formats($this->web_user))), 'The fallback format appears in the list of available formats for a regular user.');
-
- // Make sure that a regular user only has permission to use the format
- // they were granted access to.
- $this->assertTrue(user_access(filter_permission_name($this->allowed_format), $this->web_user), 'A regular user has permission to use the allowed text format.');
- $this->assertFalse(user_access(filter_permission_name($this->disallowed_format), $this->web_user), 'A regular user does not have permission to use the disallowed text format.');
-
- // Make sure that the allowed format appears on the node form and that
- // the disallowed format does not.
- $this->drupalLogin($this->web_user);
- $this->drupalGet('node/add/page');
- $langcode = LANGUAGE_NONE;
- $elements = $this->xpath('//select[@name=:name]/option', array(
- ':name' => "body[$langcode][0][format]",
- ':option' => $this->allowed_format->format,
- ));
- $options = array();
- foreach ($elements as $element) {
- $options[(string) $element['value']] = $element;
- }
- $this->assertTrue(isset($options[$this->allowed_format->format]), 'The allowed text format appears as an option when adding a new node.');
- $this->assertFalse(isset($options[$this->disallowed_format->format]), 'The disallowed text format does not appear as an option when adding a new node.');
- $this->assertTrue(isset($options[filter_fallback_format()]), 'The fallback format appears as an option when adding a new node.');
- }
-
- /**
- * Tests if text format is available to a role.
- */
- function testFormatRoles() {
- // Get the role ID assigned to the regular user; it must be the maximum.
- $rid = max(array_keys($this->web_user->roles));
-
- // Check that this role appears in the list of roles that have access to an
- // allowed text format, but does not appear in the list of roles that have
- // access to a disallowed text format.
- $this->assertTrue(in_array($rid, array_keys(filter_get_roles_by_format($this->allowed_format))), 'A role which has access to a text format appears in the list of roles that have access to that format.');
- $this->assertFalse(in_array($rid, array_keys(filter_get_roles_by_format($this->disallowed_format))), 'A role which does not have access to a text format does not appear in the list of roles that have access to that format.');
-
- // Check that the correct text format appears in the list of formats
- // available to that role.
- $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_get_formats_by_role($rid))), 'A text format which a role has access to appears in the list of formats available to that role.');
- $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_get_formats_by_role($rid))), 'A text format which a role does not have access to does not appear in the list of formats available to that role.');
-
- // Check that the fallback format is always allowed.
- $this->assertEqual(filter_get_roles_by_format(filter_format_load(filter_fallback_format())), user_roles(), 'All roles have access to the fallback format.');
- $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_get_formats_by_role($rid))), 'The fallback format appears in the list of allowed formats for any role.');
- }
-
- /**
- * Tests editing a page using a disallowed text format.
- *
- * Verifies that regular users and administrators are able to edit a page, but
- * not allowed to change the fields which use an inaccessible text format.
- * Also verifies that fields which use a text format that does not exist can
- * be edited by administrators only, but that the administrator is forced to
- * choose a new format before saving the page.
- */
- function testFormatWidgetPermissions() {
- $langcode = LANGUAGE_NONE;
- $title_key = "title";
- $body_value_key = "body[$langcode][0][value]";
- $body_format_key = "body[$langcode][0][format]";
-
- // Create node to edit.
- $this->drupalLogin($this->admin_user);
- $edit = array();
- $edit['title'] = $this->randomName(8);
- $edit[$body_value_key] = $this->randomName(16);
- $edit[$body_format_key] = $this->disallowed_format->format;
- $this->drupalPost('node/add/page', $edit, t('Save'));
- $node = $this->drupalGetNodeByTitle($edit['title']);
-
- // Try to edit with a less privileged user.
- $this->drupalLogin($this->web_user);
- $this->drupalGet('node/' . $node->nid);
- $this->clickLink(t('Edit'));
-
- // Verify that body field is read-only and contains replacement value.
- $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
-
- // Verify that title can be changed, but preview displays original body.
- $new_edit = array();
- $new_edit['title'] = $this->randomName(8);
- $this->drupalPost(NULL, $new_edit, t('Preview'));
- $this->assertText($edit[$body_value_key], 'Old body found in preview.');
-
- // Save and verify that only the title was changed.
- $this->drupalPost(NULL, $new_edit, t('Save'));
- $this->assertNoText($edit['title'], 'Old title not found.');
- $this->assertText($new_edit['title'], 'New title found.');
- $this->assertText($edit[$body_value_key], 'Old body found.');
-
- // Check that even an administrator with "administer filters" permission
- // cannot edit the body field if they do not have specific permission to
- // use its stored format. (This must be disallowed so that the
- // administrator is never forced to switch the text format to something
- // else.)
- $this->drupalLogin($this->filter_admin_user);
- $this->drupalGet('node/' . $node->nid . '/edit');
- $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
-
- // Disable the text format used above.
- filter_format_disable($this->disallowed_format);
- $this->resetFilterCaches();
-
- // Log back in as the less privileged user and verify that the body field
- // is still disabled, since the less privileged user should not be able to
- // edit content that does not have an assigned format.
- $this->drupalLogin($this->web_user);
- $this->drupalGet('node/' . $node->nid . '/edit');
- $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
-
- // Log back in as the filter administrator and verify that the body field
- // can be edited.
- $this->drupalLogin($this->filter_admin_user);
- $this->drupalGet('node/' . $node->nid . '/edit');
- $this->assertNoFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", NULL, 'Text format access denied message not found.');
- $this->assertFieldByXPath("//select[@name='$body_format_key']", NULL, 'Text format selector found.');
-
- // Verify that trying to save the node without selecting a new text format
- // produces an error message, and does not result in the node being saved.
- $old_title = $new_edit['title'];
- $new_title = $this->randomName(8);
- $edit = array('title' => $new_title);
- $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), 'Error message is displayed.');
- $this->drupalGet('node/' . $node->nid);
- $this->assertText($old_title, 'Old title found.');
- $this->assertNoText($new_title, 'New title not found.');
-
- // Now select a new text format and make sure the node can be saved.
- $edit[$body_format_key] = filter_fallback_format();
- $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertUrl('node/' . $node->nid);
- $this->assertText($new_title, 'New title found.');
- $this->assertNoText($old_title, 'Old title not found.');
-
- // Switch the text format to a new one, then disable that format and all
- // other formats on the site (leaving only the fallback format).
- $this->drupalLogin($this->admin_user);
- $edit = array($body_format_key => $this->allowed_format->format);
- $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertUrl('node/' . $node->nid);
- foreach (filter_formats() as $format) {
- if ($format->format != filter_fallback_format()) {
- filter_format_disable($format);
- }
- }
-
- // Since there is now only one available text format, the widget for
- // selecting a text format would normally not display when the content is
- // edited. However, we need to verify that the filter administrator still
- // is forced to make a conscious choice to reassign the text to a different
- // format.
- $this->drupalLogin($this->filter_admin_user);
- $old_title = $new_title;
- $new_title = $this->randomName(8);
- $edit = array('title' => $new_title);
- $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), 'Error message is displayed.');
- $this->drupalGet('node/' . $node->nid);
- $this->assertText($old_title, 'Old title found.');
- $this->assertNoText($new_title, 'New title not found.');
- $edit[$body_format_key] = filter_fallback_format();
- $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertUrl('node/' . $node->nid);
- $this->assertText($new_title, 'New title found.');
- $this->assertNoText($old_title, 'Old title not found.');
- }
-
- /**
- * Rebuilds text format and permission caches in the thread running the tests.
- */
- protected function resetFilterCaches() {
- filter_formats_reset();
- $this->checkPermissions(array(), TRUE);
- }
-}
-
-/**
- * Tests the default filter functionality in the Filter module.
- */
-class FilterDefaultFormatTestCase extends DrupalWebTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Default text format functionality',
- 'description' => 'Test the default text formats for different users.',
- 'group' => 'Filter',
- );
- }
-
- /**
- * Tests if the default text format is accessible to users.
- */
- function testDefaultTextFormats() {
- // Create two text formats, and two users. The first user has access to
- // both formats, but the second user only has access to the second one.
- $admin_user = $this->drupalCreateUser(array('administer filters'));
- $this->drupalLogin($admin_user);
- $formats = array();
- for ($i = 0; $i < 2; $i++) {
- $edit = array(
- 'format' => drupal_strtolower($this->randomName()),
- 'name' => $this->randomName(),
- );
- $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->resetFilterCaches();
- $formats[] = filter_format_load($edit['format']);
- }
- list($first_format, $second_format) = $formats;
- $first_user = $this->drupalCreateUser(array(filter_permission_name($first_format), filter_permission_name($second_format)));
- $second_user = $this->drupalCreateUser(array(filter_permission_name($second_format)));
-
- // Adjust the weights so that the first and second formats (in that order)
- // are the two lowest weighted formats available to any user.
- $minimum_weight = db_query("SELECT MIN(weight) FROM {filter_format}")->fetchField();
- $edit = array();
- $edit['formats[' . $first_format->format . '][weight]'] = $minimum_weight - 2;
- $edit['formats[' . $second_format->format . '][weight]'] = $minimum_weight - 1;
- $this->drupalPost('admin/config/content/formats', $edit, t('Save changes'));
- $this->resetFilterCaches();
-
- // Check that each user's default format is the lowest weighted format that
- // the user has access to.
- $this->assertEqual(filter_default_format($first_user), $first_format->format, "The first user's default format is the lowest weighted format that the user has access to.");
- $this->assertEqual(filter_default_format($second_user), $second_format->format, "The second user's default format is the lowest weighted format that the user has access to, and is different than the first user's.");
-
- // Reorder the two formats, and check that both users now have the same
- // default.
- $edit = array();
- $edit['formats[' . $second_format->format . '][weight]'] = $minimum_weight - 3;
- $this->drupalPost('admin/config/content/formats', $edit, t('Save changes'));
- $this->resetFilterCaches();
- $this->assertEqual(filter_default_format($first_user), filter_default_format($second_user), 'After the formats are reordered, both users have the same default format.');
- }
-
- /**
- * Rebuilds text format and permission caches in the thread running the tests.
- */
- protected function resetFilterCaches() {
- filter_formats_reset();
- $this->checkPermissions(array(), TRUE);
- }
-}
-
-/**
- * Tests the behavior of check_markup() when it is called without text format.
- */
-class FilterNoFormatTestCase extends DrupalWebTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Unassigned text format functionality',
- 'description' => 'Test the behavior of check_markup() when it is called without a text format.',
- 'group' => 'Filter',
- );
- }
-
- /**
- * Tests text without format.
- *
- * Tests if text with no format is filtered the same way as text in the
- * fallback format.
- */
- function testCheckMarkupNoFormat() {
- // Create some text. Include some HTML and line breaks, so we get a good
- // test of the filtering that is applied to it.
- $text = "" . $this->randomName(32) . "\n\n" . $this->randomName(32) . ""; - - // Make sure that when this text is run through check_markup() with no text - // format, it is filtered as though it is in the fallback format. - $this->assertEqual(check_markup($text), check_markup($text, filter_fallback_format()), 'Text with no format is filtered the same as text in the fallback format.'); - } -} - -/** - * Security tests for missing/vanished text formats or filters. - */ -class FilterSecurityTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Security', - 'description' => 'Test the behavior of check_markup() when a filter or text format vanishes.', - 'group' => 'Filter', - ); - } - - function setUp() { - parent::setUp('php', 'filter_test'); - $this->admin_user = $this->drupalCreateUser(array('administer modules', 'administer filters', 'administer site configuration')); - $this->drupalLogin($this->admin_user); - } - - /** - * Tests removal of filtered content when an active filter is disabled. - * - * Tests that filtered content is emptied when an actively used filter module - * is disabled. - */ - function testDisableFilterModule() { - // Create a new node. - $node = $this->drupalCreateNode(array('promote' => 1)); - $body_raw = $node->body[LANGUAGE_NONE][0]['value']; - $format_id = $node->body[LANGUAGE_NONE][0]['format']; - $this->drupalGet('node/' . $node->nid); - $this->assertText($body_raw, 'Node body found.'); - - // Enable the filter_test_replace filter. - $edit = array( - 'filters[filter_test_replace][status]' => 1, - ); - $this->drupalPost('admin/config/content/formats/' . $format_id, $edit, t('Save configuration')); - - // Verify that filter_test_replace filter replaced the content. - $this->drupalGet('node/' . $node->nid); - $this->assertNoText($body_raw, 'Node body not found.'); - $this->assertText('Filter: Testing filter', 'Testing filter output found.'); - - // Disable the text format entirely. - $this->drupalPost('admin/config/content/formats/' . $format_id . '/disable', array(), t('Disable')); - - // Verify that the content is empty, because the text format does not exist. - $this->drupalGet('node/' . $node->nid); - $this->assertNoText($body_raw, 'Node body not found.'); - } -} - -/** - * Unit tests for core filters. - */ -class FilterUnitTestCase extends DrupalUnitTestCase { - public static function getInfo() { - return array( - 'name' => 'Filter module filters', - 'description' => 'Tests Filter module filters individually.', - 'group' => 'Filter', - ); - } - - /** - * Tests the line break filter. - */ - function testLineBreakFilter() { - // Setup dummy filter object. - $filter = new stdClass(); - $filter->callback = '_filter_autop'; - - // Since the line break filter naturally needs plenty of newlines in test - // strings and expectations, we're using "\n" instead of regular newlines - // here. - $tests = array( - // Single line breaks should be changed to
tags, while paragraphs - // separated with double line breaks should be enclosed with tags. - "aaa\nbbb\n\nccc" => array( - "aaa
\n
\nbbbccc
" => TRUE, - ), - // Skip contents of certain block tags entirely. - " - -aaa\nbbb\n\nccc
- - -" => array( - "" => TRUE, - "" => TRUE, - "aaa\nbbb\n\nccc
" => TRUE, - "" => TRUE, - "" => TRUE, - ), - // Skip comments entirely. - "One. Two.\n\n" => array( - '' => TRUE, - "" => TRUE, - ), - // Resulting HTML should produce matching paragraph tags. - '' => array( - "\n
\n" => TRUE, - ), - '' => array( - "\n" => TRUE, - ), - '
' => array( - "aaa
" => TRUE, - ), - "aaa
aaa\nbbb\nccc
\nddd\neee" => array( - "aaa\nbbb\nccc
" => TRUE, - "ddd
" => TRUE, - ), - // Comments remain unchanged and subsequent lines/paragraphs are - // transformed normally. - "aaa\n\nbbb\n\nccc\n\nddd\n\neee\n\nfff" => array( - "
\neeeaaa
\n\nbbb
\nccc
\nddd
" => TRUE, - "\neee
\nfff
" => TRUE, - ), - // Check that a comment in a PRE will result that the text after - // the comment, but still in PRE, is not transformed. - "aaa\nbbb\n\nccc
\nddd" => array( - "aaa\nbbb\n\nccc
" => TRUE, - ), - // Bug 810824, paragraphs were appearing around iframe tags. - "\n\n" => array( - "" => FALSE, - ), - ); - $this->assertFilteredString($filter, $tests); - - // Very long string hitting PCRE limits. - $limit = max(ini_get('pcre.backtrack_limit'), ini_get('pcre.recursion_limit')); - $source = $this->randomName($limit); - $result = _filter_autop($source); - $success = $this->assertEqual($result, '' . $source . "
\n", 'Line break filter can process very long strings.'); - if (!$success) { - $this->verbose("\n" . $source . "\n
\n" . $result); - } - } - - /** - * Tests limiting allowed tags and XSS prevention. - * - * XSS tests assume that script is disallowed by default and src is allowed - * by default, but on* and style attributes are disallowed. - * - * Script injection vectors mostly adopted from http://ha.ckers.org/xss.html. - * - * Relevant CVEs: - * - CVE-2002-1806, ~CVE-2005-0682, ~CVE-2005-2106, CVE-2005-3973, - * CVE-2006-1226 (= rev. 1.112?), CVE-2008-0273, CVE-2008-3740. - */ - function testFilterXSS() { - // Tag stripping, different ways to work around removal of HTML tags. - $f = filter_xss(''); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping -- simple script without special characters.'); - - $f = filter_xss(''); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping -- empty script with source.'); - - $f = filter_xss(''); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- non whitespace character after tag name.'); - - $f = filter_xss(''); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- no space between tag and attribute.'); - - // Null between < and tag name works at least with IE6. - $f = filter_xss("<\0scr\0ipt>alert(0)"); - $this->assertNoNormalized($f, 'ipt', 'HTML tag stripping evasion -- breaking HTML with nulls.'); - - $f = filter_xss(""); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- filter just removing "script".'); - - $f = filter_xss('<'); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- double opening brackets.'); - - $f = filter_xss('', array('img')); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- a malformed image tag.'); - - $f = filter_xss('', array('blockquote')); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- script in a blockqoute.'); - - $f = filter_xss(""); - $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- script within a comment.'); - - // Dangerous attributes removal. - $f = filter_xss(' ', array('p')); - $this->assertNoNormalized($f, 'onmouseover', 'HTML filter attributes removal -- events, no evasion.'); - - $f = filter_xss('
- ', array('li')); - $this->assertNoNormalized($f, 'style', 'HTML filter attributes removal -- style, no evasion.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'onerror', 'HTML filter attributes removal evasion -- spaces before equals sign.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'onabort', 'HTML filter attributes removal evasion -- non alphanumeric characters before equals sign.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'onmediaerror', 'HTML filter attributes removal evasion -- varying case.'); - - // Works at least with IE6. - $f = filter_xss("
", array('img')); - $this->assertNoNormalized($f, 'focus', 'HTML filter attributes removal evasion -- breaking with nulls.'); - - // Only whitelisted scheme names allowed in attributes. - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- no evasion.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- no alert ;)'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- grave accents.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- rare attribute.'); - - $f = filter_xss('
', array('table')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- another tag.'); - - $f = filter_xss('
', array('base')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- one more attribute and tag.'); - - $f = filter_xss(' ', array('img')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- varying case.'); - - $f = filter_xss('
", array('img')); - $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an embedded tab.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an encoded, embedded tab.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an encoded, embedded newline.'); - - // With this test would fail, but the entity gets turned into - // 
, so it's OK. - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an encoded, embedded carriage return.'); - - $f = filter_xss("
", array('img')); - $this->assertNoNormalized($f, 'cript', 'HTML scheme clearing evasion -- broken into many lines.'); - - $f = filter_xss("
", array('img')); - $this->assertNoNormalized($f, 'cript', 'HTML scheme clearing evasion -- embedded nulls.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- spaces and metacharacters before scheme.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'vbscript', 'HTML scheme clearing evasion -- another scheme.'); - - $f = filter_xss('
', array('img')); - $this->assertNoNormalized($f, 'nosuchscheme', 'HTML scheme clearing evasion -- unknown scheme.'); - - // Netscape 4.x javascript entities. - $f = filter_xss('
', array('br')); - $this->assertNoNormalized($f, 'alert', 'Netscape 4.x javascript entities.'); - - // DRUPAL-SA-2008-006: Invalid UTF-8, these only work as reflected XSS with - // Internet Explorer 6. - $f = filter_xss("\" style=\"background-image: url(javascript:alert(0));\"\xe0
", array('p')); - $this->assertNoNormalized($f, 'style', 'HTML filter -- invalid UTF-8.'); - - $f = filter_xss("\xc0aaa"); - $this->assertEqual($f, '', 'HTML filter -- overlong UTF-8 sequences.'); - - $f = filter_xss("Who's Online"); - $this->assertNormalized($f, "who's online", 'HTML filter -- html entity number'); - - $f = filter_xss("Who's Online"); - $this->assertNormalized($f, "who's online", 'HTML filter -- encoded html entity number'); - - $f = filter_xss("Who&#039; Online"); - $this->assertNormalized($f, "who' online", 'HTML filter -- double encoded html entity number'); - } - - /** - * Tests filter settings, defaults, access restrictions and similar. - * - * @todo This is for functions like filter_filter and check_markup, whose - * functionality is not completely focused on filtering. Some ideas: - * restricting formats according to user permissions, proper cache - * handling, defaults -- allowed tags/attributes/protocols. - * - * @todo It is possible to add script, iframe etc. to allowed tags, but this - * makes HTML filter completely ineffective. - * - * @todo Class, id, name and xmlns should be added to disallowed attributes, - * or better a whitelist approach should be used for that too. - */ - function testHtmlFilter() { - // Setup dummy filter object. - $filter = new stdClass(); - $filter->settings = array( - 'allowed_html' => '
", $filter); - $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- some nulls.'); - - $f = _filter_html('text', $filter); - $this->assertNoNormalized($f, 'rel="follow"', 'Spam deterrent evasion -- with rel set - rel="follow" removed.'); - $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- with rel set - rel="nofollow" added.'); - } - - /** - * Tests the loose, admin HTML filter. - */ - function testFilterXSSAdmin() { - // DRUPAL-SA-2008-044 - $f = filter_xss_admin(''); - $this->assertNoNormalized($f, 'object', 'Admin HTML filter -- should not allow object tag.'); - - $f = filter_xss_admin(''); - $this->assertNoNormalized($f, 'script', 'Admin HTML filter -- should not allow script tag.'); - - $f = filter_xss_admin('-
- ',
- 'filter_html_help' => 1,
- 'filter_html_nofollow' => 0,
- );
-
- // HTML filter is not able to secure some tags, these should never be
- // allowed.
- $f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'script', 'HTML filter should always remove script tags.');
-
- $f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'iframe', 'HTML filter should always remove iframe tags.');
-
- $f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'object', 'HTML filter should always remove object tags.');
-
- $f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'style', 'HTML filter should always remove style tags.');
-
- // Some tags make CSRF attacks easier, let the user take the risk herself.
- $f = _filter_html('
', $filter); - $this->assertNoNormalized($f, 'img', 'HTML filter should remove img tags on default.'); - - $f = _filter_html('', $filter); - $this->assertNoNormalized($f, 'img', 'HTML filter should remove input tags on default.'); - - // Filtering content of some attributes is infeasible, these shouldn't be - // allowed too. - $f = _filter_html('', $filter); - $this->assertNoNormalized($f, 'style', 'HTML filter should remove style attribute on default.'); - - $f = _filter_html('', $filter); - $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove on* attributes on default.'); - - $f = _filter_html('
'); - $this->assertEqual($f, '', 'Admin HTML filter -- should never allow some tags.'); - } - - /** - * Tests the HTML escaping filter. - * - * check_plain() is not tested here. - */ - function testHtmlEscapeFilter() { - // Setup dummy filter object. - $filter = new stdClass(); - $filter->callback = '_filter_html_escape'; - - $tests = array( - " One. Two'.\n Three.
\n " => array( - "One. <!-- "comment" --> Two'.\n<p>Three.</p>" => TRUE, - ' One.' => FALSE, - "\n " => FALSE, - ), - ); - $this->assertFilteredString($filter, $tests); - } - - /** - * Tests the URL filter. - */ - function testUrlFilter() { - // Setup dummy filter object. - $filter = new stdClass(); - $filter->callback = '_filter_url'; - $filter->settings = array( - 'filter_url_length' => 496, - ); - // @todo Possible categories: - // - absolute, mail, partial - // - characters/encoding, surrounding markup, security - - // Create a e-mail that is too long. - $long_email = str_repeat('a', 254) . '@example.com'; - $too_long_email = str_repeat('b', 255) . '@example.com'; - - - // Filter selection/pattern matching. - $tests = array( - // HTTP URLs. - ' -http://example.com or www.example.com -' => array( - 'http://example.com' => TRUE, - 'www.example.com' => TRUE, - ), - // MAILTO URLs. - ' -person@example.com or mailto:person2@example.com or ' . $long_email . ' but not ' . $too_long_email . ' -' => array( - 'person@example.com' => TRUE, - 'mailto:person2@example.com' => TRUE, - '' . $long_email . '' => TRUE, - '' . $too_long_email . '' => FALSE, - ), - // URI parts and special characters. - ' -http://trailingslash.com/ or www.trailingslash.com/ -http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment -http://twitter.com/#!/example/status/22376963142324226 -ftp://user:pass@ftp.example.com/~home/dir1 -sftp://user@nonstandardport:222/dir -ssh://192.168.0.100/srv/git/drupal.git -' => array( - 'http://trailingslash.com/' => TRUE, - 'www.trailingslash.com/' => TRUE, - 'http://host.com/some/path?query=foo&bar[baz]=beer#fragment' => TRUE, - 'www.host.com/some/path?query=foo&bar[baz]=beer#fragment' => TRUE, - 'http://twitter.com/#!/example/status/22376963142324226' => TRUE, - 'ftp://user:pass@ftp.example.com/~home/dir1' => TRUE, - 'sftp://user@nonstandardport:222/dir' => TRUE, - 'ssh://192.168.0.100/srv/git/drupal.git' => TRUE, - ), - // Encoding. - ' -http://ampersand.com/?a=1&b=2 -http://encoded.com/?a=1&b=2 -' => array( - 'http://ampersand.com/?a=1&b=2' => TRUE, - 'http://encoded.com/?a=1&b=2' => TRUE, - ), - // Domain name length. - ' -www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or -me@me.tv -' => array( - 'www.ex.ex' => TRUE, - 'www.example.example' => TRUE, - 'http://www.toolong' => FALSE, - 'me@me.tv' => TRUE, - ), - // Absolute URL protocols. - // The list to test is found in the beginning of _filter_url() at - // $protocols = variable_get('filter_allowed_protocols'... (approx line 1325). - ' -https://example.com, -ftp://ftp.example.com, -news://example.net, -telnet://example, -irc://example.host, -ssh://odd.geek, -sftp://secure.host?, -webcal://calendar, -rtsp://127.0.0.1, -not foo://disallowed.com. -' => array( - 'href="https://example.com"' => TRUE, - 'href="ftp://ftp.example.com"' => TRUE, - 'href="news://example.net"' => TRUE, - 'href="telnet://example"' => TRUE, - 'href="irc://example.host"' => TRUE, - 'href="ssh://odd.geek"' => TRUE, - 'href="sftp://secure.host"' => TRUE, - 'href="webcal://calendar"' => TRUE, - 'href="rtsp://127.0.0.1"' => TRUE, - 'href="foo://disallowed.com"' => FALSE, - 'not foo://disallowed.com.' => TRUE, - ), - ); - $this->assertFilteredString($filter, $tests); - - // Surrounding text/punctuation. - $tests = array( - ' -Partial URL with trailing period www.partial.com. -E-mail with trailing comma person@example.com, -Absolute URL with trailing question http://www.absolute.com? -Query string with trailing exclamation www.query.com/index.php?a=! -Partial URL with 3 trailing www.partial.periods... -E-mail with 3 trailing exclamations@example.com!!! -Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc). -' => array( - 'period www.partial.com.' => TRUE, - 'comma person@example.com,' => TRUE, - 'question http://www.absolute.com?' => TRUE, - 'exclamation www.query.com/index.php?a=!' => TRUE, - 'trailing www.partial.periods...' => TRUE, - 'trailing exclamations@example.com!!!' => TRUE, - 'characters (http://www.example.com/q=abc).' => TRUE, - ), - ' -(www.parenthesis.com/dir?a=1&b=2#a) -' => array( - '(www.parenthesis.com/dir?a=1&b=2#a)' => TRUE, - ), - ); - $this->assertFilteredString($filter, $tests); - - // Surrounding markup. - $tests = array( - ' - --An anchor. -
-' => array( - '' => TRUE, - '' => TRUE, - 'href="http://www.namespace.com"' => FALSE, - 'href="http://namespace.com"' => FALSE, - 'An anchor.' => TRUE, - ), - ' -Not www.relative.com or www.absolute.com -but http://www.strong.net or www.emphasis.info -' => array( - 'www.relative.com' => TRUE, - 'href="http://www.relative.com"' => FALSE, - 'www.absolute.com' => TRUE, - 'http://www.strong.net' => TRUE, - 'www.emphasis.info' => TRUE, - ), - ' -Test
using www.example.com the code tag. -' => array( - 'href' => FALSE, - 'http' => FALSE, - ), - ' -Intro. --Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com.
- -Outro. -' => array( - 'href="http://www.example.com"' => TRUE, - 'href="mailto:person@example.com"' => TRUE, - 'href="http://origin.example.com"' => TRUE, - 'http://www.usage.example.com' => FALSE, - 'http://www.example.info' => FALSE, - 'Intro.' => TRUE, - 'Outro.' => TRUE, - ), - ' -Unknown tag@see www.usage.example.com or www.example.info bla bla. -containing x and www.example.com ? And a tagbeginning with p and containing www.example.pooh with p? -' => array( - 'href="http://www.example.com"' => TRUE, - 'href="http://www.example.pooh"' => TRUE, - ), - ' -Test <br/>: This is a www.example17.com example with various http://www.example18.com tags. *
- It is important www.example19.com to *
test different URLs and http://www.example20.com in the same paragraph. *
-HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com. -' => array( - 'href="http://www.example17.com"' => TRUE, - 'href="http://www.example18.com"' => TRUE, - 'href="http://www.example19.com"' => TRUE, - 'href="http://www.example20.com"' => TRUE, - 'href="http://www.example21.com"' => TRUE, - 'href="mailto:person@example22.com"' => TRUE, - 'href="http://www.example23.com"' => TRUE, - 'href="http://www.example24.com"' => TRUE, - 'href="http://www.example25.com"' => TRUE, - 'href="http://www.example26.com"' => TRUE, - 'href="mailto:person@example27.com"' => TRUE, - 'href="http://www.example28.com"' => TRUE, - ), - ' - -' => array( - 'href="http://www.example.com"' => FALSE, - 'href="http://example.net"' => FALSE, - ), - ' - -' => array( - 'href' => FALSE, - ), - ' - -' => array( - 'href' => FALSE, - ), - ' - -' => array( - 'href' => FALSE, - ), - ' - -' => array( - 'href' => FALSE, - ), - ' -
-
-
- www.example.com -
- http://example.com -
- person@example.com -
- Check www.example.net -
- Some text around http://www.example.info by person@example.info? -
www.div.com--
-
- http://listitem.com -
- www.class.listitem.com -
- http://listitem.com
' => TRUE, - '- www.class.listitem.com
' => TRUE, - ), - ); - $this->assertFilteredString($filter, $tests); - - // URL trimming. - $filter->settings['filter_url_length'] = 20; - $tests = array( - 'www.trimmed.com/d/ff.ext?a=1&b=2#a1' => array( - 'www.trimmed.com/d/ff...' => TRUE, - ), - ); - $this->assertFilteredString($filter, $tests); - } - - /** - * Asserts multiple filter output expectations for multiple input strings. - * - * @param $filter - * A input filter object. - * @param $tests - * An associative array, whereas each key is an arbitrary input string and - * each value is again an associative array whose keys are filter output - * strings and whose values are Booleans indicating whether the output is - * expected or not. - * - * For example: - * @code - * $tests = array( - * 'Input string' => array( - * 'Input string
' => TRUE, - * 'Input string' . check_plain(var_export($source, TRUE)) . '
' - . '
' . 'Result:' . check_plain(var_export($result, TRUE)) . '
' - . '
' . ($is_expected ? 'Expected:' : 'Not expected:') - . '' . check_plain(var_export($value, TRUE)) . '
' - ); - } - } - } - } - - /** - * Tests URL filter on longer content. - * - * Filters based on regular expressions should also be tested with a more - * complex content than just isolated test lines. - * The most common errors are: - * - accidental '*' (greedy) match instead of '*?' (minimal) match. - * - only matching first occurrence instead of all. - * - newlines not matching '.*'. - * - * This test covers: - * - Document with multiple newlines and paragraphs (two newlines). - * - Mix of several HTML tags, invalid non-HTML tags, tags to ignore and HTML - * comments. - * - Empty HTML tags (BR, IMG). - * - Mix of absolute and partial URLs, and e-mail addresses in one content. - */ - function testUrlFilterContent() { - // Setup dummy filter object. - $filter = new stdClass(); - $filter->settings = array( - 'filter_url_length' => 496, - ); - $path = drupal_get_path('module', 'filter') . '/tests'; - - $input = file_get_contents($path . '/filter.url-input.txt'); - $expected = file_get_contents($path . '/filter.url-output.txt'); - $result = _filter_url($input, $filter); - $this->assertIdentical($result, $expected, 'Complex HTML document was correctly processed.'); - } - - /** - * Tests the HTML corrector filter. - * - * @todo This test could really use some validity checking function. - */ - function testHtmlCorrectorFilter() { - // Tag closing. - $f = _filter_htmlcorrector('text'); - $this->assertEqual($f, '
text
', 'HTML corrector -- tag closing at the end of input.'); - - $f = _filter_htmlcorrector('text
text'); - $this->assertEqual($f, '
text
text
', 'HTML corrector -- tag closing.'); - - $f = _filter_htmlcorrector("- e1
- e2");
- $this->assertEqual($f, "
- e1
- e2
content'); - $this->assertEqual($f, 'content', 'HTML corrector -- unclosed tag with attribute.'); - - // XHTML slash for empty elements. - $f = _filter_htmlcorrector('
'); - $this->assertEqual($f, '
', 'HTML corrector -- XHTML closing slash.'); - - $f = _filter_htmlcorrector('test
'); - $this->assertEqual($f, 'test
', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.'); - - $f = _filter_htmlcorrector('test
'); - $this->assertEqual($f, 'test
', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.'); - - $f = _filter_htmlcorrector('test
'); - $this->assertEqual($f, 'test
', 'HTML corrector -- Let proper XHTML pass through.'); - - $f = _filter_htmlcorrector('test
'); - $this->assertEqual($f, 'test
', 'HTML corrector -- Let proper XHTML pass through, but ensure there is a single space before the closing slash.'); - - $f = _filter_htmlcorrector('test
'); - $this->assertEqual($f, 'test
', 'HTML corrector -- Let proper XHTML pass through, but ensure there are not too many spaces before the closing slash.'); - - $f = _filter_htmlcorrector(''); - $this->assertEqual($f, '', 'HTML corrector -- Convert XHTML that is properly formed but that would not be compatible with typical HTML user agents.'); - - $f = _filter_htmlcorrector('test1
test2'); - $this->assertEqual($f, 'test1
test2', 'HTML corrector -- Automatically close single tags.'); - - $f = _filter_htmlcorrector('line1
line2'); - $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Automatically close single tags.'); - - $f = _filter_htmlcorrector('line1
line2'); - $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Automatically close single tags.'); - - $f = _filter_htmlcorrector('
test');
- $this->assertEqual($f, 'test', 'HTML corrector -- Automatically close single tags.');
-
- $f = _filter_htmlcorrector('
'); - $this->assertEqual($f, '
', "HTML corrector -- Transform empty tags to a single closed tag if the tag's content model is EMPTY."); - - $f = _filter_htmlcorrector(''); - $this->assertEqual($f, '', "HTML corrector -- Do not transform empty tags to a single closed tag if the tag's content model is not EMPTY."); - - $f = _filter_htmlcorrector('line1
line2'); - $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Move non-inline elements outside of inline containers.'); - - $f = _filter_htmlcorrector('line1
line2'); - $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Move non-inline elements outside of inline containers.'); - - $f = _filter_htmlcorrector('test
test
\n'); - $this->assertEqual($f, 'test
test
\n', 'HTML corrector -- Auto-close improperly nested tags.'); - - $f = _filter_htmlcorrector('Line1
'); - $this->assertEqual($filtered_data, '', - format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => ' -'); - $this->assertEqual($filtered_data, '', - format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => ' -', - format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '// assertTrue(strpos(strtolower(decode_entities($haystack)), $needle) !== FALSE, $message, $group); - } - - /** - * Asserts that text transformed to lowercase with HTML entities decoded does not contain a given string. - * - * Otherwise fails the test with a given message, similar to all the - * SimpleTest assert* functions. - * - * Note that this does not remove nulls, new lines, and other character that - * could be used to obscure a tag or an attribute name. - * - * @param $haystack - * Text to look in. - * @param $needle - * Lowercase, plain text to look for. - * @param $message - * (optional) Message to display if failed. Defaults to an empty string. - * @param $group - * (optional) The group this message belongs to. Defaults to 'Other'. - * @return - * TRUE on pass, FALSE on fail. - */ - function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') { - return $this->assertTrue(strpos(strtolower(decode_entities($haystack)), $needle) === FALSE, $message, $group); - } -} - -/** - * Tests for Filter's hook invocations. - */ -class FilterHooksTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Filter format hooks', - 'description' => 'Test hooks for text formats insert/update/disable.', - 'group' => 'Filter', - ); - } - - function setUp() { - parent::setUp('block', 'filter_test'); - $admin_user = $this->drupalCreateUser(array('administer filters', 'administer blocks')); - $this->drupalLogin($admin_user); - } - - /** - * Tests hooks on format management. - * - * Tests that hooks run correctly on creating, editing, and deleting a text - * format. - */ - function testFilterHooks() { - // Add a text format. - $name = $this->randomName(); - $edit = array(); - $edit['format'] = drupal_strtolower($this->randomName()); - $edit['name'] = $name; - $edit['roles[' . DRUPAL_ANONYMOUS_RID . ']'] = 1; - $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration')); - $this->assertRaw(t('Added text format %format.', array('%format' => $name)), 'New format created.'); - $this->assertText('hook_filter_format_insert invoked.', 'hook_filter_format_insert was invoked.'); - - $format_id = $edit['format']; - - // Update text format. - $edit = array(); - $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1; - $this->drupalPost('admin/config/content/formats/' . $format_id, $edit, t('Save configuration')); - $this->assertRaw(t('The text format %format has been updated.', array('%format' => $name)), 'Format successfully updated.'); - $this->assertText('hook_filter_format_update invoked.', 'hook_filter_format_update() was invoked.'); - - // Add a new custom block. - $custom_block = array(); - $custom_block['info'] = $this->randomName(8); - $custom_block['title'] = $this->randomName(8); - $custom_block['body[value]'] = $this->randomName(32); - // Use the format created. - $custom_block['body[format]'] = $format_id; - $this->drupalPost('admin/structure/block/add', $custom_block, t('Save block')); - $this->assertText(t('The block has been created.'), 'New block successfully created.'); - - // Verify the new block is in the database. - $bid = db_query("SELECT bid FROM {block_custom} WHERE info = :info", array(':info' => $custom_block['info']))->fetchField(); - $this->assertNotNull($bid, 'New block found in database'); - - // Disable the text format. - $this->drupalPost('admin/config/content/formats/' . $format_id . '/disable', array(), t('Disable')); - $this->assertRaw(t('Disabled text format %format.', array('%format' => $name)), 'Format successfully disabled.'); - $this->assertText('hook_filter_format_disable invoked.', 'hook_filter_format_disable() was invoked.'); - } -} - -/** - * Tests filter settings. - */ -class FilterSettingsTestCase extends DrupalWebTestCase { - /** - * The installation profile to use with this test class. - * - * @var string - */ - protected $profile = 'testing'; - - public static function getInfo() { - return array( - 'name' => 'Filter settings', - 'description' => 'Tests filter settings.', - 'group' => 'Filter', - ); - } - - /** - * Tests explicit and implicit default settings for filters. - */ - function testFilterDefaults() { - $filter_info = filter_filter_info(); - $filters = array_fill_keys(array_keys($filter_info), array()); - - // Create text format using filter default settings. - $filter_defaults_format = (object) array( - 'format' => 'filter_defaults', - 'name' => 'Filter defaults', - 'filters' => $filters, - ); - filter_format_save($filter_defaults_format); - - // Verify that default weights defined in hook_filter_info() were applied. - $saved_settings = array(); - foreach ($filter_defaults_format->filters as $name => $settings) { - $expected_weight = (isset($filter_info[$name]['weight']) ? $filter_info[$name]['weight'] : 0); - $this->assertEqual($settings['weight'], $expected_weight, format_string('@name filter weight %saved equals %default', array( - '@name' => $name, - '%saved' => $settings['weight'], - '%default' => $expected_weight, - ))); - $saved_settings[$name]['weight'] = $expected_weight; - } - - // Re-save the text format. - filter_format_save($filter_defaults_format); - // Reload it from scratch. - filter_formats_reset(); - $filter_defaults_format = filter_format_load($filter_defaults_format->format); - $filter_defaults_format->filters = filter_list_format($filter_defaults_format->format); - - // Verify that saved filter settings have not been changed. - foreach ($filter_defaults_format->filters as $name => $settings) { - $this->assertEqual($settings->weight, $saved_settings[$name]['weight'], format_string('@name filter weight %saved equals %previous', array( - '@name' => $name, - '%saved' => $settings->weight, - '%previous' => $saved_settings[$name]['weight'], - ))); - } - } -} diff --git a/modules/filter/tests/filter.url-input.txt b/modules/filter/tests/filter.url-input.txt deleted file mode 100644 index 7b33af5..0000000 --- a/modules/filter/tests/filter.url-input.txt +++ /dev/null @@ -1,36 +0,0 @@ -This is just a www.test.com. paragraph with person@test.com. some http://www.test.com. urls thrown in and also
bold stuff'); - $this->assertEqual($f, 'Line1
', 'HTML corrector -- Properly close unclosed tags, and remove useless closing tags.'); - - $f = _filter_htmlcorrector('test '); - $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.'); - - $f = _filter_htmlcorrector('test '); - $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.'); - - $f = _filter_htmlcorrector('test '); - $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.'); - - $f = _filter_htmlcorrector('test '); - $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.'); - - $f = _filter_htmlcorrector('test '); - $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.'); - - $f = _filter_htmlcorrector('
bold stufftest\n
\n'); - $this->assertEqual($f, 'test\n
\n', 'HTML corrector -- New-lines are accepted and kept as-is.'); - - $f = _filter_htmlcorrector('دروبال'); - $this->assertEqual($f, '
دروبال
', 'HTML corrector -- Encoding is correctly kept.'); - - $f = _filter_htmlcorrector(''); - $this->assertEqual($f, '', 'HTML corrector -- CDATA added to script element'); - - $f = _filter_htmlcorrector(''); - $this->assertEqual($f, '', 'HTML corrector -- CDATA added to a nested script element'); - - $f = _filter_htmlcorrector(''); - $this->assertEqual($f, '', 'HTML corrector -- CDATA added to a style element.'); - - $filtered_data = _filter_htmlcorrector(''); - $this->assertEqual($filtered_data, '', - format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '/*using www.test.com the code tag. - --This is just a www.test.com. paragraph with person@test.com. some http://www.test.com. urls thrown in and also
- -using www.test.com the code tag. -Testing code tag http://www.test.com abc- -http://www.test.com -www.test.com -person@test.com -www.test.com- -What about tags that don't existlike x say www.test.com ? And what about tagbeginning www.test.com with p? - -Test <br/>: This is just a www.test.com. paragraph with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph *
with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph person@test.com with some http://www.test.com urls *img*thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. - -This is just a www.test.com paragraph with some http://www.test.com urls thrown in.
This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. - -The old URL filter has problems with this kind of link with www address as part of text in title. www.test.com - - - --
-
- www.test.com -
- http://www.test.com -
- person@test.com -
- check www.test.com -
- this with some text around: http://www.test.com not so easy person@test.com now? -
using www.test.com the code tag. - --This is just a www.test.com. paragraph with person@test.com. some http://www.test.com. urls thrown in and also
- -using www.test.com the code tag. -Testing code tag http://www.test.com abc- -http://www.test.com -www.test.com -person@test.com -www.test.com- -What about tags that don't existlike x say www.test.com ? And what about tagbeginning www.test.com with p? - -Test <br/>: This is just a www.test.com. paragraph with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph *
with some http://www.test.com urls thrown in. *
This is just a www.test.com paragraph person@test.com with some http://www.test.com urls *img*thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. - -This is just a www.test.com paragraph with some http://www.test.com urls thrown in.
This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. This is just a www.test.com paragraph with some http://www.test.com urls thrown in. This is just a www.test.com paragraph person@test.com with some http://www.test.com urls thrown in. - -The old URL filter has problems with this kind of link with www address as part of text in title. www.test.com - - - --
-
- www.test.com -
- http://www.test.com -
- person@test.com -
- check www.test.com -
- this with some text around: http://www.test.com not so easy person@test.com now? -
- -
diff --git a/modules/forum/forum-rtl.css b/modules/forum/forum-rtl.css deleted file mode 100644 index 3f2a88b..0000000 --- a/modules/forum/forum-rtl.css +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @file - * Right-to-left styling for the Forum module. - */ - -#forum td.forum .icon { - float: right; - margin: 0 0 0 9px; -} -#forum div.indent { - margin-left: 0; - margin-right: 20px; -} -.forum-topic-navigation { - padding: 1em 3em 0 0; -} -.forum-topic-navigation .topic-previous { - text-align: left; - float: right; -} -.forum-topic-navigation .topic-next { - text-align: right; - float: left; -} diff --git a/modules/forum/forum-submitted.tpl.php b/modules/forum/forum-submitted.tpl.php deleted file mode 100644 index 18fea8f..0000000 --- a/modules/forum/forum-submitted.tpl.php +++ /dev/null @@ -1,30 +0,0 @@ - - - - $time, - '!author' => $author, - )); ?> - - - - diff --git a/modules/forum/forum-topic-list.tpl.php b/modules/forum/forum-topic-list.tpl.php deleted file mode 100644 index 6427814..0000000 --- a/modules/forum/forum-topic-list.tpl.php +++ /dev/null @@ -1,72 +0,0 @@ -icon: The icon to display. - * - $topic->moved: A flag to indicate whether the topic has been moved to - * another forum. - * - $topic->title: The title of the topic. Safe to output. - * - $topic->message: If the topic has been moved, this contains an - * explanation and a link. - * - $topic->zebra: 'even' or 'odd' string used for row class. - * - $topic->comment_count: The number of replies on this topic. - * - $topic->new_replies: A flag to indicate whether there are unread - * comments. - * - $topic->new_url: If there are unread replies, this is a link to them. - * - $topic->new_text: Text containing the translated, properly pluralized - * count. - * - $topic->created: A string representing when the topic was posted. Safe - * to output. - * - $topic->last_reply: An outputtable string representing when the topic was - * last replied to. - * - $topic->timestamp: The raw timestamp this topic was posted. - * - $topic_id: Numeric ID for the current forum topic. - * - * @see template_preprocess_forum_topic_list() - * @see theme_forum_topic_list() - * - * @ingroup themeable - */ -?> -- - - - $forum): ?> -- - - - - - - -is_container ? 'colspan="4" class="container"' : 'class="forum"'; ?>> - - ', $forum->depth); ?> - - is_container): ?> -- icon_title; ?> -- - description): ?> -description; ?>- - ', $forum->depth); ?> -- num_topics ?> - new_topics): ?> - -
- new_text; ?> - -num_posts ?> -last_reply ?> - -- -
- diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc deleted file mode 100644 index 712cf54..0000000 --- a/modules/forum/forum.admin.inc +++ /dev/null @@ -1,352 +0,0 @@ - '', - 'description' => '', - 'tid' => NULL, - 'weight' => 0, - ); - $form['name'] = array('#type' => 'textfield', - '#title' => t('Forum name'), - '#default_value' => $edit['name'], - '#maxlength' => 255, - '#description' => t('Short but meaningful name for this collection of threaded discussions.'), - '#required' => TRUE, - ); - $form['description'] = array('#type' => 'textarea', - '#title' => t('Description'), - '#default_value' => $edit['description'], - '#description' => t('Description and guidelines for discussions within this forum.'), - ); - $form['parent']['#tree'] = TRUE; - $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'forum'); - $form['weight'] = array('#type' => 'weight', - '#title' => t('Weight'), - '#default_value' => $edit['weight'], - '#description' => t('Forums are displayed in ascending order by weight (forums with equal weights are displayed alphabetically).'), - ); - - $form['vid'] = array('#type' => 'hidden', '#value' => variable_get('forum_nav_vocabulary', '')); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save')); - if ($edit['tid']) { - $form['actions']['delete'] = array('#type' => 'submit', '#value' => t('Delete')); - $form['tid'] = array('#type' => 'hidden', '#value' => $edit['tid']); - } - $form['#submit'][] = 'forum_form_submit'; - $form['#theme'] = 'forum_form'; - - return $form; -} - -/** - * Form submission handler for forum_form_forum() and forum_form_container(). - */ -function forum_form_submit($form, &$form_state) { - if ($form['form_id']['#value'] == 'forum_form_container') { - $container = TRUE; - $type = t('forum container'); - } - else { - $container = FALSE; - $type = t('forum'); - } - - $term = (object) $form_state['values']; - $status = taxonomy_term_save($term); - switch ($status) { - case SAVED_NEW: - if ($container) { - $containers = variable_get('forum_containers', array()); - $containers[] = $term->tid; - variable_set('forum_containers', $containers); - } - $form_state['values']['tid'] = $term->tid; - drupal_set_message(t('Created new @type %term.', array('%term' => $form_state['values']['name'], '@type' => $type))); - break; - case SAVED_UPDATED: - drupal_set_message(t('The @type %term has been updated.', array('%term' => $form_state['values']['name'], '@type' => $type))); - // Clear the page and block caches to avoid stale data. - cache_clear_all(); - break; - } - $form_state['redirect'] = 'admin/structure/forum'; - return; -} - -/** - * Returns HTML for a forum form. - * - * By default this does not alter the appearance of a form at all, but is - * provided as a convenience for themers. - * - * @param $variables - * An associative array containing: - * - form: A render element representing the form. - * - * @ingroup themeable - */ -function theme_forum_form($variables) { - return drupal_render_children($variables['form']); -} - -/** - * Form constructor for adding and editing forum containers. - * - * @param $edit - * (optional) Associative array containing a container term to be added or edited. - * Defaults to an empty array. - * - * @see forum_form_submit() - * @ingroup forms - */ -function forum_form_container($form, &$form_state, $edit = array()) { - $edit += array( - 'name' => '', - 'description' => '', - 'tid' => NULL, - 'weight' => 0, - ); - // Handle a delete operation. - $form['name'] = array( - '#title' => t('Container name'), - '#type' => 'textfield', - '#default_value' => $edit['name'], - '#maxlength' => 255, - '#description' => t('Short but meaningful name for this collection of related forums.'), - '#required' => TRUE - ); - - $form['description'] = array( - '#type' => 'textarea', - '#title' => t('Description'), - '#default_value' => $edit['description'], - '#description' => t('Description and guidelines for forums within this container.') - ); - $form['parent']['#tree'] = TRUE; - $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'container'); - $form['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight'), - '#default_value' => $edit['weight'], - '#description' => t('Containers are displayed in ascending order by weight (containers with equal weights are displayed alphabetically).') - ); - - $form['vid'] = array( - '#type' => 'hidden', - '#value' => variable_get('forum_nav_vocabulary', ''), - ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save') - ); - if ($edit['tid']) { - $form['actions']['delete'] = array('#type' => 'submit', '#value' => t('Delete')); - $form['tid'] = array('#type' => 'value', '#value' => $edit['tid']); - } - $form['#submit'][] = 'forum_form_submit'; - $form['#theme'] = 'forum_form'; - - return $form; -} - -/** - * Form constructor for confirming deletion of a forum taxonomy term. - * - * @param $tid - * ID of the term to be deleted. - * - * @see forum_confirm_delete_submit() - * @ingroup forms - */ -function forum_confirm_delete($form, &$form_state, $tid) { - $term = taxonomy_term_load($tid); - - $form['tid'] = array('#type' => 'value', '#value' => $tid); - $form['name'] = array('#type' => 'value', '#value' => $term->name); - - return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/structure/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete posts in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content'))), t('Delete'), t('Cancel')); -} - -/** - * Form submission handler for forum_confirm_delete(). - */ -function forum_confirm_delete_submit($form, &$form_state) { - taxonomy_term_delete($form_state['values']['tid']); - drupal_set_message(t('The forum %term and all sub-forums have been deleted.', array('%term' => $form_state['values']['name']))); - watchdog('content', 'forum: deleted %term and all its sub-forums.', array('%term' => $form_state['values']['name'])); - - $form_state['redirect'] = 'admin/structure/forum'; - return; -} - -/** - * Form constructor for the forum settings page. - * - * @see forum_menu() - * @see system_settings_form() - * @ingroup forms - */ -function forum_admin_settings($form) { - $number = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500)); - $form['forum_hot_topic'] = array('#type' => 'select', - '#title' => t('Hot topic threshold'), - '#default_value' => variable_get('forum_hot_topic', 15), - '#options' => $number, - '#description' => t('The number of replies a topic must have to be considered "hot".'), - ); - $number = drupal_map_assoc(array(10, 25, 50, 75, 100)); - $form['forum_per_page'] = array('#type' => 'select', - '#title' => t('Topics per page'), - '#default_value' => variable_get('forum_per_page', 25), - '#options' => $number, - '#description' => t('Default number of forum topics displayed per page.'), - ); - $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4 => t('Posts - least active first')); - $form['forum_order'] = array('#type' => 'radios', - '#title' => t('Default order'), - '#default_value' => variable_get('forum_order', 1), - '#options' => $forder, - '#description' => t('Default display order for topics.'), - ); - return system_settings_form($form); -} - -/** - * Form constructor for the forum overview form. - * - * Returns a form for controlling the hierarchy of existing forums and - * containers. - * - * @see forum_menu() - * @ingroup forms - */ -function forum_overview($form, &$form_state) { - module_load_include('inc', 'taxonomy', 'taxonomy.admin'); - - $vid = variable_get('forum_nav_vocabulary', ''); - $vocabulary = taxonomy_vocabulary_load($vid); - $form = taxonomy_overview_terms($form, $form_state, $vocabulary); - - foreach (element_children($form) as $key) { - if (isset($form[$key]['#term'])) { - $term = $form[$key]['#term']; - $form[$key]['view']['#href'] = 'forum/' . $term['tid']; - if (in_array($form[$key]['#term']['tid'], variable_get('forum_containers', array()))) { - $form[$key]['edit']['#title'] = t('edit container'); - $form[$key]['edit']['#href'] = 'admin/structure/forum/edit/container/' . $term['tid']; - } - else { - $form[$key]['edit']['#title'] = t('edit forum'); - $form[$key]['edit']['#href'] = 'admin/structure/forum/edit/forum/' . $term['tid']; - } - } - } - - // Remove the alphabetical reset. - unset($form['actions']['reset_alphabetical']); - - // The form needs to have submit and validate handlers set explicitly. - $form['#theme'] = 'taxonomy_overview_terms'; - $form['#submit'] = array('taxonomy_overview_terms_submit'); // Use the existing taxonomy overview submit handler. - $form['#empty_text'] = t('No containers or forums available. Add container or Add forum.', array('@container' => url('admin/structure/forum/add/container'), '@forum' => url('admin/structure/forum/add/forum'))); - return $form; -} - -/** - * Returns a select box for available parent terms. - * - * @param $tid - * ID of the term that is being added or edited. - * @param $title - * Title for the select box. - * @param $child_type - * Whether the child is a forum or a container. - * - * @return - * A select form element. - */ -function _forum_parent_select($tid, $title, $child_type) { - - $parents = taxonomy_get_parents($tid); - if ($parents) { - $parent = array_shift($parents); - $parent = $parent->tid; - } - else { - $parent = 0; - } - - $vid = variable_get('forum_nav_vocabulary', ''); - $children = taxonomy_get_tree($vid, $tid); - - // A term can't be the child of itself, nor of its children. - foreach ($children as $child) { - $exclude[] = $child->tid; - } - $exclude[] = $tid; - - $tree = taxonomy_get_tree($vid); - $options[0] = '<' . t('root') . '>'; - if ($tree) { - foreach ($tree as $term) { - if (!in_array($term->tid, $exclude)) { - $options[$term->tid] = str_repeat(' -- ', $term->depth) . $term->name; - } - } - } - if ($child_type == 'container') { - $description = t('Containers are usually placed at the top (root) level, but may also be placed inside another container or forum.'); - } - elseif ($child_type == 'forum') { - $description = t('Forums may be placed at the top (root) level, or inside another container or forum.'); - } - - return array('#type' => 'select', '#title' => $title, '#default_value' => $parent, '#options' => $options, '#description' => $description, '#required' => TRUE); -} diff --git a/modules/forum/forum.css b/modules/forum/forum.css deleted file mode 100644 index 480e07b..0000000 --- a/modules/forum/forum.css +++ /dev/null @@ -1,54 +0,0 @@ -/** - * @file - * Styling for the Forum module. - */ - -#forum .description { - font-size: 0.9em; - margin: 0.5em; -} -#forum td.created, -#forum td.posts, -#forum td.topics, -#forum td.last-reply, -#forum td.replies, -#forum td.pager { - white-space: nowrap; -} - -#forum td.forum .icon { - background-image: url(../../misc/forum-icons.png); - background-repeat: no-repeat; - float: left; /* LTR */ - height: 24px; - margin: 0 9px 0 0; /* LTR */ - width: 24px; -} -#forum td.forum .forum-status-new { - background-position: -24px 0; -} - -#forum div.indent { - margin-left: 20px; /* LTR */ -} -#forum .icon div { - background-image: url(../../misc/forum-icons.png); - background-repeat: no-repeat; - width: 24px; - height: 24px; -} -#forum .icon .topic-status-new { - background-position: -24px 0; -} -#forum .icon .topic-status-hot { - background-position: -48px 0; -} -#forum .icon .topic-status-hot-new { - background-position: -72px 0; -} -#forum .icon .topic-status-sticky { - background-position: -96px 0; -} -#forum .icon .topic-status-closed { - background-position: -120px 0; -} diff --git a/modules/forum/forum.info b/modules/forum/forum.info deleted file mode 100644 index b18a0e5..0000000 --- a/modules/forum/forum.info +++ /dev/null @@ -1,10 +0,0 @@ -name = Forum -description = Provides discussion forums. -dependencies[] = taxonomy -dependencies[] = comment -package = Core -version = VERSION -core = 7.x -files[] = forum.test -configure = admin/structure/forum -stylesheets[all][] = forum.css diff --git a/modules/forum/forum.install b/modules/forum/forum.install deleted file mode 100644 index 57e116b..0000000 --- a/modules/forum/forum.install +++ /dev/null @@ -1,467 +0,0 @@ -fields(array('weight' => 1)) - ->condition('name', 'forum') - ->execute(); - // Forum topics are published by default, but do not have any other default - // options set (for example, they are not promoted to the front page). - variable_set('node_options_forum', array('status')); -} - -/** - * Implements hook_enable(). - */ -function forum_enable() { - // If we enable forum at the same time as taxonomy we need to call - // field_associate_fields() as otherwise the field won't be enabled until - // hook modules_enabled is called which takes place after hook_enable events. - field_associate_fields('taxonomy'); - // Create the forum vocabulary if it does not exist. - $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', 0)); - if (!$vocabulary) { - $edit = array( - 'name' => t('Forums'), - 'machine_name' => 'forums', - 'description' => t('Forum navigation vocabulary'), - 'hierarchy' => 1, - 'module' => 'forum', - 'weight' => -10, - ); - $vocabulary = (object) $edit; - taxonomy_vocabulary_save($vocabulary); - variable_set('forum_nav_vocabulary', $vocabulary->vid); - } - - // Create the 'taxonomy_forums' field if it doesn't already exist. - if (!field_info_field('taxonomy_forums')) { - $field = array( - 'field_name' => 'taxonomy_forums', - 'type' => 'taxonomy_term_reference', - 'settings' => array( - 'allowed_values' => array( - array( - 'vocabulary' => $vocabulary->machine_name, - 'parent' => 0, - ), - ), - ), - ); - field_create_field($field); - - // Create a default forum so forum posts can be created. - $edit = array( - 'name' => t('General discussion'), - 'description' => '', - 'parent' => array(0), - 'vid' => $vocabulary->vid, - ); - $term = (object) $edit; - taxonomy_term_save($term); - - // Create the instance on the bundle. - $instance = array( - 'field_name' => 'taxonomy_forums', - 'entity_type' => 'node', - 'label' => $vocabulary->name, - 'bundle' => 'forum', - 'required' => TRUE, - 'widget' => array( - 'type' => 'options_select', - ), - 'display' => array( - 'default' => array( - 'type' => 'taxonomy_term_reference_link', - 'weight' => 10, - ), - 'teaser' => array( - 'type' => 'taxonomy_term_reference_link', - 'weight' => 10, - ), - ), - ); - field_create_instance($instance); - } - - // Ensure the forum node type is available. - node_types_rebuild(); - $types = node_type_get_types(); - node_add_body_field($types['forum']); -} - -/** - * Implements hook_uninstall(). - */ -function forum_uninstall() { - // Load the dependent Taxonomy module, in case it has been disabled. - drupal_load('module', 'taxonomy'); - - variable_del('forum_containers'); - variable_del('forum_hot_topic'); - variable_del('forum_per_page'); - variable_del('forum_order'); - variable_del('forum_block_num_active'); - variable_del('forum_block_num_new'); - variable_del('node_options_forum'); - - field_delete_field('taxonomy_forums'); - // Purge field data now to allow taxonomy module to be uninstalled - // if this is the only field remaining. - field_purge_batch(10); -} - -/** - * Implements hook_schema(). - */ -function forum_schema() { - $schema['forum'] = array( - 'description' => 'Stores the relationship of nodes to forum terms.', - 'fields' => array( - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {node}.nid of the node.', - ), - 'vid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Primary Key: The {node}.vid of the node.', - ), - 'tid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {taxonomy_term_data}.tid of the forum term assigned to the node.', - ), - ), - 'indexes' => array( - 'forum_topic' => array('nid', 'tid'), - 'tid' => array('tid'), - ), - 'primary key' => array('vid'), - 'foreign keys' => array( - 'forum_node' => array( - 'table' => 'node', - 'columns' => array( - 'nid' => 'nid', - 'vid' => 'vid', - ), - ), - ), - ); - - $schema['forum_index'] = array( - 'description' => 'Maintains denormalized information about node/term relationships.', - 'fields' => array( - 'nid' => array( - 'description' => 'The {node}.nid this record tracks.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'title' => array( - 'description' => 'The title of this node, always treated as non-markup plain text.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - 'tid' => array( - 'description' => 'The term ID.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'sticky' => array( - 'description' => 'Boolean indicating whether the node is sticky.', - 'type' => 'int', - 'not null' => FALSE, - 'default' => 0, - 'size' => 'tiny', - ), - 'created' => array( - 'description' => 'The Unix timestamp when the node was created.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default'=> 0, - ), - 'last_comment_timestamp' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.timestamp.', - ), - 'comment_count' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The total number of comments on this node.', - ), - ), - 'indexes' => array( - 'forum_topics' => array('nid', 'tid', 'sticky', 'last_comment_timestamp'), - 'created' => array('created'), - 'last_comment_timestamp' => array('last_comment_timestamp'), - ), - 'foreign keys' => array( - 'tracked_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - 'term' => array( - 'table' => 'taxonomy_term_data', - 'columns' => array( - 'tid' => 'tid', - ), - ), - ), - ); - - - return $schema; -} - -/** - * Implements hook_update_dependencies(). - */ -function forum_update_dependencies() { - $dependencies['forum'][7003] = array( - // Forum update 7003 uses field API update functions, so must run after - // Field API has been enabled. - 'system' => 7020, - // Forum update 7003 relies on updated taxonomy module schema. Ensure it - // runs after all taxonomy updates. - 'taxonomy' => 7010, - ); - return $dependencies; -} - -/** - * Add new index to forum table. - */ -function forum_update_7000() { - db_drop_index('forum', 'nid'); - db_add_index('forum', 'forum_topic', array('nid', 'tid')); -} - -/** - * Create new {forum_index} table. - */ -function forum_update_7001() { - $forum_index = array( - 'description' => 'Maintains denormalized information about node/term relationships.', - 'fields' => array( - 'nid' => array( - 'description' => 'The {node}.nid this record tracks.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'title' => array( - 'description' => 'The title of this node, always treated as non-markup plain text.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - 'tid' => array( - 'description' => 'The term ID.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'sticky' => array( - 'description' => 'Boolean indicating whether the node is sticky.', - 'type' => 'int', - 'not null' => FALSE, - 'default' => 0, - 'size' => 'tiny', - ), - 'created' => array( - 'description' => 'The Unix timestamp when the node was created.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default'=> 0, - ), - 'last_comment_timestamp' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.timestamp.', - ), - 'comment_count' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The total number of comments on this node.', - ), - ), - 'indexes' => array( - 'forum_topics' => array('tid', 'sticky', 'last_comment_timestamp'), - ), - 'foreign keys' => array( - 'tracked_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - 'term' => array( - 'table' => 'taxonomy_term_data', - 'columns' => array( - 'tid' => 'tid', - ), - ), - ), - ); - db_create_table('forum_index', $forum_index); - - $select = db_select('node', 'n'); - $forum_alias = $select->join('forum', 'f', 'n.vid = f.vid'); - $ncs_alias = $select->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid'); - $select - ->fields('n', array('nid', 'title', 'sticky', 'created')) - ->fields($forum_alias, array('tid')) - ->fields($ncs_alias, array('last_comment_timestamp', 'comment_count')); - - db_insert('forum_index') - ->fields(array('nid', 'title', 'sticky', 'created', 'tid', 'last_comment_timestamp', 'comment_count')) - ->from($select) - ->execute(); -} - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Add new index to forum_index table. - */ -function forum_update_7002() { - db_drop_index('forum_index', 'forum_topics'); - db_add_index('forum_index', 'forum_topics', array('nid', 'tid', 'sticky', 'last_comment_timestamp')); -} - -/** - * Rename field to 'taxonomy_forums'. - */ -function forum_update_7003() { - $messages = array(); - - $new_field_name = 'taxonomy_forums'; - - // Test to see if the taxonomy_forums field exists. - $fields = _update_7000_field_read_fields(array('field_name' => $new_field_name)); - if ($fields) { - // Since the field exists, we're done. - return; - } - - // Calculate the old field name. - $vid = variable_get('forum_nav_vocabulary', 0); - $vocabulary_machine_name = db_select('taxonomy_vocabulary', 'tv') - ->fields('tv', array('machine_name')) - ->condition('vid', $vid) - ->execute() - ->fetchField(); - $old_field_name = 'taxonomy_' . $vocabulary_machine_name; - - // Read the old fields. - $old_fields = _update_7000_field_read_fields(array('field_name' => $old_field_name)); - foreach ($old_fields as $old_field) { - if ($old_field['storage']['type'] != 'field_sql_storage') { - $messages[] = t('Cannot rename field %id (%old_field_name) to %new_field_name because it does not use the field_sql_storage storage type.', array( - '%id' => $old_field['id'], - '%old_field_name' => $old_field_name, - '%new_field_name' => $new_field_name, - )); - continue; - } - - // Update {field_config}. - db_update('field_config') - ->fields(array('field_name' => $new_field_name)) - ->condition('id', $old_field['id']) - ->execute(); - - // Update {field_config_instance}. - db_update('field_config_instance') - ->fields(array('field_name' => $new_field_name)) - ->condition('field_id', $old_field['id']) - ->execute(); - - // The tables that need updating in the form 'old_name' => 'new_name'. - $tables = array( - 'field_data_' . $old_field_name => 'field_data_' . $new_field_name, - 'field_revision_' . $old_field_name => 'field_revision_' . $new_field_name, - ); - foreach ($tables as $old_table => $new_table) { - $old_column_name = $old_field_name . '_tid'; - $new_column_name = $new_field_name . '_tid'; - - // Rename the column. - db_drop_index($old_table, $old_column_name); - db_change_field($old_table, $old_column_name, $new_column_name, array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => FALSE, - )); - db_drop_index($old_table, $new_column_name); - db_add_index($old_table, $new_column_name, array($new_column_name)); - - // Rename the table. - db_rename_table($old_table, $new_table); - } - } - - cache_clear_all('*', 'cache_field', TRUE); - - return $messages; -} - -/** - * Update {forum_index} so that only published nodes are indexed. - */ -function forum_update_7011() { - $select = db_select('node', 'n') - ->fields('n', array('nid')) - ->condition('status', 0 ); - - db_delete('forum_index') - ->condition('nid', $select, 'IN') - ->execute(); -} - -/** - * Add 'created' and 'last_comment_timestamp' indexes. - */ -function forum_update_7012() { - db_add_index('forum_index', 'created', array('created')); - db_add_index('forum_index', 'last_comment_timestamp', array('last_comment_timestamp')); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ diff --git a/modules/forum/forum.module b/modules/forum/forum.module deleted file mode 100644 index 575de36..0000000 --- a/modules/forum/forum.module +++ /dev/null @@ -1,1396 +0,0 @@ -' . t('About') . ''; - $output .= '- - - - - - - -icon; ?> -- - moved): ?> -- title; ?> --- created; ?> --message; ?> - -- comment_count; ?> - new_replies): ?> - -
- new_text; ?> - -last_reply; ?> - -' . t('The Forum module lets you create threaded discussion forums with functionality similar to other message board systems. Forums are useful because they allow community members to discuss topics with one another while ensuring those conversations are archived for later reference. In a forum, users post topics and threads in nested hierarchies, allowing discussions to be categorized and grouped. The forum hierarchy consists of:') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Optional containers (for example, Support), which can hold:') . ' '; - $output .= '
- ' . t('Forums (for example, Installing Drupal), which can hold:') . ' '; - $output .= '
- ' . t('Forum topics submitted by users (for example, How to start a Drupal 6 Multisite), which start discussions and are starting points for:') . ' '; - $output .= '
- ' . t('Threaded comments submitted by users (for example, You have these options...).') . ' '; - $output .= '
' . t('For more information, see the online handbook entry for Forum module.', array('@forum' => 'http://drupal.org/documentation/modules/forum')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Setting up forum structure') . ' '; - $output .= '
- ' . t('Visit the Forums page to set up containers and forums to hold your discussion topics.', array('@forums' => url('admin/structure/forum'))) . ' '; - $output .= '
- ' . t('Starting a discussion') . ' '; - $output .= '
- ' . t('The Forum topic link on the Add new content page creates the first post of a new threaded discussion, or thread.', array('@create-topic' => url('node/add/forum'), '@content-add' => url('node/add'))) . ' '; - $output .= '
- ' . t('Navigation') . ' '; - $output .= '
- ' . t('Enabling the Forum module provides a default Forums menu item in the navigation menu that links to the Forums page.', array('@forums' => url('forum'))) . ' '; - $output .= '
- ' . t('Moving forum topics') . ' '; - $output .= '
- ' . t('A forum topic (and all of its comments) may be moved between forums by selecting a different forum while editing a forum topic. When moving a forum topic between forums, the Leave shadow copy option creates a link in the original forum pointing to the new location.') . ' '; - $output .= '
- ' . t('Locking and disabling comments') . ' '; - $output .= '
- ' . t('Selecting Closed under Comment settings while editing a forum topic will lock (prevent new comments on) the thread. Selecting Hidden under Comment settings while editing a forum topic will hide all existing comments on the thread, and prevent new ones.') . ' '; - $output .= '
' . t('Forums contain forum topics. Use containers to group related forums.') . '
'; - $output .= theme('more_help_link', array('url' => 'admin/help/forum')); - return $output; - case 'admin/structure/forum/add/container': - return '' . t('Use containers to group related forums.') . '
'; - case 'admin/structure/forum/add/forum': - return '' . t('A forum holds related forum topics.') . '
'; - case 'admin/structure/forum/settings': - return '' . t('Adjust the display of your forum topics. Organize the forums on the forum structure page.', array('@forum-structure' => url('admin/structure/forum'))) . '
'; - } -} - -/** - * Implements hook_theme(). - */ -function forum_theme() { - return array( - 'forums' => array( - 'template' => 'forums', - 'variables' => array('forums' => NULL, 'topics' => NULL, 'parents' => NULL, 'tid' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL), - ), - 'forum_list' => array( - 'template' => 'forum-list', - 'variables' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL), - ), - 'forum_topic_list' => array( - 'template' => 'forum-topic-list', - 'variables' => array('tid' => NULL, 'topics' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL), - ), - 'forum_icon' => array( - 'template' => 'forum-icon', - 'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE), - ), - 'forum_submitted' => array( - 'template' => 'forum-submitted', - 'variables' => array('topic' => NULL), - ), - 'forum_form' => array( - 'render element' => 'form', - 'file' => 'forum.admin.inc', - ), - ); -} - -/** - * Implements hook_menu(). - */ -function forum_menu() { - $items['forum'] = array( - 'title' => 'Forums', - 'page callback' => 'forum_page', - 'access arguments' => array('access content'), - 'file' => 'forum.pages.inc', - ); - $items['forum/%forum_forum'] = array( - 'title' => 'Forums', - 'page callback' => 'forum_page', - 'page arguments' => array(1), - 'access arguments' => array('access content'), - 'file' => 'forum.pages.inc', - ); - $items['admin/structure/forum'] = array( - 'title' => 'Forums', - 'description' => 'Control forum hierarchy settings.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('forum_overview'), - 'access arguments' => array('administer forums'), - 'file' => 'forum.admin.inc', - ); - $items['admin/structure/forum/list'] = array( - 'title' => 'List', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['admin/structure/forum/add/container'] = array( - 'title' => 'Add container', - 'page callback' => 'forum_form_main', - 'page arguments' => array('container'), - 'access arguments' => array('administer forums'), - 'type' => MENU_LOCAL_ACTION, - 'parent' => 'admin/structure/forum', - 'file' => 'forum.admin.inc', - ); - $items['admin/structure/forum/add/forum'] = array( - 'title' => 'Add forum', - 'page callback' => 'forum_form_main', - 'page arguments' => array('forum'), - 'access arguments' => array('administer forums'), - 'type' => MENU_LOCAL_ACTION, - 'parent' => 'admin/structure/forum', - 'file' => 'forum.admin.inc', - ); - $items['admin/structure/forum/settings'] = array( - 'title' => 'Settings', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('forum_admin_settings'), - 'access arguments' => array('administer forums'), - 'weight' => 5, - 'type' => MENU_LOCAL_TASK, - 'parent' => 'admin/structure/forum', - 'file' => 'forum.admin.inc', - ); - $items['admin/structure/forum/edit/container/%taxonomy_term'] = array( - 'title' => 'Edit container', - 'page callback' => 'forum_form_main', - 'page arguments' => array('container', 5), - 'access arguments' => array('administer forums'), - 'file' => 'forum.admin.inc', - ); - $items['admin/structure/forum/edit/forum/%taxonomy_term'] = array( - 'title' => 'Edit forum', - 'page callback' => 'forum_form_main', - 'page arguments' => array('forum', 5), - 'access arguments' => array('administer forums'), - 'file' => 'forum.admin.inc', - ); - return $items; -} - -/** - * Implements hook_menu_local_tasks_alter(). - */ -function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) { - global $user; - - // Add action link to 'node/add/forum' on 'forum' sub-pages. - if ($root_path == 'forum' || $root_path == 'forum/%') { - $tid = (isset($router_item['page_arguments'][0]) ? $router_item['page_arguments'][0]->tid : 0); - $forum_term = forum_forum_load($tid); - if ($forum_term) { - $links = array(); - // Loop through all bundles for forum taxonomy vocabulary field. - $field = field_info_field('taxonomy_forums'); - foreach ($field['bundles']['node'] as $type) { - if (node_access('create', $type)) { - $links[$type] = array( - '#theme' => 'menu_local_action', - '#link' => array( - 'title' => t('Add new @node_type', array('@node_type' => node_type_get_name($type))), - 'href' => 'node/add/' . str_replace('_', '-', $type) . '/' . $forum_term->tid, - ), - ); - } - } - if (empty($links)) { - // Authenticated user does not have access to create new topics. - if ($user->uid) { - $links['disallowed'] = array( - '#theme' => 'menu_local_action', - '#link' => array( - 'title' => t('You are not allowed to post new content in the forum.'), - ), - ); - } - // Anonymous user does not have access to create new topics. - else { - $links['login'] = array( - '#theme' => 'menu_local_action', - '#link' => array( - 'title' => t('Log in to post new content in the forum.', array( - '@login' => url('user/login', array('query' => drupal_get_destination())), - )), - 'localized_options' => array('html' => TRUE), - ), - ); - } - } - $data['actions']['output'] = array_merge($data['actions']['output'], $links); - } - } -} - -/** - * Implements hook_entity_info_alter(). - */ -function forum_entity_info_alter(&$info) { - // Take over URI construction for taxonomy terms that are forums. - if ($vid = variable_get('forum_nav_vocabulary', 0)) { - // Within hook_entity_info(), we can't invoke entity_load() as that would - // cause infinite recursion, so we call taxonomy_vocabulary_get_names() - // instead of taxonomy_vocabulary_load(). All we need is the machine name - // of $vid, so retrieving and iterating all the vocabulary names is somewhat - // inefficient, but entity info is cached across page requests, and an - // iteration of all vocabularies once per cache clearing isn't a big deal, - // and is done as part of taxonomy_entity_info() anyway. - foreach (taxonomy_vocabulary_get_names() as $machine_name => $vocabulary) { - if ($vid == $vocabulary->vid) { - $info['taxonomy_term']['bundles'][$machine_name]['uri callback'] = 'forum_uri'; - } - } - } -} - -/** - * Implements callback_entity_info_uri(). - * - * Entity URI callback used in forum_entity_info_alter(). - */ -function forum_uri($forum) { - return array( - 'path' => 'forum/' . $forum->tid, - ); -} - -/** - * Checks whether a node can be used in a forum, based on its content type. - * - * @param $node - * A node object. - * - * @return - * Boolean indicating if the node can be assigned to a forum. - */ -function _forum_node_check_node_type($node) { - // Fetch information about the forum field. - $field = field_info_instance('node', 'taxonomy_forums', $node->type); - - return is_array($field); -} - -/** - * Implements hook_node_view(). - */ -function forum_node_view($node, $view_mode) { - $vid = variable_get('forum_nav_vocabulary', 0); - $vocabulary = taxonomy_vocabulary_load($vid); - if (_forum_node_check_node_type($node)) { - if ($view_mode == 'full' && node_is_page($node)) { - // Breadcrumb navigation - $breadcrumb[] = l(t('Home'), NULL); - $breadcrumb[] = l($vocabulary->name, 'forum'); - if ($parents = taxonomy_get_parents_all($node->forum_tid)) { - $parents = array_reverse($parents); - foreach ($parents as $parent) { - $breadcrumb[] = l($parent->name, 'forum/' . $parent->tid); - } - } - drupal_set_breadcrumb($breadcrumb); - - } - } -} - -/** - * Implements hook_node_validate(). - * - * Checks in particular that the node is assigned only a "leaf" term in the - * forum taxonomy. - */ -function forum_node_validate($node, $form) { - if (_forum_node_check_node_type($node)) { - $langcode = $form['taxonomy_forums']['#language']; - // vocabulary is selected, not a "container" term. - if (!empty($node->taxonomy_forums[$langcode])) { - // Extract the node's proper topic ID. - $containers = variable_get('forum_containers', array()); - foreach ($node->taxonomy_forums[$langcode] as $delta => $item) { - // If no term was selected (e.g. when no terms exist yet), remove the - // item. - if (empty($item['tid'])) { - unset($node->taxonomy_forums[$langcode][$delta]); - continue; - } - $term = taxonomy_term_load($item['tid']); - if (!$term) { - form_set_error('taxonomy_forums', t('Select a forum.')); - continue; - } - $used = db_query_range('SELECT 1 FROM {taxonomy_term_data} WHERE tid = :tid AND vid = :vid',0 , 1, array( - ':tid' => $term->tid, - ':vid' => $term->vid, - ))->fetchField(); - if ($used && in_array($term->tid, $containers)) { - form_set_error('taxonomy_forums', t('The item %forum is a forum container, not a forum. Select one of the forums below instead.', array('%forum' => $term->name))); - } - } - } - } -} - -/** - * Implements hook_node_presave(). - * - * Assigns the forum taxonomy when adding a topic from within a forum. - */ -function forum_node_presave($node) { - if (_forum_node_check_node_type($node)) { - // Make sure all fields are set properly: - $node->icon = !empty($node->icon) ? $node->icon : ''; - reset($node->taxonomy_forums); - $langcode = key($node->taxonomy_forums); - if (!empty($node->taxonomy_forums[$langcode])) { - $node->forum_tid = $node->taxonomy_forums[$langcode][0]['tid']; - if (isset($node->nid)) { - $old_tid = db_query_range("SELECT f.tid FROM {forum} f INNER JOIN {node} n ON f.vid = n.vid WHERE n.nid = :nid ORDER BY f.vid DESC", 0, 1, array(':nid' => $node->nid))->fetchField(); - if ($old_tid && isset($node->forum_tid) && ($node->forum_tid != $old_tid) && !empty($node->shadow)) { - // A shadow copy needs to be created. Retain new term and add old term. - $node->taxonomy_forums[$langcode][] = array('tid' => $old_tid); - } - } - } - } -} - -/** - * Implements hook_node_update(). - */ -function forum_node_update($node) { - if (_forum_node_check_node_type($node)) { - if (empty($node->revision) && db_query('SELECT tid FROM {forum} WHERE nid=:nid', array(':nid' => $node->nid))->fetchField()) { - if (!empty($node->forum_tid)) { - db_update('forum') - ->fields(array('tid' => $node->forum_tid)) - ->condition('vid', $node->vid) - ->execute(); - } - // The node is removed from the forum. - else { - db_delete('forum') - ->condition('nid', $node->nid) - ->execute(); - } - } - else { - if (!empty($node->forum_tid)) { - db_insert('forum') - ->fields(array( - 'tid' => $node->forum_tid, - 'vid' => $node->vid, - 'nid' => $node->nid, - )) - ->execute(); - } - } - // If the node has a shadow forum topic, update the record for this - // revision. - if (!empty($node->shadow)) { - db_delete('forum') - ->condition('nid', $node->nid) - ->condition('vid', $node->vid) - ->execute(); - db_insert('forum') - ->fields(array( - 'nid' => $node->nid, - 'vid' => $node->vid, - 'tid' => $node->forum_tid, - )) - ->execute(); - } - } -} - -/** - * Implements hook_node_insert(). - */ -function forum_node_insert($node) { - if (_forum_node_check_node_type($node)) { - if (!empty($node->forum_tid)) { - $nid = db_insert('forum') - ->fields(array( - 'tid' => $node->forum_tid, - 'vid' => $node->vid, - 'nid' => $node->nid, - )) - ->execute(); - } - } -} - -/** - * Implements hook_node_delete(). - */ -function forum_node_delete($node) { - if (_forum_node_check_node_type($node)) { - db_delete('forum') - ->condition('nid', $node->nid) - ->execute(); - db_delete('forum_index') - ->condition('nid', $node->nid) - ->execute(); - } -} - -/** - * Implements hook_node_load(). - */ -function forum_node_load($nodes) { - $node_vids = array(); - foreach ($nodes as $node) { - if (_forum_node_check_node_type($node)) { - $node_vids[] = $node->vid; - } - } - if (!empty($node_vids)) { - $query = db_select('forum', 'f'); - $query - ->fields('f', array('nid', 'tid')) - ->condition('f.vid', $node_vids); - $result = $query->execute(); - foreach ($result as $record) { - $nodes[$record->nid]->forum_tid = $record->tid; - } - } -} - -/** - * Implements hook_node_info(). - */ -function forum_node_info() { - return array( - 'forum' => array( - 'name' => t('Forum topic'), - 'base' => 'forum', - 'description' => t('A forum topic starts a new discussion thread within a forum.'), - 'title_label' => t('Subject'), - ) - ); -} - -/** - * Implements hook_permission(). - */ -function forum_permission() { - $perms = array( - 'administer forums' => array( - 'title' => t('Administer forums'), - ), - ); - return $perms; -} - -/** - * Implements hook_taxonomy_term_delete(). - */ -function forum_taxonomy_term_delete($term) { - // For containers, remove the tid from the forum_containers variable. - $containers = variable_get('forum_containers', array()); - $key = array_search($term->tid, $containers); - if ($key !== FALSE) { - unset($containers[$key]); - } - variable_set('forum_containers', $containers); -} - -/** - * Implements hook_comment_publish(). - * - * This actually handles the insertion and update of published nodes since - * comment_save() calls hook_comment_publish() for all published comments. - */ -function forum_comment_publish($comment) { - _forum_update_forum_index($comment->nid); -} - -/** - * Implements hook_comment_update(). - * - * The Comment module doesn't call hook_comment_unpublish() when saving - * individual comments, so we need to check for those here. - */ -function forum_comment_update($comment) { - // comment_save() calls hook_comment_publish() for all published comments, - // so we need to handle all other values here. - if (!$comment->status) { - _forum_update_forum_index($comment->nid); - } -} - -/** - * Implements hook_comment_unpublish(). - */ -function forum_comment_unpublish($comment) { - _forum_update_forum_index($comment->nid); -} - -/** - * Implements hook_comment_delete(). - */ -function forum_comment_delete($comment) { - _forum_update_forum_index($comment->nid); -} - -/** - * Implements hook_field_storage_pre_insert(). - */ -function forum_field_storage_pre_insert($entity_type, $entity, &$skip_fields) { - if ($entity_type == 'node' && $entity->status && _forum_node_check_node_type($entity)) { - $query = db_insert('forum_index')->fields(array('nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp')); - foreach ($entity->taxonomy_forums as $language) { - foreach ($language as $item) { - $query->values(array( - 'nid' => $entity->nid, - 'title' => $entity->title, - 'tid' => $item['tid'], - 'sticky' => $entity->sticky, - 'created' => $entity->created, - 'comment_count' => 0, - 'last_comment_timestamp' => $entity->created, - )); - } - } - $query->execute(); - } -} - -/** - * Implements hook_field_storage_pre_update(). - */ -function forum_field_storage_pre_update($entity_type, $entity, &$skip_fields) { - $first_call = &drupal_static(__FUNCTION__, array()); - - if ($entity_type == 'node' && _forum_node_check_node_type($entity)) { - - // If the node is published, update the forum index. - if ($entity->status) { - - // We don't maintain data for old revisions, so clear all previous values - // from the table. Since this hook runs once per field, per object, make - // sure we only wipe values once. - if (!isset($first_call[$entity->nid])) { - $first_call[$entity->nid] = FALSE; - db_delete('forum_index')->condition('nid', $entity->nid)->execute(); - } - $query = db_insert('forum_index')->fields(array('nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp')); - foreach ($entity->taxonomy_forums as $language) { - foreach ($language as $item) { - $query->values(array( - 'nid' => $entity->nid, - 'title' => $entity->title, - 'tid' => $item['tid'], - 'sticky' => $entity->sticky, - 'created' => $entity->created, - 'comment_count' => 0, - 'last_comment_timestamp' => $entity->created, - )); - } - } - $query->execute(); - // The logic for determining last_comment_count is fairly complex, so - // call _forum_update_forum_index() too. - _forum_update_forum_index($entity->nid); - } - - // When a forum node is unpublished, remove it from the forum_index table. - else { - db_delete('forum_index')->condition('nid', $entity->nid)->execute(); - } - - } -} - -/** - * Implements hook_form_FORM_ID_alter() for taxonomy_form_vocabulary(). - */ -function forum_form_taxonomy_form_vocabulary_alter(&$form, &$form_state, $form_id) { - $vid = variable_get('forum_nav_vocabulary', 0); - if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) { - $form['help_forum_vocab'] = array( - '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'), - '#weight' => -1, - ); - // Forum's vocabulary always has single hierarchy. Forums and containers - // have only one parent or no parent for root items. By default this value - // is 0. - $form['hierarchy']['#value'] = 1; - // Do not allow to delete forum's vocabulary. - $form['actions']['delete']['#access'] = FALSE; - } -} - -/** - * Implements hook_form_FORM_ID_alter() for taxonomy_form_term(). - */ -function forum_form_taxonomy_form_term_alter(&$form, &$form_state, $form_id) { - $vid = variable_get('forum_nav_vocabulary', 0); - if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) { - // Hide multiple parents select from forum terms. - $form['relations']['parent']['#access'] = FALSE; - } -} - -/** - * Implements hook_form_BASE_FORM_ID_alter() for node_form(). - */ -function forum_form_node_form_alter(&$form, &$form_state, $form_id) { - if (isset($form['taxonomy_forums'])) { - $langcode = $form['taxonomy_forums']['#language']; - // Make the vocabulary required for 'real' forum-nodes. - $form['taxonomy_forums'][$langcode]['#required'] = TRUE; - $form['taxonomy_forums'][$langcode]['#multiple'] = FALSE; - if (empty($form['taxonomy_forums'][$langcode]['#default_value'])) { - // If there is no default forum already selected, try to get the forum - // ID from the URL (e.g., if we are on a page like node/add/forum/2, we - // expect "2" to be the ID of the forum that was requested). - $requested_forum_id = arg(3); - $form['taxonomy_forums'][$langcode]['#default_value'] = is_numeric($requested_forum_id) ? $requested_forum_id : ''; - } - } -} - -/** - * Implements hook_block_info(). - */ -function forum_block_info() { - $blocks['active'] = array( - 'info' => t('Active forum topics'), - 'cache' => DRUPAL_CACHE_CUSTOM, - 'properties' => array('administrative' => TRUE), - ); - $blocks['new'] = array( - 'info' => t('New forum topics'), - 'cache' => DRUPAL_CACHE_CUSTOM, - 'properties' => array('administrative' => TRUE), - ); - return $blocks; -} - -/** - * Implements hook_block_configure(). - */ -function forum_block_configure($delta = '') { - $form['forum_block_num_' . $delta] = array( - '#type' => 'select', - '#title' => t('Number of topics'), - '#default_value' => variable_get('forum_block_num_' . $delta, '5'), - '#options' => drupal_map_assoc(range(2, 20)) - ); - return $form; -} - -/** - * Implements hook_block_save(). - */ -function forum_block_save($delta = '', $edit = array()) { - variable_set('forum_block_num_' . $delta, $edit['forum_block_num_' . $delta]); -} - -/** - * Implements hook_block_view(). - * - * Generates a block containing the currently active forum topics and the most - * recently added forum topics. - */ -function forum_block_view($delta = '') { - $query = db_select('forum_index', 'f') - ->fields('f') - ->addTag('node_access'); - switch ($delta) { - case 'active': - $title = t('Active forum topics'); - $query - ->orderBy('f.last_comment_timestamp', 'DESC') - ->range(0, variable_get('forum_block_num_active', '5')); - break; - - case 'new': - $title = t('New forum topics'); - $query - ->orderBy('f.created', 'DESC') - ->range(0, variable_get('forum_block_num_new', '5')); - break; - } - - $block['subject'] = $title; - // Cache based on the altered query. Enables us to cache with node access enabled. - $block['content'] = drupal_render_cache_by_query($query, 'forum_block_view'); - $block['content']['#access'] = user_access('access content'); - return $block; -} - -/** - * Render API callback: Lists nodes based on the element's #query property. - * - * This function can be used as a #pre_render callback. - * - * @see forum_block_view() - */ -function forum_block_view_pre_render($elements) { - $result = $elements['#query']->execute(); - if ($node_title_list = node_title_list($result)) { - $elements['forum_list'] = $node_title_list; - $elements['forum_more'] = array('#theme' => 'more_link', '#url' => 'forum', '#title' => t('Read the latest forum topics.')); - } - return $elements; -} - -/** - * Implements hook_form(). - */ -function forum_form($node, $form_state) { - $type = node_type_get_type($node); - $form['title'] = array( - '#type' => 'textfield', - '#title' => check_plain($type->title_label), - '#default_value' => !empty($node->title) ? $node->title : '', - '#required' => TRUE, '#weight' => -5 - ); - - if (!empty($node->nid)) { - $forum_terms = $node->taxonomy_forums; - // If editing, give option to leave shadows. - $shadow = (count($forum_terms) > 1); - $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.')); - $form['forum_tid'] = array('#type' => 'value', '#value' => $node->forum_tid); - } - - return $form; -} - -/** - * Returns a tree of all forums for a given taxonomy term ID. - * - * @param $tid - * (optional) Taxonomy term ID of the forum. If not given all forums will be - * returned. - * - * @return - * A tree of taxonomy objects, with the following additional properties: - * - num_topics: Number of topics in the forum. - * - num_posts: Total number of posts in all topics. - * - last_post: Most recent post for the forum. - * - forums: An array of child forums. - */ -function forum_forum_load($tid = NULL) { - $cache = &drupal_static(__FUNCTION__, array()); - - // Return a cached forum tree if available. - if (!isset($tid)) { - $tid = 0; - } - if (isset($cache[$tid])) { - return $cache[$tid]; - } - - $vid = variable_get('forum_nav_vocabulary', 0); - - // Load and validate the parent term. - if ($tid) { - $forum_term = taxonomy_term_load($tid); - if (!$forum_term || ($forum_term->vid != $vid)) { - return $cache[$tid] = FALSE; - } - } - // If $tid is 0, create an empty object to hold the child terms. - elseif ($tid === 0) { - $forum_term = (object) array( - 'tid' => 0, - ); - } - - // Determine if the requested term is a container. - if (!$forum_term->tid || in_array($forum_term->tid, variable_get('forum_containers', array()))) { - $forum_term->container = 1; - } - - // Load parent terms. - $forum_term->parents = taxonomy_get_parents_all($forum_term->tid); - - // Load the tree below. - $forums = array(); - $_forums = taxonomy_get_tree($vid, $tid); - - if (count($_forums)) { - $query = db_select('node', 'n'); - $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid'); - $query->join('forum', 'f', 'n.vid = f.vid'); - $query->addExpression('COUNT(n.nid)', 'topic_count'); - $query->addExpression('SUM(ncs.comment_count)', 'comment_count'); - $counts = $query - ->fields('f', array('tid')) - ->condition('n.status', 1) - ->groupBy('tid') - ->addTag('node_access') - ->execute() - ->fetchAllAssoc('tid'); - } - - foreach ($_forums as $forum) { - // Determine if the child term is a container. - if (in_array($forum->tid, variable_get('forum_containers', array()))) { - $forum->container = 1; - } - - // Merge in the topic and post counters. - if (!empty($counts[$forum->tid])) { - $forum->num_topics = $counts[$forum->tid]->topic_count; - $forum->num_posts = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count; - } - else { - $forum->num_topics = 0; - $forum->num_posts = 0; - } - - // Query "Last Post" information for this forum. - $query = db_select('node', 'n'); - $query->join('users', 'u1', 'n.uid = u1.uid'); - $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $forum->tid)); - $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid'); - $query->join('users', 'u2', 'ncs.last_comment_uid = u2.uid'); - $query->addExpression('CASE ncs.last_comment_uid WHEN 0 THEN ncs.last_comment_name ELSE u2.name END', 'last_comment_name'); - - $topic = $query - ->fields('ncs', array('last_comment_timestamp', 'last_comment_uid')) - ->condition('n.status', 1) - ->orderBy('last_comment_timestamp', 'DESC') - ->range(0, 1) - ->addTag('node_access') - ->execute() - ->fetchObject(); - - // Merge in the "Last Post" information. - $last_post = new stdClass(); - if (!empty($topic->last_comment_timestamp)) { - $last_post->created = $topic->last_comment_timestamp; - $last_post->name = $topic->last_comment_name; - $last_post->uid = $topic->last_comment_uid; - } - $forum->last_post = $last_post; - - $forums[$forum->tid] = $forum; - } - - // Cache the result, and return the tree. - $forum_term->forums = $forums; - $cache[$tid] = $forum_term; - return $forum_term; -} - -/** - * Calculates the number of new posts in a forum that the user has not yet read. - * - * Nodes are new if they are newer than NODE_NEW_LIMIT. - * - * @param $term - * The term ID of the forum. - * @param $uid - * The user ID. - * - * @return - * The number of new posts in the forum that have not been read by the user. - */ -function _forum_topics_unread($term, $uid) { - $query = db_select('node', 'n'); - $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $term)); - $query->leftJoin('history', 'h', 'n.nid = h.nid AND h.uid = :uid', array(':uid' => $uid)); - $query->addExpression('COUNT(n.nid)', 'count'); - return $query - ->condition('status', 1) - ->condition('n.created', NODE_NEW_LIMIT, '>') - ->isNull('h.nid') - ->addTag('node_access') - ->execute() - ->fetchField(); -} - -/** - * Gets all the topics in a forum. - * - * @param $tid - * The term ID of the forum. - * @param $sortby - * One of the following integers indicating the sort criteria: - * - 1: Date - newest first. - * - 2: Date - oldest first. - * - 3: Posts with the most comments first. - * - 4: Posts with the least comments first. - * @param $forum_per_page - * The maximum number of topics to display per page. - * - * @return - * A list of all the topics in a forum. - */ -function forum_get_topics($tid, $sortby, $forum_per_page) { - global $user, $forum_topic_list_header; - - $forum_topic_list_header = array( - NULL, - array('data' => t('Topic'), 'field' => 'f.title'), - array('data' => t('Replies'), 'field' => 'f.comment_count'), - array('data' => t('Last reply'), 'field' => 'f.last_comment_timestamp'), - ); - - $order = _forum_get_topic_order($sortby); - for ($i = 0; $i < count($forum_topic_list_header); $i++) { - if ($forum_topic_list_header[$i]['field'] == $order['field']) { - $forum_topic_list_header[$i]['sort'] = $order['sort']; - } - } - - $query = db_select('forum_index', 'f')->extend('PagerDefault')->extend('TableSort'); - $query->fields('f'); - $query - ->condition('f.tid', $tid) - ->addTag('node_access') - ->orderBy('f.sticky', 'DESC') - ->orderByHeader($forum_topic_list_header) - ->limit($forum_per_page); - - $count_query = db_select('forum_index', 'f'); - $count_query->condition('f.tid', $tid); - $count_query->addExpression('COUNT(*)'); - $count_query->addTag('node_access'); - - $query->setCountQuery($count_query); - $result = $query->execute(); - $nids = array(); - foreach ($result as $record) { - $nids[] = $record->nid; - } - if ($nids) { - $query = db_select('node', 'n')->extend('TableSort'); - $query->fields('n', array('title', 'nid', 'type', 'sticky', 'created', 'uid')); - $query->addField('n', 'comment', 'comment_mode'); - - $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid'); - $query->fields('ncs', array('cid', 'last_comment_uid', 'last_comment_timestamp', 'comment_count')); - - $query->join('forum_index', 'f', 'f.nid = ncs.nid'); - $query->addField('f', 'tid', 'forum_tid'); - - $query->join('users', 'u', 'n.uid = u.uid'); - $query->addField('u', 'name'); - - $query->join('users', 'u2', 'ncs.last_comment_uid = u2.uid'); - - $query->addExpression('CASE ncs.last_comment_uid WHEN 0 THEN ncs.last_comment_name ELSE u2.name END', 'last_comment_name'); - - $query - ->orderBy('f.sticky', 'DESC') - ->orderByHeader($forum_topic_list_header) - ->condition('n.nid', $nids); - - $result = $query->execute(); - } - else { - $result = array(); - } - - $topics = array(); - $first_new_found = FALSE; - foreach ($result as $topic) { - if ($user->uid) { - // A forum is new if the topic is new, or if there are new comments since - // the user's last visit. - if ($topic->forum_tid != $tid) { - $topic->new = 0; - } - else { - $history = _forum_user_last_visit($topic->nid); - $topic->new_replies = comment_num_new($topic->nid, $history); - $topic->new = $topic->new_replies || ($topic->last_comment_timestamp > $history); - } - } - else { - // Do not track "new replies" status for topics if the user is anonymous. - $topic->new_replies = 0; - $topic->new = 0; - } - - // Make sure only one topic is indicated as the first new topic. - $topic->first_new = FALSE; - if ($topic->new != 0 && !$first_new_found) { - $topic->first_new = TRUE; - $first_new_found = TRUE; - } - - if ($topic->comment_count > 0) { - $last_reply = new stdClass(); - $last_reply->created = $topic->last_comment_timestamp; - $last_reply->name = $topic->last_comment_name; - $last_reply->uid = $topic->last_comment_uid; - $topic->last_reply = $last_reply; - } - $topics[] = $topic; - } - - return $topics; -} - -/** - * Preprocesses variables for forums.tpl.php. - * - * @param $variables - * An array containing the following elements: - * - forums: An array of all forum objects to display for the given taxonomy - * term ID. If tid = 0 then all the top-level forums are displayed. - * - topics: An array of all the topics in the current forum. - * - parents: An array of taxonomy term objects that are ancestors of the - * current term ID. - * - tid: Taxonomy term ID of the current forum. - * - sortby: One of the following integers indicating the sort criteria: - * - 1: Date - newest first. - * - 2: Date - oldest first. - * - 3: Posts with the most comments first. - * - 4: Posts with the least comments first. - * - forum_per_page: The maximum number of topics to display per page. - * - * @see forums.tpl.php - */ -function template_preprocess_forums(&$variables) { - global $user; - - $vid = variable_get('forum_nav_vocabulary', 0); - $vocabulary = taxonomy_vocabulary_load($vid); - $title = !empty($vocabulary->name) ? $vocabulary->name : ''; - - // Breadcrumb navigation: - $breadcrumb[] = l(t('Home'), NULL); - if ($variables['tid']) { - $breadcrumb[] = l($vocabulary->name, 'forum'); - } - if ($variables['parents']) { - $variables['parents'] = array_reverse($variables['parents']); - foreach ($variables['parents'] as $p) { - if ($p->tid == $variables['tid']) { - $title = $p->name; - } - else { - $breadcrumb[] = l($p->name, 'forum/' . $p->tid); - } - } - } - drupal_set_breadcrumb($breadcrumb); - drupal_set_title($title); - - if ($variables['forums_defined'] = count($variables['forums']) || count($variables['parents'])) { - if (!empty($variables['forums'])) { - $variables['forums'] = theme('forum_list', $variables); - } - else { - $variables['forums'] = ''; - } - - if ($variables['tid'] && !in_array($variables['tid'], variable_get('forum_containers', array()))) { - $variables['topics'] = theme('forum_topic_list', $variables); - drupal_add_feed('taxonomy/term/' . $variables['tid'] . '/feed', 'RSS - ' . $title); - } - else { - $variables['topics'] = ''; - } - - // Provide separate template suggestions based on what's being output. Topic id is also accounted for. - // Check both variables to be safe then the inverse. Forums with topic ID's take precedence. - if ($variables['forums'] && !$variables['topics']) { - $variables['theme_hook_suggestions'][] = 'forums__containers'; - $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; - $variables['theme_hook_suggestions'][] = 'forums__containers__' . $variables['tid']; - } - elseif (!$variables['forums'] && $variables['topics']) { - $variables['theme_hook_suggestions'][] = 'forums__topics'; - $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; - $variables['theme_hook_suggestions'][] = 'forums__topics__' . $variables['tid']; - } - else { - $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; - } - - } - else { - drupal_set_title(t('No forums defined')); - $variables['forums'] = ''; - $variables['topics'] = ''; - } -} - -/** - * Preprocesses variables for forum-list.tpl.php. - * - * @param $variables - * An array containing the following elements: - * - forums: An array of all forum objects to display for the given taxonomy - * term ID. If tid = 0 then all the top-level forums are displayed. - * - parents: An array of taxonomy term objects that are ancestors of the - * current term ID. - * - tid: Taxonomy term ID of the current forum. - * - * @see forum-list.tpl.php - * @see theme_forum_list() - */ -function template_preprocess_forum_list(&$variables) { - global $user; - $row = 0; - // Sanitize each forum so that the template can safely print the data. - foreach ($variables['forums'] as $id => $forum) { - $variables['forums'][$id]->description = !empty($forum->description) ? filter_xss_admin($forum->description) : ''; - $variables['forums'][$id]->link = url("forum/$forum->tid"); - $variables['forums'][$id]->name = check_plain($forum->name); - $variables['forums'][$id]->is_container = !empty($forum->container); - $variables['forums'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even'; - $row++; - - $variables['forums'][$id]->new_text = ''; - $variables['forums'][$id]->new_url = ''; - $variables['forums'][$id]->new_topics = 0; - $variables['forums'][$id]->old_topics = $forum->num_topics; - $variables['forums'][$id]->icon_class = 'default'; - $variables['forums'][$id]->icon_title = t('No new posts'); - if ($user->uid) { - $variables['forums'][$id]->new_topics = _forum_topics_unread($forum->tid, $user->uid); - if ($variables['forums'][$id]->new_topics) { - $variables['forums'][$id]->new_text = format_plural($variables['forums'][$id]->new_topics, '1 new', '@count new'); - $variables['forums'][$id]->new_url = url("forum/$forum->tid", array('fragment' => 'new')); - $variables['forums'][$id]->icon_class = 'new'; - $variables['forums'][$id]->icon_title = t('New posts'); - } - $variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics; - } - $variables['forums'][$id]->last_reply = theme('forum_submitted', array('topic' => $forum->last_post)); - } - // Give meaning to $tid for themers. $tid actually stands for term id. - $variables['forum_id'] = $variables['tid']; - unset($variables['tid']); -} - -/** - * Preprocesses variables for forum-topic-list.tpl.php. - * - * @param $variables - * An array containing the following elements: - * - tid: Taxonomy term ID of the current forum. - * - topics: An array of all the topics in the current forum. - * - forum_per_page: The maximum number of topics to display per page. - * - * @see forum-topic-list.tpl.php - * @see theme_forum_topic_list() - */ -function template_preprocess_forum_topic_list(&$variables) { - global $forum_topic_list_header; - - // Create the tablesorting header. - $ts = tablesort_init($forum_topic_list_header); - $header = ''; - foreach ($forum_topic_list_header as $cell) { - $cell = tablesort_header($cell, $forum_topic_list_header, $ts); - $header .= _theme_table_cell($cell, TRUE); - } - $variables['header'] = $header; - - if (!empty($variables['topics'])) { - $row = 0; - foreach ($variables['topics'] as $id => $topic) { - $variables['topics'][$id]->icon = theme('forum_icon', array('new_posts' => $topic->new, 'num_posts' => $topic->comment_count, 'comment_mode' => $topic->comment_mode, 'sticky' => $topic->sticky, 'first_new' => $topic->first_new)); - $variables['topics'][$id]->zebra = $row % 2 == 0 ? 'odd' : 'even'; - $row++; - - // We keep the actual tid in forum table, if it's different from the - // current tid then it means the topic appears in two forums, one of - // them is a shadow copy. - if ($variables['tid'] != $topic->forum_tid) { - $variables['topics'][$id]->moved = TRUE; - $variables['topics'][$id]->title = check_plain($topic->title); - $variables['topics'][$id]->message = l(t('This topic has been moved'), "forum/$topic->forum_tid"); - } - else { - $variables['topics'][$id]->moved = FALSE; - $variables['topics'][$id]->title = l($topic->title, "node/$topic->nid"); - $variables['topics'][$id]->message = ''; - } - $variables['topics'][$id]->created = theme('forum_submitted', array('topic' => $topic)); - $variables['topics'][$id]->last_reply = theme('forum_submitted', array('topic' => isset($topic->last_reply) ? $topic->last_reply : NULL)); - - $variables['topics'][$id]->new_text = ''; - $variables['topics'][$id]->new_url = ''; - if ($topic->new_replies) { - $variables['topics'][$id]->new_text = format_plural($topic->new_replies, '1 new', '@count new'); - $variables['topics'][$id]->new_url = url("node/$topic->nid", array('query' => comment_new_page_count($topic->comment_count, $topic->new_replies, $topic), 'fragment' => 'new')); - } - - } - } - else { - // Make this safe for the template. - $variables['topics'] = array(); - } - // Give meaning to $tid for themers. $tid actually stands for term id. - $variables['topic_id'] = $variables['tid']; - unset($variables['tid']); - - $variables['pager'] = theme('pager'); -} - -/** - * Preprocesses variables for forum-icon.tpl.php. - * - * @param $variables - * An array containing the following elements: - * - new_posts: Indicates whether or not the topic contains new posts. - * - num_posts: The total number of posts in all topics. - * - comment_mode: An integer indicating whether comments are open, closed, - * or hidden. - * - sticky: Indicates whether the topic is sticky. - * - first_new: Indicates whether this is the first topic with new posts. - * - * @see forum-icon.tpl.php - * @see theme_forum_icon() - */ -function template_preprocess_forum_icon(&$variables) { - $variables['hot_threshold'] = variable_get('forum_hot_topic', 15); - if ($variables['num_posts'] > $variables['hot_threshold']) { - $variables['icon_class'] = $variables['new_posts'] ? 'hot-new' : 'hot'; - $variables['icon_title'] = $variables['new_posts'] ? t('Hot topic, new comments') : t('Hot topic'); - } - else { - $variables['icon_class'] = $variables['new_posts'] ? 'new' : 'default'; - $variables['icon_title'] = $variables['new_posts'] ? t('New comments') : t('Normal topic'); - } - - if ($variables['comment_mode'] == COMMENT_NODE_CLOSED || $variables['comment_mode'] == COMMENT_NODE_HIDDEN) { - $variables['icon_class'] = 'closed'; - $variables['icon_title'] = t('Closed topic'); - } - - if ($variables['sticky'] == 1) { - $variables['icon_class'] = 'sticky'; - $variables['icon_title'] = t('Sticky topic'); - } -} - -/** - * Preprocesses variables for forum-submitted.tpl.php. - * - * The submission information will be displayed in the forum list and topic - * list. - * - * @param $variables - * An array containing the following elements: - * - topic: The topic object. - * - * @see forum-submitted.tpl.php - * @see theme_forum_submitted() - */ -function template_preprocess_forum_submitted(&$variables) { - $variables['author'] = isset($variables['topic']->uid) ? theme('username', array('account' => $variables['topic'])) : ''; - $variables['time'] = isset($variables['topic']->created) ? format_interval(REQUEST_TIME - $variables['topic']->created) : ''; -} - -/** - * Gets the last time the user viewed a node. - * - * @param $nid - * The node ID. - * - * @return - * The timestamp when the user last viewed this node, if the user has - * previously viewed the node; otherwise NODE_NEW_LIMIT. - */ -function _forum_user_last_visit($nid) { - global $user; - $history = &drupal_static(__FUNCTION__, array()); - - if (empty($history)) { - $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = :uid', array(':uid' => $user->uid)); - foreach ($result as $t) { - $history[$t->nid] = $t->timestamp > NODE_NEW_LIMIT ? $t->timestamp : NODE_NEW_LIMIT; - } - } - return isset($history[$nid]) ? $history[$nid] : NODE_NEW_LIMIT; -} - -/** - * Gets topic sorting information based on an integer code. - * - * @param $sortby - * One of the following integers indicating the sort criteria: - * - 1: Date - newest first. - * - 2: Date - oldest first. - * - 3: Posts with the most comments first. - * - 4: Posts with the least comments first. - * - * @return - * An array with the following values: - * - field: A field for an SQL query. - * - sort: 'asc' or 'desc'. - */ -function _forum_get_topic_order($sortby) { - switch ($sortby) { - case 1: - return array('field' => 'f.last_comment_timestamp', 'sort' => 'desc'); - break; - case 2: - return array('field' => 'f.last_comment_timestamp', 'sort' => 'asc'); - break; - case 3: - return array('field' => 'f.comment_count', 'sort' => 'desc'); - break; - case 4: - return array('field' => 'f.comment_count', 'sort' => 'asc'); - break; - } -} - -/** - * Updates the taxonomy index for a given node. - * - * @param $nid - * The ID of the node to update. - */ -function _forum_update_forum_index($nid) { - $count = db_query('SELECT COUNT(cid) FROM {comment} c INNER JOIN {forum_index} i ON c.nid = i.nid WHERE c.nid = :nid AND c.status = :status', array( - ':nid' => $nid, - ':status' => COMMENT_PUBLISHED, - ))->fetchField(); - - if ($count > 0) { - // Comments exist. - $last_reply = db_query_range('SELECT cid, name, created, uid FROM {comment} WHERE nid = :nid AND status = :status ORDER BY cid DESC', 0, 1, array( - ':nid' => $nid, - ':status' => COMMENT_PUBLISHED, - ))->fetchObject(); - db_update('forum_index') - ->fields( array( - 'comment_count' => $count, - 'last_comment_timestamp' => $last_reply->created, - )) - ->condition('nid', $nid) - ->execute(); - } - else { - // Comments do not exist. - $node = db_query('SELECT uid, created FROM {node} WHERE nid = :nid', array(':nid' => $nid))->fetchObject(); - db_update('forum_index') - ->fields( array( - 'comment_count' => 0, - 'last_comment_timestamp' => $node->created, - )) - ->condition('nid', $nid) - ->execute(); - } -} - -/** - * Implements hook_rdf_mapping(). - */ -function forum_rdf_mapping() { - return array( - array( - 'type' => 'node', - 'bundle' => 'forum', - 'mapping' => array( - 'rdftype' => array('sioc:Post', 'sioct:BoardPost'), - 'taxonomy_forums' => array( - 'predicates' => array('sioc:has_container'), - 'type' => 'rel', - ), - ), - ), - array( - 'type' => 'taxonomy_term', - 'bundle' => 'forums', - 'mapping' => array( - 'rdftype' => array('sioc:Container', 'sioc:Forum'), - ), - ), - ); -} diff --git a/modules/forum/forum.pages.inc b/modules/forum/forum.pages.inc deleted file mode 100644 index 8538310..0000000 --- a/modules/forum/forum.pages.inc +++ /dev/null @@ -1,37 +0,0 @@ -container)) { - $topics = forum_get_topics($forum_term->tid, $sortby, $forum_per_page); - } - else { - $topics = ''; - } - - return theme('forums', array('forums' => $forum_term->forums, 'topics' => $topics, 'parents' => $forum_term->parents, 'tid' => $forum_term->tid, 'sortby' => $sortby, 'forums_per_page' => $forum_per_page)); -} diff --git a/modules/forum/forum.test b/modules/forum/forum.test deleted file mode 100644 index bc68a3e..0000000 --- a/modules/forum/forum.test +++ /dev/null @@ -1,687 +0,0 @@ - 'Forum functionality', - 'description' => 'Create, view, edit, delete, and change forum entries and verify its consistency in the database.', - 'group' => 'Forum', - ); - } - - function setUp() { - parent::setUp('taxonomy', 'comment', 'forum'); - // Create users. - $this->admin_user = $this->drupalCreateUser(array( - 'access administration pages', - 'administer modules', - 'administer blocks', - 'administer forums', - 'administer menu', - 'administer taxonomy', - 'create forum content', - )); - $this->edit_any_topics_user = $this->drupalCreateUser(array( - 'access administration pages', - 'create forum content', - 'edit any forum content', - 'delete any forum content', - )); - $this->edit_own_topics_user = $this->drupalCreateUser(array( - 'create forum content', - 'edit own forum content', - 'delete own forum content', - )); - $this->web_user = $this->drupalCreateUser(array()); - } - - /** - * Tests disabling and re-enabling the Forum module. - */ - function testEnableForumField() { - $this->drupalLogin($this->admin_user); - - // Disable the Forum module. - $edit = array(); - $edit['modules[Core][forum][enable]'] = FALSE; - $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); - module_list(TRUE); - $this->assertFalse(module_exists('forum'), 'Forum module is not enabled.'); - - // Attempt to re-enable the Forum module and ensure it does not try to - // recreate the taxonomy_forums field. - $edit = array(); - $edit['modules[Core][forum][enable]'] = 'forum'; - $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); - module_list(TRUE); - $this->assertTrue(module_exists('forum'), 'Forum module is enabled.'); - } - - /** - * Tests forum functionality through the admin and user interfaces. - */ - function testForum() { - //Check that the basic forum install creates a default forum topic - $this->drupalGet("/forum"); - // Look for the "General discussion" default forum - $this->assertText(t("General discussion"), "Found the default forum at the /forum listing"); - - // Do the admin tests. - $this->doAdminTests($this->admin_user); - // Generate topics to populate the active forum block. - $this->generateForumTopics($this->forum); - - // Login an unprivileged user to view the forum topics and generate an - // active forum topics list. - $this->drupalLogin($this->web_user); - // Verify that this user is shown a message that they may not post content. - $this->drupalGet('forum/' . $this->forum['tid']); - $this->assertText(t('You are not allowed to post new content in the forum'), "Authenticated user without permission to post forum content is shown message in local tasks to that effect."); - - $this->viewForumTopics($this->nids); - - // Log in, and do basic tests for a user with permission to edit any forum - // content. - $this->doBasicTests($this->edit_any_topics_user, TRUE); - // Create a forum node authored by this user. - $any_topics_user_node = $this->createForumTopic($this->forum, FALSE); - - // Log in, and do basic tests for a user with permission to edit only its - // own forum content. - $this->doBasicTests($this->edit_own_topics_user, FALSE); - // Create a forum node authored by this user. - $own_topics_user_node = $this->createForumTopic($this->forum, FALSE); - // Verify that this user cannot edit forum content authored by another user. - $this->verifyForums($this->edit_any_topics_user, $any_topics_user_node, FALSE, 403); - - // Verify that this user is shown a local task to add new forum content. - $this->drupalGet('forum'); - $this->assertLink(t('Add new Forum topic')); - $this->drupalGet('forum/' . $this->forum['tid']); - $this->assertLink(t('Add new Forum topic')); - - // Login a user with permission to edit any forum content. - $this->drupalLogin($this->edit_any_topics_user); - // Verify that this user can edit forum content authored by another user. - $this->verifyForums($this->edit_own_topics_user, $own_topics_user_node, TRUE); - - // Verify the topic and post counts on the forum page. - $this->drupalGet('forum'); - - // Verify row for testing forum. - $forum_arg = array(':forum' => 'forum-list-' . $this->forum['tid']); - - // Topics cell contains number of topics and number of unread topics. - $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="topics"]', $forum_arg); - $topics = $this->xpath($xpath); - $topics = trim($topics[0]); - $this->assertEqual($topics, '6', 'Number of topics found.'); - - // Verify the number of unread topics. - $unread_topics = _forum_topics_unread($this->forum['tid'], $this->edit_any_topics_user->uid); - $unread_topics = format_plural($unread_topics, '1 new', '@count new'); - $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="topics"]//a', $forum_arg); - $this->assertFieldByXPath($xpath, $unread_topics, 'Number of unread topics found.'); - - // Verify total number of posts in forum. - $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="posts"]', $forum_arg); - $this->assertFieldByXPath($xpath, '6', 'Number of posts found.'); - - // Test loading multiple forum nodes on the front page. - $this->drupalLogin($this->drupalCreateUser(array('administer content types', 'create forum content'))); - $this->drupalPost('admin/structure/types/manage/forum', array('node_options[promote]' => 'promote'), t('Save content type')); - $this->createForumTopic($this->forum, FALSE); - $this->createForumTopic($this->forum, FALSE); - $this->drupalGet('node'); - - // Test adding a comment to a forum topic. - $node = $this->createForumTopic($this->forum, FALSE); - $edit = array(); - $edit['comment_body[' . LANGUAGE_NONE . '][0][value]'] = $this->randomName(); - $this->drupalPost("node/$node->nid", $edit, t('Save')); - $this->assertResponse(200); - - // Test editing a forum topic that has a comment. - $this->drupalLogin($this->edit_any_topics_user); - $this->drupalGet('forum/' . $this->forum['tid']); - $this->drupalPost("node/$node->nid/edit", array(), t('Save')); - $this->assertResponse(200); - - // Make sure constructing a forum node programmatically produces no notices. - $node = new stdClass; - $node->type = 'forum'; - $node->title = 'Test forum notices'; - $node->uid = 1; - $node->taxonomy_forums[LANGUAGE_NONE][0]['tid'] = $this->root_forum['tid']; - node_save($node); - } - - /** - * Tests that forum nodes can't be added without a parent. - * - * Verifies that forum nodes are not created without choosing "forum" from the - * select list. - */ - function testAddOrphanTopic() { - // Must remove forum topics to test creating orphan topics. - $vid = variable_get('forum_nav_vocabulary'); - $tree = taxonomy_get_tree($vid); - foreach ($tree as $term) { - taxonomy_term_delete($term->tid); - } - - // Create an orphan forum item. - $this->drupalLogin($this->admin_user); - $this->drupalPost('node/add/forum', array('title' => $this->randomName(10), 'body[' . LANGUAGE_NONE .'][0][value]' => $this->randomName(120)), t('Save')); - - $nid_count = db_query('SELECT COUNT(nid) FROM {node}')->fetchField(); - $this->assertEqual(0, $nid_count, 'A forum node was not created when missing a forum vocabulary.'); - - // Reset the defaults for future tests. - module_enable(array('forum')); - } - - /** - * Runs admin tests on the admin user. - * - * @param object $user - * The logged in user. - */ - private function doAdminTests($user) { - // Login the user. - $this->drupalLogin($user); - - // Enable the active forum block. - $edit = array(); - $edit['blocks[forum_active][region]'] = 'sidebar_second'; - $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); - $this->assertResponse(200); - $this->assertText(t('The block settings have been updated.'), 'Active forum topics forum block was enabled'); - - // Enable the new forum block. - $edit = array(); - $edit['blocks[forum_new][region]'] = 'sidebar_second'; - $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); - $this->assertResponse(200); - $this->assertText(t('The block settings have been updated.'), '[New forum topics] Forum block was enabled'); - - // Retrieve forum menu id. - $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = 'forum' AND menu_name = 'navigation' AND module = 'system' ORDER BY mlid ASC", 0, 1)->fetchField(); - - // Add forum to navigation menu. - $edit = array(); - $this->drupalPost('admin/structure/menu/manage/navigation', $edit, t('Save configuration')); - $this->assertResponse(200); - - // Edit forum taxonomy. - // Restoration of the settings fails and causes subsequent tests to fail. - $this->container = $this->editForumTaxonomy(); - // Create forum container. - $this->container = $this->createForum('container'); - // Verify "edit container" link exists and functions correctly. - $this->drupalGet('admin/structure/forum'); - $this->clickLink('edit container'); - $this->assertRaw('Edit container', 'Followed the link to edit the container'); - // Create forum inside the forum container. - $this->forum = $this->createForum('forum', $this->container['tid']); - // Verify the "edit forum" link exists and functions correctly. - $this->drupalGet('admin/structure/forum'); - $this->clickLink('edit forum'); - $this->assertRaw('Edit forum', 'Followed the link to edit the forum'); - // Navigate back to forum structure page. - $this->drupalGet('admin/structure/forum'); - // Create second forum in container. - $this->delete_forum = $this->createForum('forum', $this->container['tid']); - // Save forum overview. - $this->drupalPost('admin/structure/forum/', array(), t('Save')); - $this->assertRaw(t('The configuration options have been saved.')); - // Delete this second forum. - $this->deleteForum($this->delete_forum['tid']); - // Create forum at the top (root) level. - $this->root_forum = $this->createForum('forum'); - - // Test vocabulary form alterations. - $this->drupalGet('admin/structure/taxonomy/forums/edit'); - $this->assertFieldByName('op', t('Save'), 'Save button found.'); - $this->assertNoFieldByName('op', t('Delete'), 'Delete button not found.'); - - // Test term edit form alterations. - $this->drupalGet('taxonomy/term/' . $this->container['tid'] . '/edit'); - // Test parent field been hidden by forum module. - $this->assertNoField('parent[]', 'Parent field not found.'); - - // Test tags vocabulary form is not affected. - $this->drupalGet('admin/structure/taxonomy/tags/edit'); - $this->assertFieldByName('op', t('Save'), 'Save button found.'); - $this->assertFieldByName('op', t('Delete'), 'Delete button found.'); - // Test tags vocabulary term form is not affected. - $this->drupalGet('admin/structure/taxonomy/tags/add'); - $this->assertField('parent[]', 'Parent field found.'); - // Test relations fieldset exists. - $relations_fieldset = $this->xpath("//fieldset[@id='edit-relations']"); - $this->assertTrue(isset($relations_fieldset[0]), 'Relations fieldset element found.'); - } - - /** - * Edits the forum taxonomy. - */ - function editForumTaxonomy() { - // Backup forum taxonomy. - $vid = variable_get('forum_nav_vocabulary', ''); - $original_settings = taxonomy_vocabulary_load($vid); - - // Generate a random name/description. - $title = $this->randomName(10); - $description = $this->randomName(100); - - $edit = array( - 'name' => $title, - 'description' => $description, - 'machine_name' => drupal_strtolower(drupal_substr($this->randomName(), 3, 9)), - ); - - // Edit the vocabulary. - $this->drupalPost('admin/structure/taxonomy/' . $original_settings->machine_name . '/edit', $edit, t('Save')); - $this->assertResponse(200); - $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)), 'Vocabulary was edited'); - - // Grab the newly edited vocabulary. - entity_get_controller('taxonomy_vocabulary')->resetCache(); - $current_settings = taxonomy_vocabulary_load($vid); - - // Make sure we actually edited the vocabulary properly. - $this->assertEqual($current_settings->name, $title, 'The name was updated'); - $this->assertEqual($current_settings->description, $description, 'The description was updated'); - - // Restore the original vocabulary. - taxonomy_vocabulary_save($original_settings); - drupal_static_reset('taxonomy_vocabulary_load'); - $current_settings = taxonomy_vocabulary_load($vid); - $this->assertEqual($current_settings->name, $original_settings->name, 'The original vocabulary settings were restored'); - } - - /** - * Creates a forum container or a forum. - * - * @param $type - * The forum type (forum container or forum). - * @param $parent - * The forum parent. This defaults to 0, indicating a root forum. - * another forum). - * - * @return - * The created taxonomy term data. - */ - function createForum($type, $parent = 0) { - // Generate a random name/description. - $name = $this->randomName(10); - $description = $this->randomName(100); - - $edit = array( - 'name' => $name, - 'description' => $description, - 'parent[0]' => $parent, - 'weight' => '0', - ); - - // Create forum. - $this->drupalPost('admin/structure/forum/add/' . $type, $edit, t('Save')); - $this->assertResponse(200); - $type = ($type == 'container') ? 'forum container' : 'forum'; - $this->assertRaw(t('Created new @type %term.', array('%term' => $name, '@type' => t($type))), format_string('@type was created', array('@type' => ucfirst($type)))); - - // Verify forum. - $term = db_query("SELECT * FROM {taxonomy_term_data} t WHERE t.vid = :vid AND t.name = :name AND t.description = :desc", array(':vid' => variable_get('forum_nav_vocabulary', ''), ':name' => $name, ':desc' => $description))->fetchAssoc(); - $this->assertTrue(!empty($term), 'The ' . $type . ' exists in the database'); - - // Verify forum hierarchy. - $tid = $term['tid']; - $parent_tid = db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = :tid", array(':tid' => $tid))->fetchField(); - $this->assertTrue($parent == $parent_tid, 'The ' . $type . ' is linked to its container'); - - return $term; - } - - /** - * Deletes a forum. - * - * @param $tid - * The forum ID. - */ - function deleteForum($tid) { - // Delete the forum. - $this->drupalPost('admin/structure/forum/edit/forum/' . $tid, array(), t('Delete')); - $this->drupalPost(NULL, array(), t('Delete')); - - // Assert that the forum no longer exists. - $this->drupalGet('forum/' . $tid); - $this->assertResponse(404, 'The forum was not found'); - - // Assert that the associated term has been removed from the - // forum_containers variable. - $containers = variable_get('forum_containers', array()); - $this->assertFalse(in_array($tid, $containers), 'The forum_containers variable has been updated.'); - } - - /** - * Runs basic tests on the indicated user. - * - * @param $user - * The logged in user. - * @param $admin - * User has 'access administration pages' privilege. - */ - private function doBasicTests($user, $admin) { - // Login the user. - $this->drupalLogin($user); - // Attempt to create forum topic under a container. - $this->createForumTopic($this->container, TRUE); - // Create forum node. - $node = $this->createForumTopic($this->forum, FALSE); - // Verify the user has access to all the forum nodes. - $this->verifyForums($user, $node, $admin); - } - - /** - * Creates forum topic. - * - * @param array $forum - * A forum array. - * @param boolean $container - * TRUE if $forum is a container; FALSE otherwise. - * - * @return object - * The created topic node. - */ - function createForumTopic($forum, $container = FALSE) { - // Generate a random subject/body. - $title = $this->randomName(20); - $body = $this->randomName(200); - - $langcode = LANGUAGE_NONE; - $edit = array( - "title" => $title, - "body[$langcode][0][value]" => $body, - ); - $tid = $forum['tid']; - - // Create the forum topic, preselecting the forum ID via a URL parameter. - $this->drupalPost('node/add/forum/' . $tid, $edit, t('Save')); - - $type = t('Forum topic'); - if ($container) { - $this->assertNoRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), 'Forum topic was not created'); - $this->assertRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), 'Error message was shown'); - return; - } - else { - $this->assertRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), 'Forum topic was created'); - $this->assertNoRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), 'No error message was shown'); - } - - // Retrieve node object, ensure that the topic was created and in the proper forum. - $node = $this->drupalGetNodeByTitle($title); - $this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title))); - $this->assertEqual($node->taxonomy_forums[LANGUAGE_NONE][0]['tid'], $tid, 'Saved forum topic was in the expected forum'); - - // View forum topic. - $this->drupalGet('node/' . $node->nid); - $this->assertRaw($title, 'Subject was found'); - $this->assertRaw($body, 'Body was found'); - - return $node; - } - - /** - * Verifies that the logged in user has access to a forum nodes. - * - * @param $node_user - * The user who creates the node. - * @param $node - * The node being checked. - * @param $admin - * Boolean to indicate whether the user can 'access administration pages'. - * @param $response - * The exptected HTTP response code. - */ - private function verifyForums($node_user, $node, $admin, $response = 200) { - $response2 = ($admin) ? 200 : 403; - - // View forum help node. - $this->drupalGet('admin/help/forum'); - $this->assertResponse($response2); - if ($response2 == 200) { - $this->assertTitle(t('Forum | Drupal'), 'Forum help title was displayed'); - $this->assertText(t('Forum'), 'Forum help node was displayed'); - } - - // Verify the forum blocks were displayed. - $this->drupalGet(''); - $this->assertResponse(200); - $this->assertText(t('New forum topics'), '[New forum topics] Forum block was displayed'); - - // View forum container page. - $this->verifyForumView($this->container); - // View forum page. - $this->verifyForumView($this->forum, $this->container); - // View root forum page. - $this->verifyForumView($this->root_forum); - - // View forum node. - $this->drupalGet('node/' . $node->nid); - $this->assertResponse(200); - $this->assertTitle($node->title . ' | Drupal', 'Forum node was displayed'); - $breadcrumb = array( - l(t('Home'), NULL), - l(t('Forums'), 'forum'), - l($this->container['name'], 'forum/' . $this->container['tid']), - l($this->forum['name'], 'forum/' . $this->forum['tid']), - ); - $this->assertRaw(theme('breadcrumb', array('breadcrumb' => $breadcrumb)), 'Breadcrumbs were displayed'); - - // View forum edit node. - $this->drupalGet('node/' . $node->nid . '/edit'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertTitle('Edit Forum topic ' . $node->title . ' | Drupal', 'Forum edit node was displayed'); - } - - if ($response == 200) { - // Edit forum node (including moving it to another forum). - $edit = array(); - $langcode = LANGUAGE_NONE; - $edit["title"] = 'node/' . $node->nid; - $edit["body[$langcode][0][value]"] = $this->randomName(256); - // Assume the topic is initially associated with $forum. - $edit["taxonomy_forums[$langcode]"] = $this->root_forum['tid']; - $edit['shadow'] = TRUE; - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit["title"])), 'Forum node was edited'); - - // Verify topic was moved to a different forum. - $forum_tid = db_query("SELECT tid FROM {forum} WHERE nid = :nid AND vid = :vid", array( - ':nid' => $node->nid, - ':vid' => $node->vid, - ))->fetchField(); - $this->assertTrue($forum_tid == $this->root_forum['tid'], 'The forum topic is linked to a different forum'); - - // Delete forum node. - $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete')); - $this->assertResponse($response); - $this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title'])), 'Forum node was deleted'); - } - } - - /** - * Verifies display of forum page. - * - * @param $forum - * A row from the taxonomy_term_data table in an array. - * @param $parent - * (optional) An array representing the forum's parent. - */ - private function verifyForumView($forum, $parent = NULL) { - // View forum page. - $this->drupalGet('forum/' . $forum['tid']); - $this->assertResponse(200); - $this->assertTitle($forum['name'] . ' | Drupal', 'Forum name was displayed'); - - $breadcrumb = array( - l(t('Home'), NULL), - l(t('Forums'), 'forum'), - ); - if (isset($parent)) { - $breadcrumb[] = l($parent['name'], 'forum/' . $parent['tid']); - } - - $this->assertRaw(theme('breadcrumb', array('breadcrumb' => $breadcrumb)), 'Breadcrumbs were displayed'); - } - - /** - * Generates forum topics to test the display of an active forum block. - * - * @param array $forum - * The foorum array (a row from taxonomy_term_data table). - */ - private function generateForumTopics($forum) { - $this->nids = array(); - for ($i = 0; $i < 5; $i++) { - $node = $this->createForumTopic($this->forum, FALSE); - $this->nids[] = $node->nid; - } - } - - /** - * Views forum topics to test the display of an active forum block. - * - * @todo The logic here is completely incorrect, since the active forum topics - * block is determined by comments on the node, not by views. - * @todo DIE - * - * @param $nids - * An array of forum node IDs. - */ - private function viewForumTopics($nids) { - for ($i = 0; $i < 2; $i++) { - foreach ($nids as $nid) { - $this->drupalGet('node/' . $nid); - $this->drupalGet('node/' . $nid); - $this->drupalGet('node/' . $nid); - } - } - } -} - -/** - * Tests the forum index listing. - */ -class ForumIndexTestCase extends DrupalWebTestCase { - - public static function getInfo() { - return array( - 'name' => 'Forum index', - 'description' => 'Tests the forum index listing.', - 'group' => 'Forum', - ); - } - - function setUp() { - parent::setUp('taxonomy', 'comment', 'forum'); - - // Create a test user. - $web_user = $this->drupalCreateUser(array('create forum content', 'edit own forum content', 'edit any forum content', 'administer nodes')); - $this->drupalLogin($web_user); - } - - /** - * Tests the forum index for published and unpublished nodes. - */ - function testForumIndexStatus() { - - $langcode = LANGUAGE_NONE; - - // The forum ID to use. - $tid = 1; - - // Create a test node. - $title = $this->randomName(20); - $edit = array( - "title" => $title, - "body[$langcode][0][value]" => $this->randomName(200), - ); - - // Create the forum topic, preselecting the forum ID via a URL parameter. - $this->drupalPost('node/add/forum/' . $tid, $edit, t('Save')); - - // Check that the node exists in the database. - $node = $this->drupalGetNodeByTitle($title); - $this->assertTrue(!empty($node), 'New forum node found in database.'); - - // Verify that the node appears on the index. - $this->drupalGet('forum/' . $tid); - $this->assertText($title, 'Published forum topic appears on index.'); - - // Unpublish the node. - $edit = array( - 'status' => FALSE, - ); - $this->drupalPost("node/{$node->nid}/edit", $edit, t('Save')); - $this->drupalGet("node/{$node->nid}"); - $this->assertText(t('Access denied'), 'Unpublished node is no longer accessible.'); - - // Verify that the node no longer appears on the index. - $this->drupalGet('forum/' . $tid); - $this->assertNoText($title, 'Unpublished forum topic no longer appears on index.'); - } -} diff --git a/modules/forum/forums.tpl.php b/modules/forum/forums.tpl.php deleted file mode 100644 index 6a0e02e..0000000 --- a/modules/forum/forums.tpl.php +++ /dev/null @@ -1,24 +0,0 @@ - - -- - -- diff --git a/modules/help/help-rtl.css b/modules/help/help-rtl.css deleted file mode 100644 index 8e40a8c..0000000 --- a/modules/help/help-rtl.css +++ /dev/null @@ -1,10 +0,0 @@ - -.help-items { - float: right; - padding-right: 0; - padding-left: 3%; -} -.help-items-last { - padding-right: 0; - padding-left: 0; -} diff --git a/modules/help/help.admin.inc b/modules/help/help.admin.inc deleted file mode 100644 index ec1a18e..0000000 --- a/modules/help/help.admin.inc +++ /dev/null @@ -1,86 +0,0 @@ -' . t('Help topics') . '' . t('Help is available on the following items:') . '
' . help_links_as_list(); - return $output; -} - -/** - * Menu callback; prints a page listing general help for a module. - * - * @param $name - * A module name to display a help page for. - */ -function help_page($name) { - $output = ''; - if (module_hook($name, 'help')) { - $info = system_get_info('module'); - drupal_set_title($info[$name]['name']); - - $temp = module_invoke($name, 'help', "admin/help#$name", drupal_help_arg()); - if (empty($temp)) { - $output .= t("No help is available for module %module.", array('%module' => $info[$name]['name'])); - } - else { - $output .= $temp; - } - - // Only print list of administration pages if the module in question has - // any such pages associated to it. - $admin_tasks = system_get_module_admin_tasks($name, $info[$name]); - if (!empty($admin_tasks)) { - $links = array(); - foreach ($admin_tasks as $task) { - $links[] = l($task['title'], $task['link_path'], $task['localized_options']); - } - $output .= theme('item_list', array('items' => $links, 'title' => t('@module administration pages', array('@module' => $info[$name]['name'])))); - } - } - return $output; -} - -/** - * Provides a formatted list of available help topics. - * - * @return - * A string containing the formatted list. - */ -function help_links_as_list() { - $empty_arg = drupal_help_arg(); - $module_info = system_rebuild_module_data(); - - $modules = array(); - foreach (module_implements('help', TRUE) as $module) { - if (module_invoke($module, 'help', "admin/help#$module", $empty_arg)) { - $modules[$module] = $module_info[$module]->info['name']; - } - } - asort($modules); - - // Output pretty four-column list. - $count = count($modules); - $break = ceil($count / 4); - $output = ''; - - return $output; -} - diff --git a/modules/help/help.css b/modules/help/help.css deleted file mode 100644 index 9228170..0000000 --- a/modules/help/help.css +++ /dev/null @@ -1,9 +0,0 @@ - -.help-items { - float: left; /* LTR */ - width: 22%; - padding-right: 3%; /* LTR */ -} -.help-items-last { - padding-right: 0; /* LTR */ -} diff --git a/modules/help/help.info b/modules/help/help.info deleted file mode 100644 index d4c1b36..0000000 --- a/modules/help/help.info +++ /dev/null @@ -1,6 +0,0 @@ -name = Help -description = Manages the display of online help. -package = Core -version = VERSION -core = 7.x -files[] = help.test diff --git a/modules/help/help.module b/modules/help/help.module deleted file mode 100644 index 53a9f71..0000000 --- a/modules/help/help.module +++ /dev/null @@ -1,63 +0,0 @@ - 'Help', - 'description' => 'Reference for usage, configuration, and modules.', - 'page callback' => 'help_main', - 'access arguments' => array('access administration pages'), - 'weight' => 9, - 'file' => 'help.admin.inc', - ); - - foreach (module_implements('help', TRUE) as $module) { - $items['admin/help/' . $module] = array( - 'title' => $module, - 'page callback' => 'help_page', - 'page arguments' => array(2), - 'access arguments' => array('access administration pages'), - 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'file' => 'help.admin.inc', - ); - } - - return $items; -} - -/** - * Implements hook_help(). - */ -function help_help($path, $arg) { - switch ($path) { - case 'admin/help': - $output = '- ';
- $i = 0;
- foreach ($modules as $module => $name) {
- $output .= '
- ' . l($name, 'admin/help/' . $module) . ' '; - if (($i + 1) % $break == 0 && ($i + 1) != $count) { - $output .= '
- ';
- }
- $i++;
- }
- $output .= '
' . t('Follow these steps to set up and start using your website:') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Configure your website Once logged in, visit the administration section, where you can customize and configure all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/config'))) . ' '; - $output .= '
- ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . ' '; - $output .= '
- ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/appearance'), '@download_themes' => 'http://drupal.org/project/themes')) . ' '; - $output .= '
- ' . t('Start posting content Finally, you can add new content for your website.', array('@content' => url('node/add'))) . ' '; - $output .= '
' . t('For more information, refer to the specific topics listed in the next section or to the online Drupal handbooks. You may also post at the Drupal forum or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/documentation', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '
'; - return $output; - case 'admin/help#help': - $output = ''; - $output .= '' . t('About') . '
'; - $output .= '' . t('The Help module provides Help reference pages and context-sensitive advice to guide you through the use and configuration of modules. It is a starting point for the online Drupal handbooks. The handbooks contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the online handbook entry for the Help module.', array('@help' => 'http://drupal.org/documentation/modules/help/', '@handbook' => 'http://drupal.org/documentation', '@help-page' => url('admin/help'))) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Providing a help reference') . ' '; - $output .= '
- ' . t('The Help module displays explanations for using each module listed on the main Help reference page.', array('@help' => url('admin/help'))) . ' '; - $output .= '
- ' . t('Providing context-sensitive help') . ' '; - $output .= '
- ' . t('The Help module displays context-sensitive advice and explanations on various pages.') . ' '; - $output .= '
' . t('Help topics') . '
' . t('Help is available on the following items:') . '
', 'Help topics text correctly appears.'); - - // Make sure links are properly added for modules implementing hook_help(). - foreach ($this->modules as $module => $name) { - $this->assertLink($name, 0, format_string('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name))); - } - } - - /** - * Verifies the logged in user has access to the various help nodes. - * - * @param integer $response - * An HTTP response code. - */ - protected function verifyHelp($response = 200) { - foreach ($this->modules as $module => $name) { - // View module help node. - $this->drupalGet('admin/help/' . $module); - $this->assertResponse($response); - if ($response == 200) { - $this->assertTitle($name . ' | Drupal', format_string('%module title was displayed', array('%module' => $module))); - $this->assertRaw('' . t($name) . '
', format_string('%module heading was displayed', array('%module' => $module))); - } - } - } - - /** - * Gets the list of enabled modules that implement hook_help(). - * - * @return array - * A list of enabled modules. - */ - protected function getModuleList() { - $this->modules = array(); - $result = db_query("SELECT name, filename, info FROM {system} WHERE type = 'module' AND status = 1 ORDER BY weight ASC, filename ASC"); - foreach ($result as $module) { - if (file_exists($module->filename) && function_exists($module->name . '_help')) { - $fullname = unserialize($module->info); - $this->modules[$module->name] = $fullname['name']; - } - } - } -} - -/** - * Tests a module without help to verify it is not listed in the help page. - */ -class NoHelpTestCase extends DrupalWebTestCase { - /** - * The user who will be created. - */ - protected $big_user; - - public static function getInfo() { - return array( - 'name' => 'No help', - 'description' => 'Verify no help is displayed for modules not providing any help.', - 'group' => 'Help', - ); - } - - function setUp() { - // Use one of the test modules that do not implement hook_help(). - parent::setUp('menu_test'); - $this->big_user = $this->drupalCreateUser(array('access administration pages')); - } - - /** - * Ensures modules not implementing help do not appear on admin/help. - */ - function testMainPageNoHelp() { - $this->drupalLogin($this->big_user); - - $this->drupalGet('admin/help'); - $this->assertNoText('Hook menu tests', 'Making sure the test module menu_test does not display a help link in admin/help'); - } -} diff --git a/modules/image/image-rtl.css b/modules/image/image-rtl.css deleted file mode 100644 index 2a7a855..0000000 --- a/modules/image/image-rtl.css +++ /dev/null @@ -1,11 +0,0 @@ - -/** - * Image upload widget. - */ -div.image-preview { - float: right; - padding: 0 0 10px 10px; -} -div.image-widget-data { - float: right; -} diff --git a/modules/image/image.admin.css b/modules/image/image.admin.css deleted file mode 100644 index 3115c8d..0000000 --- a/modules/image/image.admin.css +++ /dev/null @@ -1,60 +0,0 @@ - -/** - * Image style configuration pages. - */ -div.image-style-new, -div.image-style-new div { - display: inline; -} -div.image-style-preview div.preview-image-wrapper { - float: left; - padding-bottom: 2em; - text-align: center; - top: 50%; - width: 48%; -} -div.image-style-preview div.preview-image { - margin: auto; - position: relative; -} -div.image-style-preview div.preview-image div.width { - border: 1px solid #666; - border-top: none; - height: 2px; - left: -1px; - bottom: -6px; - position: absolute; -} -div.image-style-preview div.preview-image div.width span { - position: relative; - top: 4px; -} -div.image-style-preview div.preview-image div.height { - border: 1px solid #666; - border-left: none; - position: absolute; - right: -6px; - top: -1px; - width: 2px; -} -div.image-style-preview div.preview-image div.height span { - height: 2em; - left: 10px; - margin-top: -1em; - position: absolute; - top: 50%; -} - -/** - * Image anchor element. - */ -table.image-anchor { - width: auto; -} -table.image-anchor tr.even, -table.image-anchor tr.odd { - background: none; -} -table.image-anchor td { - border: 1px solid #CCC; -} diff --git a/modules/image/image.api.php b/modules/image/image.api.php deleted file mode 100644 index 8115116..0000000 --- a/modules/image/image.api.php +++ /dev/null @@ -1,200 +0,0 @@ - t('Resize'), - 'help' => t('Resize an image to an exact set of dimensions, ignoring aspect ratio.'), - 'effect callback' => 'mymodule_resize_effect', - 'dimensions callback' => 'mymodule_resize_dimensions', - 'form callback' => 'mymodule_resize_form', - 'summary theme' => 'mymodule_resize_summary', - ); - - return $effects; -} - -/** - * Alter the information provided in hook_image_effect_info(). - * - * @param $effects - * The array of image effects, keyed on the machine-readable effect name. - * - * @see hook_image_effect_info() - */ -function hook_image_effect_info_alter(&$effects) { - // Override the Image module's crop effect with more options. - $effects['image_crop']['effect callback'] = 'mymodule_crop_effect'; - $effects['image_crop']['dimensions callback'] = 'mymodule_crop_dimensions'; - $effects['image_crop']['form callback'] = 'mymodule_crop_form'; -} - -/** - * Respond to image style updating. - * - * This hook enables modules to update settings that might be affected by - * changes to an image. For example, updating a module specific variable to - * reflect a change in the image style's name. - * - * @param $style - * The image style array that is being updated. - */ -function hook_image_style_save($style) { - // If a module defines an image style and that style is renamed by the user - // the module should update any references to that style. - if (isset($style['old_name']) && $style['old_name'] == variable_get('mymodule_image_style', '')) { - variable_set('mymodule_image_style', $style['name']); - } -} - -/** - * Respond to image style deletion. - * - * This hook enables modules to update settings when a image style is being - * deleted. If a style is deleted, a replacement name may be specified in - * $style['name'] and the style being deleted will be specified in - * $style['old_name']. - * - * @param $style - * The image style array that being deleted. - */ -function hook_image_style_delete($style) { - // Administrators can choose an optional replacement style when deleting. - // Update the modules style variable accordingly. - if (isset($style['old_name']) && $style['old_name'] == variable_get('mymodule_image_style', '')) { - variable_set('mymodule_image_style', $style['name']); - } -} - -/** - * Respond to image style flushing. - * - * This hook enables modules to take effect when a style is being flushed (all - * images are being deleted from the server and regenerated). Any - * module-specific caches that contain information related to the style should - * be cleared using this hook. This hook is called whenever a style is updated, - * deleted, or any effect associated with the style is update or deleted. - * - * @param $style - * The image style array that is being flushed. - */ -function hook_image_style_flush($style) { - // Empty cached data that contains information about the style. - cache_clear_all('*', 'cache_mymodule', TRUE); -} - -/** - * Modify any image styles provided by other modules or the user. - * - * This hook allows modules to modify, add, or remove image styles. This may - * be useful to modify default styles provided by other modules or enforce - * that a specific effect is always enabled on a style. Note that modifications - * to these styles may negatively affect the user experience, such as if an - * effect is added to a style through this hook, the user may attempt to remove - * the effect but it will be immediately be re-added. - * - * The best use of this hook is usually to modify default styles, which are not - * editable by the user until they are overridden, so such interface - * contradictions will not occur. This hook can target default (or user) styles - * by checking the $style['storage'] property. - * - * If your module needs to provide a new style (rather than modify an existing - * one) use hook_image_default_styles() instead. - * - * @see hook_image_default_styles() - */ -function hook_image_styles_alter(&$styles) { - // Check that we only affect a default style. - if ($styles['thumbnail']['storage'] == IMAGE_STORAGE_DEFAULT) { - // Add an additional effect to the thumbnail style. - $styles['thumbnail']['effects'][] = array( - 'name' => 'image_desaturate', - 'data' => array(), - 'weight' => 1, - 'effect callback' => 'image_desaturate_effect', - ); - } -} - -/** - * Provide module-based image styles for reuse throughout Drupal. - * - * This hook allows your module to provide image styles. This may be useful if - * you require images to fit within exact dimensions. Note that you should - * attempt to re-use the default styles provided by Image module whenever - * possible, rather than creating image styles that are specific to your module. - * Image provides the styles "thumbnail", "medium", and "large". - * - * You may use this hook to more easily manage your site's changes by moving - * existing image styles from the database to a custom module. Note however that - * moving image styles to code instead storing them in the database has a - * negligible effect on performance, since custom image styles are loaded - * from the database all at once. Even if all styles are pulled from modules, - * Image module will still perform the same queries to check the database for - * any custom styles. - * - * @return - * An array of image styles, keyed by the style name. - * @see image_image_default_styles() - */ -function hook_image_default_styles() { - $styles = array(); - - $styles['mymodule_preview'] = array( - 'label' => 'My module preview', - 'effects' => array( - array( - 'name' => 'image_scale', - 'data' => array('width' => 400, 'height' => 400, 'upscale' => 1), - 'weight' => 0, - ), - array( - 'name' => 'image_desaturate', - 'data' => array(), - 'weight' => 1, - ), - ), - ); - - return $styles; -} - - /** - * @} End of "addtogroup hooks". - */ diff --git a/modules/image/image.css b/modules/image/image.css deleted file mode 100644 index 7db307b..0000000 --- a/modules/image/image.css +++ /dev/null @@ -1,14 +0,0 @@ - -/** - * Image upload widget. - */ -div.image-preview { - float: left; /* LTR */ - padding: 0 10px 10px 0; /* LTR */ -} -div.image-widget-data { - float: left; /* LTR */ -} -div.image-widget-data input.text-field { - width: auto; -} diff --git a/modules/image/image.effects.inc b/modules/image/image.effects.inc deleted file mode 100644 index 35a6a74..0000000 --- a/modules/image/image.effects.inc +++ /dev/null @@ -1,314 +0,0 @@ - array( - 'label' => t('Resize'), - 'help' => t('Resizing will make images an exact set of dimensions. This may cause images to be stretched or shrunk disproportionately.'), - 'effect callback' => 'image_resize_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - ), - 'image_scale' => array( - 'label' => t('Scale'), - 'help' => t('Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.'), - 'effect callback' => 'image_scale_effect', - 'dimensions callback' => 'image_scale_dimensions', - 'form callback' => 'image_scale_form', - 'summary theme' => 'image_scale_summary', - ), - 'image_scale_and_crop' => array( - 'label' => t('Scale and crop'), - 'help' => t('Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.'), - 'effect callback' => 'image_scale_and_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - ), - 'image_crop' => array( - 'label' => t('Crop'), - 'help' => t('Cropping will remove portions of an image to make it the specified dimensions.'), - 'effect callback' => 'image_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_crop_form', - 'summary theme' => 'image_crop_summary', - ), - 'image_desaturate' => array( - 'label' => t('Desaturate'), - 'help' => t('Desaturate converts an image to grayscale.'), - 'effect callback' => 'image_desaturate_effect', - 'dimensions passthrough' => TRUE, - ), - 'image_rotate' => array( - 'label' => t('Rotate'), - 'help' => t('Rotating an image may cause the dimensions of an image to increase to fit the diagonal.'), - 'effect callback' => 'image_rotate_effect', - 'dimensions callback' => 'image_rotate_dimensions', - 'form callback' => 'image_rotate_form', - 'summary theme' => 'image_rotate_summary', - ), - ); - - return $effects; -} - -/** - * Image effect callback; Resize an image resource. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array of attributes to use when performing the resize effect with the - * following items: - * - "width": An integer representing the desired width in pixels. - * - "height": An integer representing the desired height in pixels. - * - * @return - * TRUE on success. FALSE on failure to resize image. - * - * @see image_resize() - */ -function image_resize_effect(&$image, $data) { - if (!image_resize($image, $data['width'], $data['height'])) { - watchdog('image', 'Image resize failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); - return FALSE; - } - return TRUE; -} - -/** - * Image dimensions callback; Resize. - * - * @param $dimensions - * Dimensions to be modified - an array with components width and height, in - * pixels. - * @param $data - * An array of attributes to use when performing the resize effect with the - * following items: - * - "width": An integer representing the desired width in pixels. - * - "height": An integer representing the desired height in pixels. - */ -function image_resize_dimensions(array &$dimensions, array $data) { - // The new image will have the exact dimensions defined for the effect. - $dimensions['width'] = $data['width']; - $dimensions['height'] = $data['height']; -} - -/** - * Image effect callback; Scale an image resource. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array of attributes to use when performing the scale effect with the - * following items: - * - "width": An integer representing the desired width in pixels. - * - "height": An integer representing the desired height in pixels. - * - "upscale": A boolean indicating that the image should be upscaled if the - * dimensions are larger than the original image. - * - * @return - * TRUE on success. FALSE on failure to scale image. - * - * @see image_scale() - */ -function image_scale_effect(&$image, $data) { - // Set sane default values. - $data += array( - 'width' => NULL, - 'height' => NULL, - 'upscale' => FALSE, - ); - - if (!image_scale($image, $data['width'], $data['height'], $data['upscale'])) { - watchdog('image', 'Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); - return FALSE; - } - return TRUE; -} - -/** - * Image dimensions callback; Scale. - * - * @param $dimensions - * Dimensions to be modified - an array with components width and height, in - * pixels. - * @param $data - * An array of attributes to use when performing the scale effect with the - * following items: - * - "width": An integer representing the desired width in pixels. - * - "height": An integer representing the desired height in pixels. - * - "upscale": A boolean indicating that the image should be upscaled if the - * dimensions are larger than the original image. - */ -function image_scale_dimensions(array &$dimensions, array $data) { - if ($dimensions['width'] && $dimensions['height']) { - image_dimensions_scale($dimensions, $data['width'], $data['height'], $data['upscale']); - } -} - -/** - * Image effect callback; Crop an image resource. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array of attributes to use when performing the crop effect with the - * following items: - * - "width": An integer representing the desired width in pixels. - * - "height": An integer representing the desired height in pixels. - * - "anchor": A string describing where the crop should originate in the form - * of "XOFFSET-YOFFSET". XOFFSET is either a number of pixels or - * "left", "center", "right" and YOFFSET is either a number of pixels or - * "top", "center", "bottom". - * @return - * TRUE on success. FALSE on failure to crop image. - * @see image_crop() - */ -function image_crop_effect(&$image, $data) { - // Set sane default values. - $data += array( - 'anchor' => 'center-center', - ); - - list($x, $y) = explode('-', $data['anchor']); - $x = image_filter_keyword($x, $image->info['width'], $data['width']); - $y = image_filter_keyword($y, $image->info['height'], $data['height']); - if (!image_crop($image, $x, $y, $data['width'], $data['height'])) { - watchdog('image', 'Image crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); - return FALSE; - } - return TRUE; -} - -/** - * Image effect callback; Scale and crop an image resource. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array of attributes to use when performing the scale and crop effect - * with the following items: - * - "width": An integer representing the desired width in pixels. - * - "height": An integer representing the desired height in pixels. - * @return - * TRUE on success. FALSE on failure to scale and crop image. - * @see image_scale_and_crop() - */ -function image_scale_and_crop_effect(&$image, $data) { - if (!image_scale_and_crop($image, $data['width'], $data['height'])) { - watchdog('image', 'Image scale and crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); - return FALSE; - } - return TRUE; -} - -/** - * Image effect callback; Desaturate (grayscale) an image resource. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array of attributes to use when performing the desaturate effect. - * @return - * TRUE on success. FALSE on failure to desaturate image. - * @see image_desaturate() - */ -function image_desaturate_effect(&$image, $data) { - if (!image_desaturate($image)) { - watchdog('image', 'Image desaturate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); - return FALSE; - } - return TRUE; -} - -/** - * Image effect callback; Rotate an image resource. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array of attributes to use when performing the rotate effect containing - * the following items: - * - "degrees": The number of (clockwise) degrees to rotate the image. - * - "random": A boolean indicating that a random rotation angle should be - * used for this image. The angle specified in "degrees" is used as a - * positive and negative maximum. - * - "bgcolor": The background color to use for exposed areas of the image. - * Use web-style hex colors (#FFFFFF for white, #000000 for black). Leave - * blank for transparency on image types that support it. - * @return - * TRUE on success. FALSE on failure to rotate image. - * @see image_rotate(). - */ -function image_rotate_effect(&$image, $data) { - // Set sane default values. - $data += array( - 'degrees' => 0, - 'bgcolor' => NULL, - 'random' => FALSE, - ); - - // Convert short #FFF syntax to full #FFFFFF syntax. - if (strlen($data['bgcolor']) == 4) { - $c = $data['bgcolor']; - $data['bgcolor'] = $c[0] . $c[1] . $c[1] . $c[2] . $c[2] . $c[3] . $c[3]; - } - - // Convert #FFFFFF syntax to hexadecimal colors. - if ($data['bgcolor'] != '') { - $data['bgcolor'] = hexdec(str_replace('#', '0x', $data['bgcolor'])); - } - else { - $data['bgcolor'] = NULL; - } - - if (!empty($data['random'])) { - $degrees = abs((float) $data['degrees']); - $data['degrees'] = rand(-1 * $degrees, $degrees); - } - - if (!image_rotate($image, $data['degrees'], $data['bgcolor'])) { - watchdog('image', 'Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->toolkit, '%path' => $image->source, '%mimetype' => $image->info['mime_type'], '%dimensions' => $image->info['width'] . 'x' . $image->info['height']), WATCHDOG_ERROR); - return FALSE; - } - return TRUE; -} - -/** - * Image dimensions callback; Rotate. - * - * @param $dimensions - * Dimensions to be modified - an array with components width and height, in - * pixels. - * @param $data - * An array of attributes to use when performing the rotate effect containing - * the following items: - * - "degrees": The number of (clockwise) degrees to rotate the image. - * - "random": A boolean indicating that a random rotation angle should be - * used for this image. The angle specified in "degrees" is used as a - * positive and negative maximum. - */ -function image_rotate_dimensions(array &$dimensions, array $data) { - // If the rotate is not random and the angle is a multiple of 90 degrees, - // then the new dimensions can be determined. - if (!$data['random'] && ((int) ($data['degrees']) == $data['degrees']) && ($data['degrees'] % 90 == 0)) { - if ($data['degrees'] % 180 != 0) { - $temp = $dimensions['width']; - $dimensions['width'] = $dimensions['height']; - $dimensions['height'] = $temp; - } - } - else { - $dimensions['width'] = $dimensions['height'] = NULL; - } -} diff --git a/modules/image/image.info b/modules/image/image.info deleted file mode 100644 index d7eece1..0000000 --- a/modules/image/image.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Image -description = Provides image manipulation tools. -package = Core -version = VERSION -core = 7.x -dependencies[] = file -files[] = image.test -configure = admin/config/media/image-styles diff --git a/modules/image/image.install b/modules/image/image.install deleted file mode 100644 index 45bcbbb..0000000 --- a/modules/image/image.install +++ /dev/null @@ -1,522 +0,0 @@ - 'Stores configuration options for image styles.', - 'fields' => array( - 'isid' => array( - 'description' => 'The primary identifier for an image style.', - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - ), - 'name' => array( - 'description' => 'The style machine name.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - ), - 'label' => array( - 'description' => 'The style administrative name.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), - ), - 'primary key' => array('isid'), - 'unique keys' => array( - 'name' => array('name'), - ), - ); - - $schema['image_effects'] = array( - 'description' => 'Stores configuration options for image effects.', - 'fields' => array( - 'ieid' => array( - 'description' => 'The primary identifier for an image effect.', - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - ), - 'isid' => array( - 'description' => 'The {image_styles}.isid for an image style.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'weight' => array( - 'description' => 'The weight of the effect in the style.', - 'type' => 'int', - 'unsigned' => FALSE, - 'not null' => TRUE, - 'default' => 0, - ), - 'name' => array( - 'description' => 'The unique name of the effect to be executed.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - ), - 'data' => array( - 'description' => 'The configuration data for the effect.', - 'type' => 'blob', - 'not null' => TRUE, - 'size' => 'big', - 'serialize' => TRUE, - ), - ), - 'primary key' => array('ieid'), - 'indexes' => array( - 'isid' => array('isid'), - 'weight' => array('weight'), - ), - 'foreign keys' => array( - 'image_style' => array( - 'table' => 'image_styles', - 'columns' => array('isid' => 'isid'), - ), - ), - ); - - return $schema; -} - -/** - * Implements hook_field_schema(). - */ -function image_field_schema($field) { - return array( - 'columns' => array( - 'fid' => array( - 'description' => 'The {file_managed}.fid being referenced in this field.', - 'type' => 'int', - 'not null' => FALSE, - 'unsigned' => TRUE, - ), - 'alt' => array( - 'description' => "Alternative image text, for the image's 'alt' attribute.", - 'type' => 'varchar', - 'length' => 512, - 'not null' => FALSE, - ), - 'title' => array( - 'description' => "Image title text, for the image's 'title' attribute.", - 'type' => 'varchar', - 'length' => 1024, - 'not null' => FALSE, - ), - 'width' => array( - 'description' => 'The width of the image in pixels.', - 'type' => 'int', - 'unsigned' => TRUE, - ), - 'height' => array( - 'description' => 'The height of the image in pixels.', - 'type' => 'int', - 'unsigned' => TRUE, - ), - ), - 'indexes' => array( - 'fid' => array('fid'), - ), - 'foreign keys' => array( - 'fid' => array( - 'table' => 'file_managed', - 'columns' => array('fid' => 'fid'), - ), - ), - ); -} - -/** - * Implements hook_update_dependencies(). - */ -function image_update_dependencies() { - $dependencies['image'][7002] = array( - // Image update 7002 uses field API functions, so must run after - // Field API has been enabled. - 'system' => 7020, - ); - return $dependencies; -} - -/** - * Install the schema for users upgrading from the contributed module. - */ -function image_update_7000() { - if (!db_table_exists('image_styles')) { - $schema = array(); - - $schema['cache_image'] = system_schema_cache_7054(); - $schema['cache_image']['description'] = 'Cache table used to store information about image manipulations that are in-progress.'; - - $schema['image_styles'] = array( - 'description' => 'Stores configuration options for image styles.', - 'fields' => array( - 'isid' => array( - 'description' => 'The primary identifier for an image style.', - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - ), - 'name' => array( - 'description' => 'The style name.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - ), - ), - 'primary key' => array('isid'), - 'unique keys' => array( - 'name' => array('name'), - ), - ); - - $schema['image_effects'] = array( - 'description' => 'Stores configuration options for image effects.', - 'fields' => array( - 'ieid' => array( - 'description' => 'The primary identifier for an image effect.', - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - ), - 'isid' => array( - 'description' => 'The {image_styles}.isid for an image style.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'weight' => array( - 'description' => 'The weight of the effect in the style.', - 'type' => 'int', - 'unsigned' => FALSE, - 'not null' => TRUE, - 'default' => 0, - ), - 'name' => array( - 'description' => 'The unique name of the effect to be executed.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - ), - 'data' => array( - 'description' => 'The configuration data for the effect.', - 'type' => 'blob', - 'not null' => TRUE, - 'size' => 'big', - 'serialize' => TRUE, - ), - ), - 'primary key' => array('ieid'), - 'indexes' => array( - 'isid' => array('isid'), - 'weight' => array('weight'), - ), - 'foreign keys' => array( - 'image_style' => array( - 'table' => 'image_styles', - 'columns' => array('isid' => 'isid'), - ), - ), - ); - - db_create_table('cache_image', $schema['cache_image']); - db_create_table('image_styles', $schema['image_styles']); - db_create_table('image_effects', $schema['image_effects']); - } -} - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Rename possibly misnamed {image_effect} table to {image_effects}. - */ -function image_update_7001() { - // Due to a bug in earlier versions of image_update_7000() it is possible - // to end up with an {image_effect} table where there should be an - // {image_effects} table. - if (!db_table_exists('image_effects') && db_table_exists('image_effect')) { - db_rename_table('image_effect', 'image_effects'); - } -} - -/** - * Add width and height columns to a specific table. - * - * @param $table - * The name of the database table to be updated. - * @param $columns - * Keyed array of columns this table is supposed to have. - */ -function _image_update_7002_add_columns($table, $field_name) { - $spec = array( - 'type' => 'int', - 'unsigned' => TRUE, - ); - - $spec['description'] = 'The width of the image in pixels.'; - db_add_field($table, $field_name . '_width', $spec); - - $spec['description'] = 'The height of the image in pixels.'; - db_add_field($table, $field_name . '_height', $spec); -} - -/** - * Populate image dimensions in a specific table. - * - * @param $table - * The name of the database table to be updated. - * @param $columns - * Keyed array of columns this table is supposed to have. - * @param $last_fid - * The fid of the last image to have been processed. - * - * @return - * The number of images that were processed. - */ -function _image_update_7002_populate_dimensions($table, $field_name, &$last_fid) { - // Define how many images to process per pass. - $images_per_pass = 100; - - // Query the database for fid / URI pairs. - $query = db_select($table, NULL, array('fetch' => PDO::FETCH_ASSOC)); - $query->join('file_managed', NULL, $table . '.' . $field_name . '_fid = file_managed.fid'); - - if ($last_fid) { - $query->condition('file_managed.fid', $last_fid, '>'); - } - - $result = $query->fields('file_managed', array('fid', 'uri')) - ->orderBy('file_managed.fid') - ->range(0, $images_per_pass) - ->execute(); - - $count = 0; - foreach ($result as $file) { - $count++; - $info = image_get_info($file['uri']); - - if (is_array($info)) { - db_update($table) - ->fields(array( - $field_name . '_width' => $info['width'], - $field_name . '_height' => $info['height'], - )) - ->condition($field_name . '_fid', $file['fid']) - ->execute(); - } - } - - // If less than the requested number of rows were returned then this table - // has been fully processed. - $last_fid = ($count < $images_per_pass) ? NULL : $file['fid']; - return $count; -} - -/** - * Add width and height columns to image field schema and populate. - */ -function image_update_7002(array &$sandbox) { - if (empty($sandbox)) { - // Setup the sandbox. - $sandbox = array( - 'tables' => array(), - 'total' => 0, - 'processed' => 0, - 'last_fid' => NULL, - ); - - $fields = _update_7000_field_read_fields(array( - 'module' => 'image', - 'storage_type' => 'field_sql_storage', - 'deleted' => 0, - )); - - foreach ($fields as $field) { - $tables = array( - _field_sql_storage_tablename($field), - _field_sql_storage_revision_tablename($field), - ); - foreach ($tables as $table) { - // Add the width and height columns to the table. - _image_update_7002_add_columns($table, $field['field_name']); - - // How many rows need dimensions populated? - $count = db_select($table)->countQuery()->execute()->fetchField(); - - if (!$count) { - continue; - } - - $sandbox['total'] += $count; - $sandbox['tables'][$table] = $field['field_name']; - } - } - - // If no tables need rows populated with dimensions then we are done. - if (empty($sandbox['tables'])) { - $sandbox = array(); - return; - } - } - - // Process the table at the top of the list. - $keys = array_keys($sandbox['tables']); - $table = reset($keys); - $sandbox['processed'] += _image_update_7002_populate_dimensions($table, $sandbox['tables'][$table], $sandbox['last_fid']); - - // Has the table been fully processed? - if (!$sandbox['last_fid']) { - unset($sandbox['tables'][$table]); - } - - $sandbox['#finished'] = count($sandbox['tables']) ? ($sandbox['processed'] / $sandbox['total']) : 1; -} - -/** - * Remove the variables that set alt and title length since they were not - * used for database column size and could cause PDO exceptions. - */ -function image_update_7003() { - variable_del('image_alt_length'); - variable_del('image_title_length'); -} - -/** - * Use a large setting (512 and 1024 characters) for the length of the image alt - * and title fields. - */ -function image_update_7004() { - $alt_spec = array( - 'type' => 'varchar', - 'length' => 512, - 'not null' => FALSE, - ); - - $title_spec = array( - 'type' => 'varchar', - 'length' => 1024, - 'not null' => FALSE, - ); - - $fields = _update_7000_field_read_fields(array( - 'module' => 'image', - 'storage_type' => 'field_sql_storage', - )); - - foreach ($fields as $field_name => $field) { - $tables = array( - _field_sql_storage_tablename($field), - _field_sql_storage_revision_tablename($field), - ); - $alt_column = $field['field_name'] . '_alt'; - $title_column = $field['field_name'] . '_title'; - foreach ($tables as $table) { - db_change_field($table, $alt_column, $alt_column, $alt_spec); - db_change_field($table, $title_column, $title_column, $title_spec); - } - } -} - -/** - * Add a column to the 'image_style' table to store administrative labels. - */ -function image_update_7005() { - $field = array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The style administrative name.', - ); - db_add_field('image_styles', 'label', $field); - - // Do a direct query here, rather than calling image_styles(), - // in case Image module is disabled. - $styles = db_query('SELECT name FROM {image_styles}')->fetchCol(); - foreach ($styles as $style) { - db_update('image_styles') - ->fields(array('label' => $style)) - ->condition('name', $style) - ->execute(); - } -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ - -/** - * Implements hook_requirements() to check the PHP GD Library. - * - * @param $phase - */ -function image_requirements($phase) { - $requirements = array(); - - if ($phase == 'runtime') { - // Check for the PHP GD library. - if (function_exists('imagegd2')) { - $info = gd_info(); - $requirements['image_gd'] = array( - 'value' => $info['GD Version'], - ); - - // Check for filter and rotate support. - if (function_exists('imagefilter') && function_exists('imagerotate')) { - $requirements['image_gd']['severity'] = REQUIREMENT_OK; - } - else { - $requirements['image_gd']['severity'] = REQUIREMENT_WARNING; - $requirements['image_gd']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See the PHP manual.'); - } - } - else { - $requirements['image_gd'] = array( - 'value' => t('Not installed'), - 'severity' => REQUIREMENT_ERROR, - 'description' => t('The GD library for PHP is missing or outdated. Check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/book.image.php')), - ); - } - $requirements['image_gd']['title'] = t('GD library rotate and desaturate effects'); - } - - return $requirements; -} diff --git a/modules/image/sample.png b/modules/image/sample.png deleted file mode 100644 index f22e0df..0000000 Binary files a/modules/image/sample.png and /dev/null differ diff --git a/modules/image/tests/image_module_test.info b/modules/image/tests/image_module_test.info deleted file mode 100644 index db7eacd..0000000 --- a/modules/image/tests/image_module_test.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Image test -description = Provides hook implementations for testing Image module functionality. -package = Core -version = VERSION -core = 7.x -files[] = image_module_test.module -hidden = TRUE diff --git a/modules/image/tests/image_module_test.module b/modules/image/tests/image_module_test.module deleted file mode 100644 index 8a322fb..0000000 --- a/modules/image/tests/image_module_test.module +++ /dev/null @@ -1,50 +0,0 @@ - 'image_module_test'); - } -} - -/** - * Implements hook_image_effect_info(). - */ -function image_module_test_image_effect_info() { - $effects = array( - 'image_module_test_null' => array( - 'effect callback' => 'image_module_test_null_effect', - ), - ); - - return $effects; -} - -/** - * Image effect callback; Null. - * - * @param $image - * An image object returned by image_load(). - * @param $data - * An array with no attributes. - * - * @return - * TRUE - */ -function image_module_test_null_effect(array &$image, array $data) { - return TRUE; -} - -/** - * Implements hook_image_effect_info_alter(). - * - * Used to keep a count of cache misses in image_effect_definitions(). - */ -function image_module_test_image_effect_info_alter(&$effects) { - $image_effects_definition_called = &drupal_static(__FUNCTION__, 0); - $image_effects_definition_called++; -} diff --git a/modules/locale/locale-rtl.css b/modules/locale/locale-rtl.css deleted file mode 100644 index aaf1988..0000000 --- a/modules/locale/locale-rtl.css +++ /dev/null @@ -1,12 +0,0 @@ - -#locale-translation-filter-form .form-item-language, -#locale-translation-filter-form .form-item-translation, -#locale-translation-filter-form .form-item-group { - float: right; - padding-left: .8em; - padding-right: 0; -} -#locale-translation-filter-form .form-actions { - float: right; - padding: 3ex 1em 0 0; -} diff --git a/modules/locale/locale.api.php b/modules/locale/locale.api.php deleted file mode 100644 index 1f11fc9..0000000 --- a/modules/locale/locale.api.php +++ /dev/null @@ -1,41 +0,0 @@ - t('Custom')); - } -} - -/** - * Allow modules to react to language settings changes. - * - * Every module needing to act when the number of enabled languages changes - * should implement this. This is an "internal" hook and should not be invoked - * elsewhere. The typical implementation would trigger some kind of rebuilding, - * this way system components could properly react to the change of the enabled - * languages number. - */ -function hook_multilingual_settings_changed() { - field_info_cache_clear(); -} - -/** - * @} End of "addtogroup hooks". - */ diff --git a/modules/locale/locale.css b/modules/locale/locale.css deleted file mode 100644 index 38112b5..0000000 --- a/modules/locale/locale.css +++ /dev/null @@ -1,32 +0,0 @@ - -.locale-untranslated { - font-style: normal; - text-decoration: line-through; -} - -#locale-translation-filter-form .form-item-language, -#locale-translation-filter-form .form-item-translation, -#locale-translation-filter-form .form-item-group { - float: left; /* LTR */ - padding-right: .8em; /* LTR */ - margin: 0.1em; - /** - * In Opera 9, DOM elements with the property of "overflow: auto" - * will partially hide its contents with unnecessary scrollbars when - * its immediate child is floated without an explicit width set. - */ - width: 15em; -} -#locale-translation-filter-form .form-type-select select { - width: 100%; -} -#locale-translation-filter-form .form-actions { - float: left; /* LTR */ - padding: 3ex 0 0 1em; /* LTR */ -} -.language-switcher-locale-session a.active { - color: #0062A0; -} -.language-switcher-locale-session a.session-active { - color: #000000; -} diff --git a/modules/locale/locale.datepicker.js b/modules/locale/locale.datepicker.js deleted file mode 100644 index f819282..0000000 --- a/modules/locale/locale.datepicker.js +++ /dev/null @@ -1,79 +0,0 @@ -(function ($) { - -/** - * Attaches language support to the jQuery UI datepicker component. - */ -Drupal.behaviors.localeDatepicker = { - attach: function(context, settings) { - // This code accesses Drupal.settings and localized strings via Drupal.t(). - // So this code should run after these are initialized. By placing it in an - // attach behavior this is assured. - $.datepicker.regional['drupal-locale'] = $.extend({ - closeText: Drupal.t('Done'), - prevText: Drupal.t('Prev'), - nextText: Drupal.t('Next'), - currentText: Drupal.t('Today'), - monthNames: [ - Drupal.t('January'), - Drupal.t('February'), - Drupal.t('March'), - Drupal.t('April'), - Drupal.t('May'), - Drupal.t('June'), - Drupal.t('July'), - Drupal.t('August'), - Drupal.t('September'), - Drupal.t('October'), - Drupal.t('November'), - Drupal.t('December') - ], - monthNamesShort: [ - Drupal.t('Jan'), - Drupal.t('Feb'), - Drupal.t('Mar'), - Drupal.t('Apr'), - Drupal.t('May'), - Drupal.t('Jun'), - Drupal.t('Jul'), - Drupal.t('Aug'), - Drupal.t('Sep'), - Drupal.t('Oct'), - Drupal.t('Nov'), - Drupal.t('Dec') - ], - dayNames: [ - Drupal.t('Sunday'), - Drupal.t('Monday'), - Drupal.t('Tuesday'), - Drupal.t('Wednesday'), - Drupal.t('Thursday'), - Drupal.t('Friday'), - Drupal.t('Saturday') - ], - dayNamesShort: [ - Drupal.t('Sun'), - Drupal.t('Mon'), - Drupal.t('Tue'), - Drupal.t('Wed'), - Drupal.t('Thu'), - Drupal.t('Fri'), - Drupal.t('Sat') - ], - dayNamesMin: [ - Drupal.t('Su'), - Drupal.t('Mo'), - Drupal.t('Tu'), - Drupal.t('We'), - Drupal.t('Th'), - Drupal.t('Fr'), - Drupal.t('Sa') - ], - dateFormat: Drupal.t('mm/dd/yy'), - firstDay: 0, - isRTL: 0 - }, Drupal.settings.jquery.ui.datepicker); - $.datepicker.setDefaults($.datepicker.regional['drupal-locale']); - } -}; - -})(jQuery); diff --git a/modules/locale/locale.info b/modules/locale/locale.info deleted file mode 100644 index 1d6bdcf..0000000 --- a/modules/locale/locale.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Locale -description = Adds language handling functionality and enables the translation of the user interface to languages other than English. -package = Core -version = VERSION -core = 7.x -files[] = locale.test -configure = admin/config/regional/language diff --git a/modules/locale/locale.install b/modules/locale/locale.install deleted file mode 100644 index b4db757..0000000 --- a/modules/locale/locale.install +++ /dev/null @@ -1,457 +0,0 @@ -fields(array( - 'language' => 'en', - 'name' => 'English', - 'native' => 'English', - 'direction' => 0, - 'enabled' => 1, - 'weight' => 0, - 'javascript' => '', - )) - ->execute(); -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Add context field index and allow longer location. - */ -function locale_update_7000() { - db_drop_index('locales_source', 'source'); - db_add_index('locales_source', 'source_context', array(array('source', 30), 'context')); - - // Also drop the 'textgroup_location' index added by the i18nstrings module - // of the i18n project, which prevents the below schema update from running. - if (db_index_exists('locales_source', 'textgroup_location')) { - db_drop_index('locales_source', 'textgroup_location'); - } - - db_change_field('locales_source', 'location', 'location', array( - 'type' => 'text', - 'not null' => FALSE, - 'size' => 'big', - 'description' => 'Drupal path in case of online discovered translations or file path in case of imported strings.', - )); -} - -/** - * Upgrade language negotiation settings. - */ -function locale_update_7001() { - require_once DRUPAL_ROOT . '/includes/language.inc'; - require_once DRUPAL_ROOT . '/includes/locale.inc'; - require_once DRUPAL_ROOT . '/modules/locale/locale.module'; - - switch (variable_get('language_negotiation', 0)) { - // LANGUAGE_NEGOTIATION_NONE. - case 0: - $negotiation = array(); - break; - - // LANGUAGE_NEGOTIATION_PATH_DEFAULT. - case 1: - $negotiation = array(LOCALE_LANGUAGE_NEGOTIATION_URL); - // In Drupal 6 path prefixes are shown for the default language only when - // language negotiation is set to LANGUAGE_NEGOTIATION_PATH, while in - // Drupal 7 path prefixes are always shown if not empty. Hence we need to - // ensure that the default language has an empty prefix to avoid breaking - // the site URLs with a prefix that previously was missing. - $default = language_default(); - $default->prefix = ''; - variable_set('language_default', $default); - db_update('languages') - ->fields(array('prefix' => $default->prefix)) - ->condition('language', $default->language) - ->execute(); - break; - - // LANGUAGE_NEGOTIATION_PATH. - case 2: - $negotiation = array(LOCALE_LANGUAGE_NEGOTIATION_URL, LOCALE_LANGUAGE_NEGOTIATION_USER, LOCALE_LANGUAGE_NEGOTIATION_BROWSER); - break; - - // LANGUAGE_NEGOTIATION_DOMAIN. - case 3: - variable_set('locale_language_negotiation_url_part', LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN); - $negotiation = array(LOCALE_LANGUAGE_NEGOTIATION_URL); - break; - } - - // Save the new language negotiation options. - language_negotiation_set(LANGUAGE_TYPE_INTERFACE, array_flip($negotiation)); - language_negotiation_set(LANGUAGE_TYPE_CONTENT, array(LOCALE_LANGUAGE_NEGOTIATION_INTERFACE => 0)); - language_negotiation_set(LANGUAGE_TYPE_URL, array(LOCALE_LANGUAGE_NEGOTIATION_URL => 0)); - - // Save admininstration UI settings. - $type = LANGUAGE_TYPE_INTERFACE; - $provider_weights = array_flip(array_keys(locale_language_negotiation_info())); - variable_set("locale_language_providers_weight_$type", $provider_weights); - - // Unset the old language negotiation system variable. - variable_del('language_negotiation'); - - return array(); -} - -/** - * Updates URL language negotiation by adding the URL fallback detection method. - */ -function locale_update_7002() { - // language.inc may not have been included during bootstrap if there is not - // more than one language currently enabled. - require_once DRUPAL_ROOT . '/includes/language.inc'; - $language_types_info = language_types_info(); - $info = $language_types_info[LANGUAGE_TYPE_URL]; - if (isset($info['fixed'])) { - language_negotiation_set(LANGUAGE_TYPE_URL, array_flip($info['fixed'])); - } -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Update "language_count" variable. - */ -function locale_update_7003() { - $languages = language_list('enabled'); - variable_set('language_count', count($languages[1])); -} - -/** - * Remove duplicates in {locales_source}. - */ -function locale_update_7004() { - // Look up all duplicates. For each set of duplicates, we select the row - // with the lowest lid as the "master" that will be preserved. - $result_source = db_query("SELECT MIN(lid) AS lid, source, context FROM {locales_source} WHERE textgroup = 'default' GROUP BY source, context HAVING COUNT(*) > 1"); - - $conflict = FALSE; - foreach ($result_source as $source) { - // Find all rows in {locales_target} that are translations of the same - // string (incl. context). - $result_target = db_query("SELECT t.lid, t.language, t.plural, t.translation FROM {locales_source} s JOIN {locales_target} t ON s.lid = t.lid WHERE s.source = :source AND s.context = :context AND s.textgroup = 'default' ORDER BY lid", array( - ':source' => $source->source, - ':context' => $source->context, - )); - - $translations = array(); - $keep_lids = array($source->lid); - foreach ($result_target as $target) { - if (!isset($translations[$target->language])) { - $translations[$target->language] = $target->translation; - if ($target->lid != $source->lid) { - // Move translation to the master lid. - db_query('UPDATE {locales_target} SET lid = :new_lid WHERE lid = :old_lid', array( - ':new_lid' => $source->lid, - ':old_lid' => $target->lid)); - } - } - elseif ($translations[$target->language] == $target->translation) { - // Delete duplicate translation. - db_query('DELETE FROM {locales_target} WHERE lid = :lid AND language = :language', array( - ':lid' => $target->lid, - ':language' => $target->language)); - } - else { - // The same string is translated into several different strings in one - // language. We do not know which is the preferred, so we keep them all. - $keep_lids[] = $target->lid; - $conflict = TRUE; - } - } - - // Delete rows in {locales_source} that are no longer referenced from - // {locales_target}. - db_delete('locales_source') - ->condition('source', $source->source) - ->condition('context', $source->context) - ->condition('textgroup', 'default') - ->condition('lid', $keep_lids, 'NOT IN') - ->execute(); - } - - if ($conflict) { - $url = 'http://drupal.org/node/746240'; - drupal_set_message('Your {locales_source} table contains duplicates that could not be removed automatically. See ' . $url . ' for more information.', 'warning'); - } -} - -/** - * Increase {locales_languages}.formula column's length. - */ -function locale_update_7005() { - db_change_field('languages', 'formula', 'formula', array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Plural formula in PHP code to evaluate to get plural indexes.', - )); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ - -/** - * Implements hook_uninstall(). - */ -function locale_uninstall() { - // Delete all JavaScript translation files. - $locale_js_directory = 'public://' . variable_get('locale_js_directory', 'languages'); - - if (is_dir($locale_js_directory)) { - $files = db_query('SELECT language, javascript FROM {languages}'); - foreach ($files as $file) { - if (!empty($file->javascript)) { - file_unmanaged_delete($locale_js_directory . '/' . $file->language . '_' . $file->javascript . '.js'); - } - } - // Delete the JavaScript translations directory if empty. - if (!file_scan_directory($locale_js_directory, '/.*/')) { - drupal_rmdir($locale_js_directory); - } - } - - // Clear variables. - variable_del('language_default'); - variable_del('language_count'); - variable_del('language_types'); - variable_del('locale_language_negotiation_url_part'); - variable_del('locale_language_negotiation_session_param'); - variable_del('language_content_type_default'); - variable_del('language_content_type_negotiation'); - variable_del('locale_cache_strings'); - variable_del('locale_js_directory'); - variable_del('javascript_parsed'); - variable_del('locale_field_language_fallback'); - variable_del('locale_cache_length'); - - foreach (language_types() as $type) { - variable_del("language_negotiation_$type"); - variable_del("locale_language_providers_weight_$type"); - } - - foreach (node_type_get_types() as $type => $content_type) { - $setting = variable_del("language_content_type_$type"); - } - - // Switch back to English: with a $language->language value different from 'en' - // successive calls of t() might result in calling locale(), which in turn might - // try to query the unexisting {locales_source} and {locales_target} tables. - drupal_language_initialize(); - -} - -/** - * Implements hook_schema(). - */ -function locale_schema() { - $schema['languages'] = array( - 'description' => 'List of all available languages in the system.', - 'fields' => array( - 'language' => array( - 'type' => 'varchar', - 'length' => 12, - 'not null' => TRUE, - 'default' => '', - 'description' => "Language code, e.g. 'de' or 'en-US'.", - ), - 'name' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Language name in English.', - ), - 'native' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Native language name.', - ), - 'direction' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Direction of language (Left-to-Right = 0, Right-to-Left = 1).', - ), - 'enabled' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Enabled flag (1 = Enabled, 0 = Disabled).', - ), - 'plurals' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Number of plural indexes in this language.', - ), - 'formula' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Plural formula in PHP code to evaluate to get plural indexes.', - ), - 'domain' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Domain to use for this language.', - ), - 'prefix' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Path prefix to use for this language.', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Weight, used in lists of languages.', - ), - 'javascript' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Location of JavaScript translation file.', - ), - ), - 'primary key' => array('language'), - 'indexes' => array( - 'list' => array('weight', 'name'), - ), - ); - - $schema['locales_source'] = array( - 'description' => 'List of English source strings.', - 'fields' => array( - 'lid' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'Unique identifier of this string.', - ), - 'location' => array( - 'type' => 'text', - 'not null' => FALSE, - 'size' => 'big', - 'description' => 'Drupal path in case of online discovered translations or file path in case of imported strings.', - ), - 'textgroup' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => 'default', - 'description' => 'A module defined group of translations, see hook_locale().', - ), - 'source' => array( - 'type' => 'text', - 'mysql_type' => 'blob', - 'not null' => TRUE, - 'description' => 'The original string in English.', - ), - 'context' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The context this string applies to.', - ), - 'version' => array( - 'type' => 'varchar', - 'length' => 20, - 'not null' => TRUE, - 'default' => 'none', - 'description' => 'Version of Drupal, where the string was last used (for locales optimization).', - ), - ), - 'primary key' => array('lid'), - 'indexes' => array( - 'source_context' => array(array('source', 30), 'context'), - ), - ); - - $schema['locales_target'] = array( - 'description' => 'Stores translated versions of strings.', - 'fields' => array( - 'lid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Source string ID. References {locales_source}.lid.', - ), - 'translation' => array( - 'type' => 'text', - 'mysql_type' => 'blob', - 'not null' => TRUE, - 'description' => 'Translation string value in this language.', - ), - 'language' => array( - 'type' => 'varchar', - 'length' => 12, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Language code. References {languages}.language.', - ), - 'plid' => array( - 'type' => 'int', - 'not null' => TRUE, // This should be NULL for no referenced string, not zero. - 'default' => 0, - 'description' => 'Parent lid (lid of the previous string in the plural chain) in case of plural strings. References {locales_source}.lid.', - ), - 'plural' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Plural index number in case of plural strings.', - ), - ), - 'primary key' => array('language', 'lid', 'plural'), - 'foreign keys' => array( - 'locales_source' => array( - 'table' => 'locales_source', - 'columns' => array('lid' => 'lid'), - ), - ), - 'indexes' => array( - 'lid' => array('lid'), - 'plid' => array('plid'), - 'plural' => array('plural'), - ), - ); - - return $schema; -} - diff --git a/modules/locale/locale.module b/modules/locale/locale.module deleted file mode 100644 index 768fead..0000000 --- a/modules/locale/locale.module +++ /dev/null @@ -1,1098 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Locale module allows your Drupal site to be presented in languages other than the default English, and to be multilingual. The Locale module works by maintaining a database of translations, and examining text as it is about to be displayed. When a translation of the text is available in the language to be displayed, the translation is displayed rather than the original text. When a translation is unavailable, the original text is displayed, and then stored for review by a translator. For more information, see the online handbook entry for Locale module.', array('@locale' => 'http://drupal.org/documentation/modules/locale/')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Translating interface text') . ' '; - $output .= '
- ' . t('Translations of text in the Drupal interface may be provided by:');
- $output .= '
- ';
- $output .= '
- ' . t("Translating within your site, using the Locale module's integrated translation interface.", array('@translate' => url('admin/config/regional/translate'))) . ' '; - $output .= '
- ' . t('Importing files from a set of existing translations, known as a translation package. A translation package enables the display of a specific version of Drupal in a specific language, and contains files in the Gettext Portable Object (.po) format. Although not all languages are available for every version of Drupal, translation packages for many languages are available for download from the Drupal translations page.', array('@translations' => 'http://localize.drupal.org')) . ' '; - $output .= '
- ' . t("If an existing translation package does not meet your needs, the Gettext Portable Object (.po) files within a package may be modified, or new .po files may be created, using a desktop Gettext editor. The Locale module's import feature allows the translated strings from a new or modified .po file to be added to your site. The Locale module's export feature generates files from your site's translated strings, that can either be shared with others or edited offline by a Gettext translation editor.", array('@import' => url('admin/config/regional/translate/import'), '@export' => url('admin/config/regional/translate/export'))) . ' '; - $output .= '
';
- $output .= ' - ' . t('Configuring a multilingual site') . ' '; - $output .= '
- ' . t("Language negotiation allows your site to automatically change language based on the domain or path used for each request. Users may (optionally) select their preferred language on their My account page, and your site can be configured to honor a web browser's preferred language settings. Site content can be translated using the Content translation module.", array('@content-help' => url('admin/help/translation'))) . ' '; - $output .= '
' . t('With multiple languages enabled, interface text can be translated, registered users may select their preferred language, and authors can assign a specific language to content. Download contributed translations from Drupal.org.', array('@translations' => 'http://localize.drupal.org')) . '
'; - return $output; - case 'admin/config/regional/language/add': - return '' . t('Add a language to be supported by your site. If your desired language is not available in the Language name drop-down, click Custom language and provide a language code and other details manually. When providing a language code manually, be sure to enter a standardized language code, since this code may be used by browsers to determine an appropriate display language.') . '
'; - case 'admin/config/regional/language/configure': - $output = '' . t("Define how to decide which language is used to display page elements (primarily text provided by Drupal and modules, such as field labels and help text). This decision is made by evaluating a series of detection methods for languages; the first detection method that gets a result will determine which language is used for that type of text. Define the order of evaluation of language detection methods on this page.") . '
'; - return $output; - case 'admin/config/regional/language/configure/session': - $output = '' . t('Determine the language from a request/session parameter. Example: "http://example.com?language=de" sets language to German based on the use of "de" within the "language" parameter.') . '
'; - return $output; - case 'admin/config/regional/translate': - $output = '' . t('This page provides an overview of available translatable strings. Drupal displays translatable strings in text groups; modules may define additional text groups containing other translatable strings. Because text groups provide a method of grouping related strings, they are often used to focus translation efforts on specific areas of the Drupal interface.') . '
'; - $output .= '' . t('See the Languages page for more information on adding support for additional languages.', array('@languages' => url('admin/config/regional/language'))) . '
'; - return $output; - case 'admin/config/regional/translate/import': - $output = '' . t('This page imports the translated strings contained in an individual Gettext Portable Object (.po) file. Normally distributed as part of a translation package (each translation package may contain several .po files), a .po file may need to be imported after offline editing in a Gettext translation editor. Importing an individual .po file may be a lengthy process.') . '
'; - $output .= '' . t('Note that the .po files within a translation package are imported automatically (if available) when new modules or themes are enabled, or as new languages are added. Since this page only allows the import of one .po file at a time, it may be simpler to download and extract a translation package into your Drupal installation directory and add the language (which automatically imports all .po files within the package). Translation packages are available for download on the Drupal translation page.', array('@language-add' => url('admin/config/regional/language/add'), '@translations' => 'http://localize.drupal.org')) . '
'; - return $output; - case 'admin/config/regional/translate/export': - return '' . t('This page exports the translated strings used by your site. An export file may be in Gettext Portable Object (.po) form, which includes both the original string and the translation (used to share translations with others), or in Gettext Portable Object Template (.pot) form, which includes the original strings only (used to create new translations with a Gettext translation editor).') . '
'; - case 'admin/config/regional/translate/translate': - return '' . t('This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: For translation tasks involving many strings, it may be more convenient to export strings for offline editing in a desktop Gettext translation editor.) Searches may be limited to strings found within a specific text group or in a specific language.', array('@export' => url('admin/config/regional/translate/export'))) . '
'; - case 'admin/structure/block/manage/%/%': - if ($arg[4] == 'locale' && $arg[5] == 'language') { - return '' . t('This block is only shown if at least two languages are enabled and language negotiation is set to URL or Session.', array('@languages' => url('admin/config/regional/language'), '@configuration' => url('admin/config/regional/language/configure'))) . '
'; - } - break; - } -} - -/** - * Implements hook_menu(). - */ -function locale_menu() { - // Manage languages - $items['admin/config/regional/language'] = array( - 'title' => 'Languages', - 'description' => 'Configure languages for content and the user interface.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_overview_form'), - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - 'weight' => -10, - ); - $items['admin/config/regional/language/overview'] = array( - 'title' => 'List', - 'weight' => 0, - 'type' => MENU_DEFAULT_LOCAL_TASK, - ); - $items['admin/config/regional/language/add'] = array( - 'title' => 'Add language', - 'page callback' => 'locale_languages_add_screen', // two forms concatenated - 'access arguments' => array('administer languages'), - 'weight' => 5, - 'type' => MENU_LOCAL_ACTION, - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/language/configure'] = array( - 'title' => 'Detection and selection', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_configure_form'), - 'access arguments' => array('administer languages'), - 'weight' => 10, - 'file' => 'locale.admin.inc', - 'type' => MENU_LOCAL_TASK, - ); - $items['admin/config/regional/language/configure/url'] = array( - 'title' => 'URL language detection configuration', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_language_providers_url_form'), - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - 'type' => MENU_VISIBLE_IN_BREADCRUMB, - ); - $items['admin/config/regional/language/configure/session'] = array( - 'title' => 'Session language detection configuration', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_language_providers_session_form'), - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - 'type' => MENU_VISIBLE_IN_BREADCRUMB, - ); - $items['admin/config/regional/language/edit/%'] = array( - 'title' => 'Edit language', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_edit_form', 5), - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/language/delete/%'] = array( - 'title' => 'Confirm', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_languages_delete_form', 5), - 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', - ); - - // Translation functionality - $items['admin/config/regional/translate'] = array( - 'title' => 'Translate interface', - 'description' => 'Translate the built in interface and optionally other text.', - 'page callback' => 'locale_translate_overview_screen', - 'access arguments' => array('translate interface'), - 'file' => 'locale.admin.inc', - 'weight' => -5, - ); - $items['admin/config/regional/translate/overview'] = array( - 'title' => 'Overview', - 'weight' => 0, - 'type' => MENU_DEFAULT_LOCAL_TASK, - ); - $items['admin/config/regional/translate/translate'] = array( - 'title' => 'Translate', - 'weight' => 10, - 'type' => MENU_LOCAL_TASK, - 'page callback' => 'locale_translate_seek_screen', // search results and form concatenated - 'access arguments' => array('translate interface'), - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/translate/import'] = array( - 'title' => 'Import', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_translate_import_form'), - 'access arguments' => array('translate interface'), - 'weight' => 20, - 'type' => MENU_LOCAL_TASK, - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/translate/export'] = array( - 'title' => 'Export', - 'page callback' => 'locale_translate_export_screen', // possibly multiple forms concatenated - 'access arguments' => array('translate interface'), - 'weight' => 30, - 'type' => MENU_LOCAL_TASK, - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/translate/edit/%'] = array( - 'title' => 'Edit string', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_translate_edit_form', 5), - 'access arguments' => array('translate interface'), - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/translate/delete/%'] = array( - 'title' => 'Delete string', - 'page callback' => 'locale_translate_delete_page', - 'page arguments' => array(5), - 'access arguments' => array('translate interface'), - 'file' => 'locale.admin.inc', - ); - - // Localize date formats. - $items['admin/config/regional/date-time/locale'] = array( - 'title' => 'Localize', - 'description' => 'Configure date formats for each locale', - 'page callback' => 'locale_date_format_language_overview_page', - 'access arguments' => array('administer site configuration'), - 'type' => MENU_LOCAL_TASK, - 'weight' => -8, - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/date-time/locale/%/edit'] = array( - 'title' => 'Localize date formats', - 'description' => 'Configure date formats for each locale', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_date_format_form', 5), - 'access arguments' => array('administer site configuration'), - 'file' => 'locale.admin.inc', - ); - $items['admin/config/regional/date-time/locale/%/reset'] = array( - 'title' => 'Reset date formats', - 'description' => 'Reset localized date formats to global defaults', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('locale_date_format_reset_form', 5), - 'access arguments' => array('administer site configuration'), - 'file' => 'locale.admin.inc', - ); - - return $items; -} - -/** - * Implements hook_init(). - * - * Initialize date formats according to the user's current locale. - */ -function locale_init() { - global $conf, $language; - include_once DRUPAL_ROOT . '/includes/locale.inc'; - - // For each date type (e.g. long, short), get the localized date format - // for the user's current language and override the default setting for it - // in $conf. This should happen on all pages except the date and time formats - // settings page, where we want to display the site default and not the - // localized version. - if (strpos($_GET['q'], 'admin/config/regional/date-time/formats') !== 0) { - $languages = array($language->language); - - // Setup appropriate date formats for this locale. - $formats = locale_get_localized_date_format($languages); - foreach ($formats as $format_type => $format) { - $conf[$format_type] = $format; - } - } -} - -/** - * Implements hook_permission(). - */ -function locale_permission() { - return array( - 'administer languages' => array( - 'title' => t('Administer languages'), - ), - 'translate interface' => array( - 'title' => t('Translate interface texts'), - 'restrict access' => TRUE, - ), - ); -} - -/** - * Implements hook_locale(). - */ -function locale_locale($op = 'groups') { - switch ($op) { - case 'groups': - return array('default' => t('Built-in interface')); - } -} - -/** - * Form builder callback to display language selection widget. - * - * @ingroup forms - * @see locale_form_alter() - */ -function locale_language_selector_form(&$form, &$form_state, $user) { - global $language; - $languages = language_list('enabled'); - $languages = $languages[1]; - - // If the user is being created, we set the user language to the page language. - $user_preferred_language = $user->uid ? user_preferred_language($user) : $language; - - $names = array(); - foreach ($languages as $langcode => $item) { - $name = t($item->name); - $names[$langcode] = $name . ($item->native != $name ? ' (' . $item->native . ')' : ''); - } - $form['locale'] = array( - '#type' => 'fieldset', - '#title' => t('Language settings'), - '#weight' => 1, - '#access' => ($form['#user_category'] == 'account' || ($form['#user_category'] == 'register' && user_access('administer users'))), - ); - - // Get language negotiation settings. - $mode = language_negotiation_get(LANGUAGE_TYPE_INTERFACE) != LANGUAGE_NEGOTIATION_DEFAULT; - $form['locale']['language'] = array( - '#type' => (count($names) <= 5 ? 'radios' : 'select'), - '#title' => t('Language'), - '#default_value' => $user_preferred_language->language, - '#options' => $names, - '#description' => $mode ? t("This account's default language for e-mails, and preferred language for site presentation.") : t("This account's default language for e-mails."), - ); -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function locale_form_path_admin_form_alter(&$form, &$form_state) { - $form['language'] = array( - '#type' => 'select', - '#title' => t('Language'), - '#options' => array(LANGUAGE_NONE => t('All languages')) + locale_language_list('name'), - '#default_value' => $form['language']['#value'], - '#weight' => -10, - '#description' => t('A path alias set for a specific language will always be used when displaying this page in that language, and takes precedence over path aliases set for All languages.'), - ); -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function locale_form_node_type_form_alter(&$form, &$form_state) { - if (isset($form['type'])) { - $form['workflow']['language_content_type'] = array( - '#type' => 'radios', - '#title' => t('Multilingual support'), - '#default_value' => variable_get('language_content_type_' . $form['#node_type']->type, 0), - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/config/regional/language'))), - ); - } -} - -/** - * Return whether the given content type has multilingual support. - * - * @return - * True if multilingual support is enabled. - */ -function locale_multilingual_node_type($type_name) { - return (bool) variable_get('language_content_type_' . $type_name, 0); -} - -/** - * Implements hook_form_alter(). - * - * Adds language fields to user forms. - */ -function locale_form_alter(&$form, &$form_state, $form_id) { - // Only alter user forms if there is more than one language. - if (drupal_multilingual()) { - // Display language selector when either creating a user on the admin - // interface or editing a user account. - if ($form_id == 'user_register_form' || ($form_id == 'user_profile_form' && $form['#user_category'] == 'account')) { - locale_language_selector_form($form, $form_state, $form['#user']); - } - } -} - -/** - * Implements hook_form_BASE_FORM_ID_alter(). - */ -function locale_form_node_form_alter(&$form, &$form_state) { - if (isset($form['#node']->type) && locale_multilingual_node_type($form['#node']->type)) { - $form['language'] = array( - '#type' => 'select', - '#title' => t('Language'), - '#default_value' => (isset($form['#node']->language) ? $form['#node']->language : ''), - '#options' => array(LANGUAGE_NONE => t('Language neutral')) + locale_language_list('name'), - ); - } - // Node type without language selector: assign the default for new nodes - elseif (!isset($form['#node']->nid)) { - $default = language_default(); - $form['language'] = array( - '#type' => 'value', - '#value' => $default->language - ); - } - $form['#submit'][] = 'locale_field_node_form_submit'; -} - -/** - * Form submit handler for node_form(). - * - * This submit handler needs to run before entity_form_submit_build_entity() - * is invoked by node_form_submit_build_node(), because it alters the values of - * attached fields. Therefore, it cannot be a hook_node_submit() implementation. - */ -function locale_field_node_form_submit($form, &$form_state) { - locale_field_entity_form_submit('node', $form, $form_state); -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function locale_form_comment_form_alter(&$form, &$form_state, $form_id) { - // If a content type has multilingual support we set the content language as - // comment language. - if ($form['language']['#value'] == LANGUAGE_NONE && locale_multilingual_node_type($form['#node']->type)) { - global $language_content; - $form['language']['#value'] = $language_content->language; - $submit_callback = 'locale_field_comment_form_submit'; - array_unshift($form['actions']['preview']['#submit'], $submit_callback); - array_unshift($form['#submit'], $submit_callback); - } -} - -/** - * Form submit handler for comment_form(). - * - * This submit handler needs to run before entity_form_submit_build_entity() - * is invoked by comment_form_submit_build_comment(), because it alters the - * values of attached fields. - */ -function locale_field_comment_form_submit($form, &$form_state) { - locale_field_entity_form_submit('comment', $form, $form_state); -} - -/** - * Handles field language on submit for the given entity type. - * - * Checks if Locale is registered as a translation handler and handle possible - * language changes. - */ -function locale_field_entity_form_submit($entity_type, $form, &$form_state ) { - if (field_has_translation_handler($entity_type, 'locale')) { - $entity = (object) $form_state['values']; - $current_language = entity_language($entity_type, $entity); - list(, , $bundle) = entity_extract_ids($entity_type, $entity); - - foreach (field_info_instances($entity_type, $bundle) as $instance) { - $field_name = $instance['field_name']; - $field = field_info_field($field_name); - $previous_language = $form[$field_name]['#language']; - - // Handle a possible language change: new language values are inserted, - // previous ones are deleted. - if ($field['translatable'] && $previous_language != $current_language) { - $form_state['values'][$field_name][$current_language] = $entity->{$field_name}[$previous_language]; - $form_state['values'][$field_name][$previous_language] = array(); - } - } - } -} - -/** - * Implements hook_theme(). - */ -function locale_theme() { - return array( - 'locale_languages_overview_form' => array( - 'render element' => 'form', - ), - 'locale_languages_configure_form' => array( - 'render element' => 'form', - ), - 'locale_date_format_form' => array( - 'render element' => 'form', - ), - ); -} - -/** - * Implements hook_field_language_alter(). - */ -function locale_field_language_alter(&$display_language, $context) { - // Do not apply core language fallback rules if they are disabled or if Locale - // is not registered as a translation handler. - if (variable_get('locale_field_language_fallback', TRUE) && field_has_translation_handler($context['entity_type'], 'locale')) { - locale_field_language_fallback($display_language, $context['entity'], $context['language']); - } -} - -/** - * Applies language fallback rules to the fields attached to the given entity. - * - * Core language fallback rules simply check if fields have a field translation - * for the requested language code. If so the requested language is returned, - * otherwise all the fallback candidates are inspected to see if there is a - * field translation available in another language. - * By default this is called by locale_field_language_alter(), but this - * behavior can be disabled by setting the 'locale_field_language_fallback' - * variable to FALSE. - * - * @param $display_language - * A reference to an array of language codes keyed by field name. - * @param $entity - * The entity to be displayed. - * @param $langcode - * The language code $entity has to be displayed in. - */ -function locale_field_language_fallback(&$display_language, $entity, $langcode) { - // Lazily init fallback candidates to avoid unnecessary calls. - $fallback_candidates = NULL; - $field_languages = array(); - - foreach ($display_language as $field_name => $field_language) { - // If the requested language is defined for the current field use it, - // otherwise search for a fallback value among the fallback candidates. - if (isset($entity->{$field_name}[$langcode])) { - $display_language[$field_name] = $langcode; - } - elseif (!empty($entity->{$field_name})) { - if (!isset($fallback_candidates)) { - require_once DRUPAL_ROOT . '/includes/language.inc'; - $fallback_candidates = language_fallback_get_candidates(); - } - foreach ($fallback_candidates as $fallback_language) { - if (isset($entity->{$field_name}[$fallback_language])) { - $display_language[$field_name] = $fallback_language; - break; - } - } - } - } -} - -/** - * Implements hook_entity_info_alter(). - */ -function locale_entity_info_alter(&$entity_info) { - $entity_info['node']['translation']['locale'] = TRUE; - if (isset($entity_info['comment'])) { - $entity_info['comment']['translation']['locale'] = TRUE; - } -} - -/** - * Implements hook_language_types_info(). - * - * Defines the three core language types: - * - Interface language is the only configurable language type in core. It is - * used by t() as the default language if none is specified. - * - Content language is by default non-configurable and inherits the interface - * language negotiated value. It is used by the Field API to determine the - * display language for fields if no explicit value is specified. - * - URL language is by default non-configurable and is determined through the - * URL language provider or the URL fallback provider if no language can be - * detected. It is used by l() as the default language if none is specified. - */ -function locale_language_types_info() { - require_once DRUPAL_ROOT . '/includes/locale.inc'; - return array( - LANGUAGE_TYPE_INTERFACE => array( - 'name' => t('User interface text'), - 'description' => t('Order of language detection methods for user interface text. If a translation of user interface text is available in the detected language, it will be displayed.'), - ), - LANGUAGE_TYPE_CONTENT => array( - 'name' => t('Content'), - 'description' => t('Order of language detection methods for content. If a version of content is available in the detected language, it will be displayed.'), - 'fixed' => array(LOCALE_LANGUAGE_NEGOTIATION_INTERFACE), - ), - LANGUAGE_TYPE_URL => array( - 'fixed' => array(LOCALE_LANGUAGE_NEGOTIATION_URL, LOCALE_LANGUAGE_NEGOTIATION_URL_FALLBACK), - ), - ); -} - -/** - * Implements hook_language_negotiation_info(). - */ -function locale_language_negotiation_info() { - $file = 'includes/locale.inc'; - $providers = array(); - - $providers[LOCALE_LANGUAGE_NEGOTIATION_URL] = array( - 'types' => array(LANGUAGE_TYPE_CONTENT, LANGUAGE_TYPE_INTERFACE, LANGUAGE_TYPE_URL), - 'callbacks' => array( - 'language' => 'locale_language_from_url', - 'switcher' => 'locale_language_switcher_url', - 'url_rewrite' => 'locale_language_url_rewrite_url', - ), - 'file' => $file, - 'weight' => -8, - 'name' => t('URL'), - 'description' => t('Determine the language from the URL (Path prefix or domain).'), - 'config' => 'admin/config/regional/language/configure/url', - ); - - $providers[LOCALE_LANGUAGE_NEGOTIATION_SESSION] = array( - 'callbacks' => array( - 'language' => 'locale_language_from_session', - 'switcher' => 'locale_language_switcher_session', - 'url_rewrite' => 'locale_language_url_rewrite_session', - ), - 'file' => $file, - 'weight' => -6, - 'name' => t('Session'), - 'description' => t('Determine the language from a request/session parameter.'), - 'config' => 'admin/config/regional/language/configure/session', - ); - - $providers[LOCALE_LANGUAGE_NEGOTIATION_USER] = array( - 'callbacks' => array('language' => 'locale_language_from_user'), - 'file' => $file, - 'weight' => -4, - 'name' => t('User'), - 'description' => t("Follow the user's language preference."), - ); - - $providers[LOCALE_LANGUAGE_NEGOTIATION_BROWSER] = array( - 'callbacks' => array('language' => 'locale_language_from_browser'), - 'file' => $file, - 'weight' => -2, - 'cache' => 0, - 'name' => t('Browser'), - 'description' => t("Determine the language from the browser's language settings."), - ); - - $providers[LOCALE_LANGUAGE_NEGOTIATION_INTERFACE] = array( - 'types' => array(LANGUAGE_TYPE_CONTENT), - 'callbacks' => array('language' => 'locale_language_from_interface'), - 'file' => $file, - 'weight' => 8, - 'name' => t('Interface'), - 'description' => t('Use the detected interface language.'), - ); - - $providers[LOCALE_LANGUAGE_NEGOTIATION_URL_FALLBACK] = array( - 'types' => array(LANGUAGE_TYPE_URL), - 'callbacks' => array('language' => 'locale_language_url_fallback'), - 'file' => $file, - 'weight' => 8, - 'name' => t('URL fallback'), - 'description' => t('Use an already detected language for URLs if none is found.'), - ); - - return $providers; -} - -/** - * Implements hook_modules_enabled(). - */ -function locale_modules_enabled($modules) { - include_once DRUPAL_ROOT . '/includes/language.inc'; - language_types_set(); - language_negotiation_purge(); -} - -/** - * Implements hook_modules_disabled(). - */ -function locale_modules_disabled($modules) { - locale_modules_enabled($modules); -} - -// --------------------------------------------------------------------------------- -// Locale core functionality - -/** - * Provides interface translation services. - * - * This function is called from t() to translate a string if needed. - * - * @param $string - * A string to look up translation for. If omitted, all the - * cached strings will be returned in all languages already - * used on the page. - * @param $context - * The context of this string. - * @param $langcode - * Language code to use for the lookup. - */ -function locale($string = NULL, $context = NULL, $langcode = NULL) { - global $language; - - // Use the advanced drupal_static() pattern, since this is called very often. - static $drupal_static_fast; - if (!isset($drupal_static_fast)) { - $drupal_static_fast['locale'] = &drupal_static(__FUNCTION__); - } - $locale_t = &$drupal_static_fast['locale']; - - - if (!isset($string)) { - // Return all cached strings if no string was specified - return $locale_t; - } - - $langcode = isset($langcode) ? $langcode : $language->language; - - // Store database cached translations in a static variable. Only build the - // cache after $language has been set to avoid an unnecessary cache rebuild. - if (!isset($locale_t[$langcode]) && isset($language)) { - $locale_t[$langcode] = array(); - // Disabling the usage of string caching allows a module to watch for - // the exact list of strings used on a page. From a performance - // perspective that is a really bad idea, so we have no user - // interface for this. Be careful when turning this option off! - if (variable_get('locale_cache_strings', 1) == 1) { - if ($cache = cache_get('locale:' . $langcode, 'cache')) { - $locale_t[$langcode] = $cache->data; - } - elseif (lock_acquire('locale_cache_' . $langcode)) { - // Refresh database stored cache of translations for given language. - // We only store short strings used in current version, to improve - // performance and consume less memory. - $result = db_query("SELECT s.source, s.context, t.translation, t.language FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.textgroup = 'default' AND s.version = :version AND LENGTH(s.source) < :length", array(':language' => $langcode, ':version' => VERSION, ':length' => variable_get('locale_cache_length', 75))); - foreach ($result as $data) { - $locale_t[$langcode][$data->context][$data->source] = (empty($data->translation) ? TRUE : $data->translation); - } - cache_set('locale:' . $langcode, $locale_t[$langcode]); - lock_release('locale_cache_' . $langcode); - } - } - } - - // If we have the translation cached, skip checking the database - if (!isset($locale_t[$langcode][$context][$string])) { - - // We do not have this translation cached, so get it from the DB. - $translation = db_query("SELECT s.lid, t.translation, s.version FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.source = :source AND s.context = :context AND s.textgroup = 'default'", array( - ':language' => $langcode, - ':source' => $string, - ':context' => (string) $context, - ))->fetchObject(); - if ($translation) { - // We have the source string at least. - // Cache translation string or TRUE if no translation exists. - $locale_t[$langcode][$context][$string] = (empty($translation->translation) ? TRUE : $translation->translation); - - if ($translation->version != VERSION) { - // This is the first use of this string under current Drupal version. Save version - // and clear cache, to include the string into caching next time. Saved version is - // also a string-history information for later pruning of the tables. - db_update('locales_source') - ->fields(array('version' => VERSION)) - ->condition('lid', $translation->lid) - ->execute(); - cache_clear_all('locale:', 'cache', TRUE); - } - } - else { - // We don't have the source string, cache this as untranslated. - db_merge('locales_source') - ->insertFields(array( - 'location' => request_uri(), - 'version' => VERSION, - )) - ->key(array( - 'source' => $string, - 'context' => (string) $context, - 'textgroup' => 'default', - )) - ->execute(); - $locale_t[$langcode][$context][$string] = TRUE; - // Clear locale cache so this string can be added in a later request. - cache_clear_all('locale:', 'cache', TRUE); - } - } - - return ($locale_t[$langcode][$context][$string] === TRUE ? $string : $locale_t[$langcode][$context][$string]); -} - -/** - * Reset static variables used by locale(). - */ -function locale_reset() { - drupal_static_reset('locale'); -} - -/** - * Returns plural form index for a specific number. - * - * The index is computed from the formula of this language. - * - * @param $count - * Number to return plural for. - * @param $langcode - * Optional language code to translate to a language other than - * what is used to display the page. - * - * @return - * The numeric index of the plural variant to use for this $langcode and - * $count combination or -1 if the language was not found or does not have a - * plural formula. - */ -function locale_get_plural($count, $langcode = NULL) { - global $language; - - // Used to locally cache the plural formulas for all languages. - $plural_formulas = &drupal_static(__FUNCTION__, array()); - - // Used to store precomputed plural indexes corresponding to numbers - // individually for each language. - $plural_indexes = &drupal_static(__FUNCTION__ . ':plurals', array()); - - $langcode = $langcode ? $langcode : $language->language; - - if (!isset($plural_indexes[$langcode][$count])) { - // Retrieve and statically cache the plural formulas for all languages. - if (empty($plural_formulas)) { - foreach (language_list() as $installed_language) { - $plural_formulas[$installed_language->language] = $installed_language->formula; - } - } - // If there is a plural formula for the language, evaluate it for the given - // $count and statically cache the result for the combination of language - // and count, since the result will always be identical. - if (!empty($plural_formulas[$langcode])) { - // $n is used inside the expression in the eval(). - $n = $count; - $plural_indexes[$langcode][$count] = @eval('return intval(' . $plural_formulas[$langcode] . ');'); - } - // In case there is no plural formula for English (no imported translation - // for English), use a default formula. - elseif ($langcode == 'en') { - $plural_indexes[$langcode][$count] = (int) ($count != 1); - } - // Otherwise, return -1 (unknown). - else { - $plural_indexes[$langcode][$count] = -1; - } - } - return $plural_indexes[$langcode][$count]; -} - - -/** - * Returns a language name - */ -function locale_language_name($lang) { - $list = &drupal_static(__FUNCTION__); - if (!isset($list)) { - $list = locale_language_list(); - } - return ($lang && isset($list[$lang])) ? $list[$lang] : t('All'); -} - -/** - * Returns array of language names - * - * @param $field - * 'name' => names in current language, localized - * 'native' => native names - * @param $all - * Boolean to return all languages or only enabled ones - */ -function locale_language_list($field = 'name', $all = FALSE) { - if ($all) { - $languages = language_list(); - } - else { - $languages = language_list('enabled'); - $languages = $languages[1]; - } - $list = array(); - foreach ($languages as $language) { - $list[$language->language] = ($field == 'name') ? t($language->name) : $language->$field; - } - return $list; -} - -/** - * Implements hook_modules_installed(). - */ -function locale_modules_installed($modules) { - locale_system_update($modules); -} - -/** - * Implements hook_themes_enabled(). - * - * @todo This is technically wrong. We must not import upon enabling, but upon - * initial installation. The theme system is missing an installation hook. - */ -function locale_themes_enabled($themes) { - locale_system_update($themes); -} - -/** - * Imports translations when new modules or themes are installed. - * - * This function will either import translation for the component change - * right away, or start a batch if more files need to be imported. - * - * @param $components - * An array of component (theme and/or module) names to import - * translations for. - */ -function locale_system_update($components) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; - if ($batch = locale_batch_by_component($components)) { - batch_set($batch); - } -} - -/** - * Implements hook_js_alter(). - * - * This function checks all JavaScript files currently added via drupal_add_js() - * and invokes parsing if they have not yet been parsed for Drupal.t() - * and Drupal.formatPlural() calls. Also refreshes the JavaScript translation - * file if necessary, and adds it to the page. - */ -function locale_js_alter(&$javascript) { - global $language; - - $dir = 'public://' . variable_get('locale_js_directory', 'languages'); - $parsed = variable_get('javascript_parsed', array()); - $files = $new_files = FALSE; - - // Require because locale_js_alter() could be called without locale_init(). - require_once DRUPAL_ROOT . '/includes/locale.inc'; - - foreach ($javascript as $item) { - if ($item['type'] == 'file') { - $files = TRUE; - $filepath = $item['data']; - if (!in_array($filepath, $parsed)) { - // Don't parse our own translations files. - if (substr($filepath, 0, strlen($dir)) != $dir) { - _locale_parse_js_file($filepath); - $parsed[] = $filepath; - $new_files = TRUE; - } - } - } - } - - // If there are any new source files we parsed, invalidate existing - // JavaScript translation files for all languages, adding the refresh - // flags into the existing array. - if ($new_files) { - $parsed += _locale_invalidate_js(); - } - - // If necessary, rebuild the translation file for the current language. - if (!empty($parsed['refresh:' . $language->language])) { - // Don't clear the refresh flag on failure, so that another try will - // be performed later. - if (_locale_rebuild_js()) { - unset($parsed['refresh:' . $language->language]); - } - // Store any changes after refresh was attempted. - variable_set('javascript_parsed', $parsed); - } - // If no refresh was attempted, but we have new source files, we need - // to store them too. This occurs if current page is in English. - elseif ($new_files) { - variable_set('javascript_parsed', $parsed); - } - - // Add the translation JavaScript file to the page. - if ($files && !empty($language->javascript)) { - // Add the translation JavaScript file to the page. - $file = $dir . '/' . $language->language . '_' . $language->javascript . '.js'; - $javascript[$file] = drupal_js_defaults($file); - } -} - -/** - * Implements hook_css_alter(). - * - * This function checks all CSS files currently added via drupal_add_css() and - * and checks to see if a related right to left CSS file should be included. - */ -function locale_css_alter(&$css) { - global $language; - - // If the current language is RTL, add the CSS file with the RTL overrides. - if ($language->direction == LANGUAGE_RTL) { - foreach ($css as $data => $item) { - // Only provide RTL overrides for files. - if ($item['type'] == 'file') { - $rtl_path = str_replace('.css', '-rtl.css', $item['data']); - if (file_exists($rtl_path) && !isset($css[$rtl_path])) { - // Replicate the same item, but with the RTL path and a little larger - // weight so that it appears directly after the original CSS file. - $item['data'] = $rtl_path; - $item['weight'] += 0.0001; - $css[$rtl_path] = $item; - } - } - } - } -} - - /** - * Implement hook_library_alter(). - * - * Provides the language support for the jQuery UI Date Picker. - */ -function locale_library_alter(&$libraries, $module) { - if ($module == 'system' && isset($libraries['ui.datepicker'])) { - global $language; - // locale.datepicker.js should be added in the JS_LIBRARY group, so that - // this attach behavior will execute early. JS_LIBRARY is the default for - // hook_library_info_alter(), thus does not have to be specified explicitly. - $datepicker = drupal_get_path('module', 'locale') . '/locale.datepicker.js'; - $libraries['ui.datepicker']['js'][$datepicker] = array(); - $libraries['ui.datepicker']['js'][] = array( - 'data' => array( - 'jquery' => array( - 'ui' => array( - 'datepicker' => array( - 'isRTL' => $language->direction == LANGUAGE_RTL, - 'firstDay' => variable_get('date_first_day', 0), - ), - ), - ), - ), - 'type' => 'setting', - ); - } -} - -// --------------------------------------------------------------------------------- -// Language switcher block - -/** - * Implements hook_block_info(). - */ -function locale_block_info() { - include_once DRUPAL_ROOT . '/includes/language.inc'; - $block = array(); - $info = language_types_info(); - foreach (language_types_configurable(FALSE) as $type) { - $block[$type] = array( - 'info' => t('Language switcher (@type)', array('@type' => $info[$type]['name'])), - // Not worth caching. - 'cache' => DRUPAL_NO_CACHE, - ); - } - return $block; -} - -/** - * Implements hook_block_view(). - * - * Displays a language switcher. Only show if we have at least two languages. - */ -function locale_block_view($type) { - if (drupal_multilingual()) { - $path = drupal_is_front_page() ? '' : $_GET['q']; - $links = language_negotiation_get_switch_links($type, $path); - - if (isset($links->links)) { - drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css'); - $class = "language-switcher-{$links->provider}"; - $variables = array('links' => $links->links, 'attributes' => array('class' => array($class))); - $block['content'] = theme('links__locale_block', $variables); - $block['subject'] = t('Languages'); - return $block; - } - } -} - -/** - * Implements hook_url_outbound_alter(). - * - * Rewrite outbound URLs with language based prefixes. - */ -function locale_url_outbound_alter(&$path, &$options, $original_path) { - // Only modify internal URLs. - if (!$options['external'] && drupal_multilingual()) { - static $drupal_static_fast; - if (!isset($drupal_static_fast)) { - $drupal_static_fast['callbacks'] = &drupal_static(__FUNCTION__); - } - $callbacks = &$drupal_static_fast['callbacks']; - - if (!isset($callbacks)) { - $callbacks = array(); - include_once DRUPAL_ROOT . '/includes/language.inc'; - - foreach (language_types_configurable() as $type) { - // Get URL rewriter callbacks only from enabled language providers. - $negotiation = variable_get("language_negotiation_$type", array()); - - foreach ($negotiation as $id => $provider) { - if (isset($provider['callbacks']['url_rewrite'])) { - if (isset($provider['file'])) { - require_once DRUPAL_ROOT . '/' . $provider['file']; - } - // Avoid duplicate callback entries. - $callbacks[$provider['callbacks']['url_rewrite']] = TRUE; - } - } - } - - $callbacks = array_keys($callbacks); - } - - foreach ($callbacks as $callback) { - $callback($path, $options); - } - - // No language dependent path allowed in this mode. - if (empty($callbacks)) { - unset($options['language']); - } - } -} diff --git a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info deleted file mode 100644 index 3744a9e..0000000 --- a/modules/locale/tests/locale_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "Locale Test" -description = "Support module for the locale layer tests." -core = 7.x -package = Testing -version = VERSION -hidden = TRUE diff --git a/modules/locale/tests/locale_test.js b/modules/locale/tests/locale_test.js deleted file mode 100644 index 0693bca..0000000 --- a/modules/locale/tests/locale_test.js +++ /dev/null @@ -1,46 +0,0 @@ - -Drupal.t("Standard Call t"); -Drupal -. -t -( -"Whitespace Call t" -) -; - -Drupal.t('Single Quote t'); -Drupal.t('Single Quote \'Escaped\' t'); -Drupal.t('Single Quote ' + 'Concat ' + 'strings ' + 't'); - -Drupal.t("Double Quote t"); -Drupal.t("Double Quote \"Escaped\" t"); -Drupal.t("Double Quote " + "Concat " + "strings " + "t"); - -Drupal.t("Context Unquoted t", {}, {context: "Context string unquoted"}); -Drupal.t("Context Single Quoted t", {}, {'context': "Context string single quoted"}); -Drupal.t("Context Double Quoted t", {}, {"context": "Context string double quoted"}); - -Drupal.t("Context !key Args t", {'!key': 'value'}, {context: "Context string"}); - -Drupal.formatPlural(1, "Standard Call plural", "Standard Call @count plural"); -Drupal -. -formatPlural -( -1, -"Whitespace Call plural", -"Whitespace Call @count plural" -) -; - -Drupal.formatPlural(1, 'Single Quote plural', 'Single Quote @count plural'); -Drupal.formatPlural(1, 'Single Quote \'Escaped\' plural', 'Single Quote \'Escaped\' @count plural'); - -Drupal.formatPlural(1, "Double Quote plural", "Double Quote @count plural"); -Drupal.formatPlural(1, "Double Quote \"Escaped\" plural", "Double Quote \"Escaped\" @count plural"); - -Drupal.formatPlural(1, "Context Unquoted plural", "Context Unquoted @count plural", {}, {context: "Context string unquoted"}); -Drupal.formatPlural(1, "Context Single Quoted plural", "Context Single Quoted @count plural", {}, {'context': "Context string single quoted"}); -Drupal.formatPlural(1, "Context Double Quoted plural", "Context Double Quoted @count plural", {}, {"context": "Context string double quoted"}); - -Drupal.formatPlural(1, "Context !key Args plural", "Context !key Args @count plural", {'!key': 'value'}, {context: "Context string"}); diff --git a/modules/locale/tests/locale_test.module b/modules/locale/tests/locale_test.module deleted file mode 100644 index 64f4aed..0000000 --- a/modules/locale/tests/locale_test.module +++ /dev/null @@ -1,242 +0,0 @@ - t('Custom')); - } -} - -/** - * Implements hook_boot(). - * - * For testing domain language negotiation, we fake it by setting - * the HTTP_HOST here - */ -function locale_test_boot() { - if (variable_get('locale_test_domain')) { - $_SERVER['HTTP_HOST'] = variable_get('locale_test_domain'); - } -} - -/** - * Implements hook_init(). - */ -function locale_test_init() { - locale_test_store_language_negotiation(); - if (isset($GLOBALS['language']) && isset($GLOBALS['language']->provider)) { - drupal_set_message(t('Language negotiation provider: @name', array('@name' => $GLOBALS['language']->provider))); - } -} - -/** - * Implements hook_language_types_info(). - */ -function locale_test_language_types_info() { - if (variable_get('locale_test_language_types', FALSE)) { - return array( - 'test_language_type' => array( - 'name' => t('Test'), - 'description' => t('A test language type.'), - ), - 'fixed_test_language_type' => array( - 'fixed' => array('test_language_provider'), - ), - ); - } -} - -/** - * Implements hook_menu(). - * - * @return array - */ -function locale_test_menu() { - $items = array(); - $items['locale_test_plural_format_page'] = array( - 'page callback' => 'locale_test_plural_format_page', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - - return $items; -} - -/** - * Implements hook_language_types_info_alter(). - */ -function locale_test_language_types_info_alter(array &$language_types) { - if (variable_get('locale_test_content_language_type', FALSE)) { - unset($language_types[LANGUAGE_TYPE_CONTENT]['fixed']); - } -} - -/** - * Implements hook_language_negotiation_info(). - */ -function locale_test_language_negotiation_info() { - if (variable_get('locale_test_language_negotiation_info', FALSE)) { - $info = array( - 'callbacks' => array( - 'language' => 'locale_test_language_provider', - ), - 'file' => drupal_get_path('module', 'locale_test') .'/locale_test.module', - 'weight' => -10, - 'description' => t('This is a test language provider.'), - ); - - return array( - 'test_language_provider' => array( - 'name' => t('Test'), - 'types' => array(LANGUAGE_TYPE_CONTENT, 'test_language_type', 'fixed_test_language_type'), - ) + $info, - 'test_language_provider_ts' => array( - 'name' => t('Type-specific test'), - 'types' => array('test_language_type'), - ) + $info, - ); - } -} - -/** - * Implements hook_language_negotiation_info_alter(). - */ -function locale_test_language_negotiation_info_alter(array &$language_providers) { - if (variable_get('locale_test_language_negotiation_info_alter', FALSE)) { - unset($language_providers[LOCALE_LANGUAGE_NEGOTIATION_INTERFACE]); - } -} - -/** - * Store the last negotiated languages. - */ -function locale_test_store_language_negotiation() { - $last = array(); - foreach (language_types() as $type) { - $last[$type] = $GLOBALS[$type]->language; - } - variable_set('locale_test_language_negotiation_last', $last); -} - -/** - * Test language provider. - */ -function locale_test_language_provider($languages) { - return 'it'; -} - -/** - * Returns markup for locale_get_plural testing. - * - * @return array - */ -function locale_test_plural_format_page() { - $tests = _locale_test_plural_format_tests(); - $result = array(); - foreach ($tests as $test) { - $string_param = array( - '@lang' => $test['language'], - '@locale_get_plural' => locale_get_plural($test['count'], $test['language']) - ); - $result[] = array( - '#prefix' => '
', - '#markup' => format_string('Language: @lang, locale_get_plural: @locale_get_plural.', $string_param), - ); - } - return $result; -} - -/** - * Helper function with list of test cases - * - * @return array - */ -function _locale_test_plural_format_tests() { - return array( - // Test data for English (no formula present). - array( - 'count' => 1, - 'language' => 'en', - 'expected-result' => 0, - ), - array( - 'count' => 0, - 'language' => 'en', - 'expected-result' => 1, - ), - array( - 'count' => 5, - 'language' => 'en', - 'expected-result' => 1, - ), - - // Test data for French (simpler formula). - array( - 'count' => 1, - 'language' => 'fr', - 'expected-result' => 0, - ), - array( - 'count' => 0, - 'language' => 'fr', - 'expected-result' => 1, - ), - array( - 'count' => 5, - 'language' => 'fr', - 'expected-result' => 1, - ), - - // Test data for Croatian (more complex formula). - array( - 'count' => 1, - 'language' => 'hr', - 'expected-result' => 0, - ), - array( - 'count' => 21, - 'language' => 'hr', - 'expected-result' => 0, - ), - array( - 'count' => 0, - 'language' => 'hr', - 'expected-result' => 2, - ), - array( - 'count' => 2, - 'language' => 'hr', - 'expected-result' => 1, - ), - array( - 'count' => 8, - 'language' => 'hr', - 'expected-result' => 2, - ), - - // Test data for Hungarian (nonexistent language). - array( - 'count' => 1, - 'language' => 'hu', - 'expected-result' => -1, - ), - array( - 'count' => 21, - 'language' => 'hu', - 'expected-result' => -1, - ), - array( - 'count' => 0, - 'language' => 'hu', - 'expected-result' => -1, - ), - ); -} diff --git a/modules/locale/tests/translations/test.xx.po b/modules/locale/tests/translations/test.xx.po deleted file mode 100644 index 659a6e3..0000000 --- a/modules/locale/tests/translations/test.xx.po +++ /dev/null @@ -1,28 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: Drupal 7\\n" -"MIME-Version: 1.0\\n" -"Content-Type: text/plain; charset=UTF-8\\n" -"Content-Transfer-Encoding: 8bit\\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\\n" - -msgid "Monday" -msgstr "lundi" - -msgid "Tuesday" -msgstr "mardi" - -msgid "Wednesday" -msgstr "mercredi" - -msgid "Thursday" -msgstr "jeudi" - -msgid "Friday" -msgstr "vendredi" - -msgid "Saturday" -msgstr "samedi" - -msgid "Sunday" -msgstr "dimanche" diff --git a/modules/menu/menu.admin.js b/modules/menu/menu.admin.js deleted file mode 100644 index 4fa094e..0000000 --- a/modules/menu/menu.admin.js +++ /dev/null @@ -1,46 +0,0 @@ -(function ($) { - -Drupal.behaviors.menuChangeParentItems = { - attach: function (context, settings) { - $('fieldset#edit-menu input').each(function () { - $(this).change(function () { - // Update list of available parent menu items. - Drupal.menu_update_parent_list(); - }); - }); - } -}; - -/** - * Function to set the options of the menu parent item dropdown. - */ -Drupal.menu_update_parent_list = function () { - var values = []; - - $('input:checked', $('fieldset#edit-menu')).each(function () { - // Get the names of all checked menus. - values.push(Drupal.checkPlain($.trim($(this).val()))); - }); - - var url = Drupal.settings.basePath + 'admin/structure/menu/parents'; - $.ajax({ - url: location.protocol + '//' + location.host + url, - type: 'POST', - data: {'menus[]' : values}, - dataType: 'json', - success: function (options) { - // Save key of last selected element. - var selected = $('fieldset#edit-menu #edit-menu-parent :selected').val(); - // Remove all exisiting options from dropdown. - $('fieldset#edit-menu #edit-menu-parent').children().remove(); - // Add new options to dropdown. - jQuery.each(options, function(index, value) { - $('fieldset#edit-menu #edit-menu-parent').append( - $('').val(index).text(value) - ); - }); - } - }); -}; - -})(jQuery); diff --git a/modules/menu/menu.api.php b/modules/menu/menu.api.php deleted file mode 100644 index 22d93ef..0000000 --- a/modules/menu/menu.api.php +++ /dev/null @@ -1,87 +0,0 @@ - 'Holds definitions for top-level custom menus (for example, Main menu).', - 'fields' => array( - 'menu_name' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Primary Key: Unique key for menu. This is used as a block delta so length is 32.', - ), - 'title' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Menu title; displayed at top of block.', - 'translatable' => TRUE, - ), - 'description' => array( - 'type' => 'text', - 'not null' => FALSE, - 'description' => 'Menu description.', - 'translatable' => TRUE, - ), - ), - 'primary key' => array('menu_name'), - ); - - return $schema; -} - -/** - * Implements hook_install(). - */ -function menu_install() { - $system_menus = menu_list_system_menus(); - $t = get_t(); - $descriptions = array( - 'navigation' => $t('The Navigation menu contains links intended for site visitors. Links are added to the Navigation menu automatically by some modules.'), - 'user-menu' => $t("The User menu contains links related to the user's account, as well as the 'Log out' link."), - 'management' => $t('The Management menu contains links for administrative tasks.'), - 'main-menu' => $t('The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.'), - ); - foreach ($system_menus as $menu_name => $title) { - $menu = array( - 'menu_name' => $menu_name, - 'title' => $t($title), - 'description' => $descriptions[$menu_name], - ); - menu_save($menu); - } -} - -/** - * Implements hook_uninstall(). - */ -function menu_uninstall() { - menu_rebuild(); -} - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Migrate the "Default menu for content" setting to individual node types. - */ -function menu_update_7000() { - // Act only on sites originally on Drupal 6 that have a custom "Default menu - // for content" setting. - $default_node_menu = variable_get('menu_default_node_menu'); - if (isset($default_node_menu)) { - // Remove variable no longer used in Drupal 7. - variable_del('menu_default_node_menu'); - - // Make sure the menu chosen as the default still exists. - $defined_menus = db_query('SELECT * FROM {menu_custom}')->fetchAllAssoc('menu_name', PDO::FETCH_ASSOC); - // If the menu does not exist, do nothing; nodes will use the default D7 - // node menu settings. - if (!isset($defined_menus[$default_node_menu])) { - return; - } - - // Update the menu settings for each node type. - foreach (_update_7000_node_get_types() as $type => $type_object) { - $type_menus = variable_get('menu_options_' . $type); - // If the site already has a custom menu setting for this node type (set - // on the initial upgrade to Drupal 7.0), don't override it. - if (!isset($type_menus)) { - // Set up this node type so that the Drupal 6 "Default menu for content" - // is still available in the "Menu settings" section. - variable_set('menu_options_' . $type, array($default_node_menu)); - variable_set('menu_parent_' . $type, $default_node_menu . ':0'); - } - } - } -} - -/** - * Rename "Primary Links" and "Secondary Links" to their Drupal 7 equivalents. - */ -function menu_update_7001() { - // Migrate D6 menu_primary_links_source to D7 menu_main_links_source (without - // renaming). - if (variable_get('menu_primary_links_source') !== NULL) { - variable_set('menu_main_links_source', variable_get('menu_primary_links_source')); - variable_del('menu_primary_links_source'); - } - - // Rename each menu, and any settings that refer to the old menu name. - // - "Primary Links" has become system menu "Main menu". - // - "Secondary Links" has become a new custom menu "Secondary menu". - $rename = array( - 'primary-links' => array('main-menu', 'Main menu'), - 'secondary-links' => array('secondary-menu', 'Secondary menu'), - ); - foreach ($rename as $from_menu => $to) { - list($to_menu, $to_title) = $to; - // Rename the menu, and links in the menu. - db_update('menu_custom') - ->fields(array('menu_name' => $to_menu, 'title' => $to_title)) - ->condition('menu_name', $from_menu) - ->execute(); - db_update('menu_links') - ->fields(array('menu_name' => $to_menu)) - ->condition('menu_name', $from_menu) - ->execute(); - - // Update any content type that used this menu as a default menu. - // Note: these variables may be unset/default, in which case we leave them - // alone. See menu_update_7000() - foreach (_update_7000_node_get_types() as $type => $type_object) { - $menu_options = variable_get('menu_options_' . $type); - if ($menu_options !== NULL) { - variable_set('menu_options_' . $type, str_replace($from_menu, $to_menu, $menu_options)); - if (variable_get('menu_parent_' . $type) == $from_menu . ':0') { - variable_set('menu_parent_' . $type, $to_menu . ':0'); - } - } - } - - // Update the "source for primary links" and "source for secondary links" to - // follow. - if (variable_get('menu_main_links_source') == $from_menu) { - variable_set('menu_main_links_source', $to_menu); - } - if (variable_get('menu_secondary_links_source') == $from_menu) { - variable_set('menu_secondary_links_source', $to_menu); - } - } -} - -/** - * Rename the primary/secondary menu blocks to match previously renamed menus. - */ -function menu_update_7002(&$sandbox) { - // Check for the presence of old or new table names. - if (db_table_exists('blocks') || db_table_exists('block')) { - $renamed_deltas = array( - 'menu' => array( - 'primary-links' => 'main-menu', - 'secondary-links' => 'secondary-menu', - ), - ); - - $moved_deltas = array( - 'menu' => array('main-menu' => 'system'), - ); - - update_fix_d7_block_deltas($sandbox, $renamed_deltas, $moved_deltas); - } -} -/** - * Add missing custom menus to active menus list. - */ -function menu_update_7003(&$sandbox) { - // Make sure all custom menus are present in the active menus variable so that - // their items may appear in the active trail. - // @see menu_set_active_menu_names() - $active_menus = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus())); - $update_variable = FALSE; - foreach (menu_get_names() as $menu_name) { - if (!in_array($menu_name, $active_menus) && (strpos($menu_name, 'menu-') === 0)) { - $active_menus[] = $menu_name; - $update_variable = TRUE; - } - } - if ($update_variable) { - variable_set('menu_default_active_menus', $active_menus); - } - // Clear the menu cache. - cache_clear_all(NULL, 'cache_menu'); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - * The next series of updates should start at 8000. - */ diff --git a/modules/menu/menu.js b/modules/menu/menu.js deleted file mode 100644 index ff4ef1e..0000000 --- a/modules/menu/menu.js +++ /dev/null @@ -1,65 +0,0 @@ -(function ($) { - -Drupal.behaviors.menuFieldsetSummaries = { - attach: function (context) { - $('fieldset.menu-link-form', context).drupalSetSummary(function (context) { - if ($('.form-item-menu-enabled input', context).is(':checked')) { - return Drupal.checkPlain($('.form-item-menu-link-title input', context).val()); - } - else { - return Drupal.t('Not in menu'); - } - }); - } -}; - -/** - * Automatically fill in a menu link title, if possible. - */ -Drupal.behaviors.menuLinkAutomaticTitle = { - attach: function (context) { - $('fieldset.menu-link-form', context).each(function () { - // Try to find menu settings widget elements as well as a 'title' field in - // the form, but play nicely with user permissions and form alterations. - var $checkbox = $('.form-item-menu-enabled input', this); - var $link_title = $('.form-item-menu-link-title input', context); - var $title = $(this).closest('form').find('.form-item-title input'); - // Bail out if we do not have all required fields. - if (!($checkbox.length && $link_title.length && $title.length)) { - return; - } - // If there is a link title already, mark it as overridden. The user expects - // that toggling the checkbox twice will take over the node's title. - if ($checkbox.is(':checked') && $link_title.val().length) { - $link_title.data('menuLinkAutomaticTitleOveridden', true); - } - // Whenever the value is changed manually, disable this behavior. - $link_title.keyup(function () { - $link_title.data('menuLinkAutomaticTitleOveridden', true); - }); - // Global trigger on checkbox (do not fill-in a value when disabled). - $checkbox.change(function () { - if ($checkbox.is(':checked')) { - if (!$link_title.data('menuLinkAutomaticTitleOveridden')) { - $link_title.val($title.val()); - } - } - else { - $link_title.val(''); - $link_title.removeData('menuLinkAutomaticTitleOveridden'); - } - $checkbox.closest('fieldset.vertical-tabs-pane').trigger('summaryUpdated'); - $checkbox.trigger('formUpdated'); - }); - // Take over any title change. - $title.keyup(function () { - if (!$link_title.data('menuLinkAutomaticTitleOveridden') && $checkbox.is(':checked')) { - $link_title.val($title.val()); - $link_title.val($title.val()).trigger('formUpdated'); - } - }); - }); - } -}; - -})(jQuery); diff --git a/modules/menu/menu.module b/modules/menu/menu.module deleted file mode 100644 index 6444791..0000000 --- a/modules/menu/menu.module +++ /dev/null @@ -1,794 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Menu module provides an interface for managing menus. A menu is a hierarchical collection of links, which can be within or external to the site, generally used for navigation. Each menu is rendered in a block that can be enabled and positioned through the Blocks administration page. You can view and manage menus on the Menus administration page. For more information, see the online handbook entry for the Menu module.', array('@blocks' => url('admin/structure/block'), '@menus' => url('admin/structure/menu'), '@menu' => 'http://drupal.org/documentation/modules/menu/')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Managing menus') . ' '; - $output .= '
- ' . t('Users with the Administer menus and menu items permission can add, edit and delete custom menus on the Menus administration page. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block. By selecting list links, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array('@menu' => url('admin/structure/menu'), '@add-menu' => url('admin/structure/menu/add'))) . ' '; - $output .= '
- ' . t('Displaying menus') . ' '; - $output .= '
- ' . t('After you have created a menu, you must enable and position the associated block on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . ' '; - $output .= '
' . t('You can enable the newly-created block for this menu on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; - } - if ($path == 'admin/structure/menu' && module_exists('block')) { - return '' . t('Each menu has a corresponding block that is managed on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; - } -} - -/** - * Implements hook_permission(). - */ -function menu_permission() { - return array( - 'administer menu' => array( - 'title' => t('Administer menus and menu items'), - ), - ); -} - -/** - * Implements hook_menu(). - */ -function menu_menu() { - $items['admin/structure/menu'] = array( - 'title' => 'Menus', - 'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.', - 'page callback' => 'menu_overview_page', - 'access callback' => 'user_access', - 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/parents'] = array( - 'title' => 'Parent menu items', - 'page callback' => 'menu_parent_options_js', - 'type' => MENU_CALLBACK, - 'access arguments' => array(TRUE), - ); - $items['admin/structure/menu/list'] = array( - 'title' => 'List menus', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['admin/structure/menu/add'] = array( - 'title' => 'Add menu', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_edit_menu', 'add'), - 'access arguments' => array('administer menu'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/settings'] = array( - 'title' => 'Settings', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_configure'), - 'access arguments' => array('administer menu'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 5, - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/manage/%menu'] = array( - 'title' => 'Customize menu', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_overview_form', 4), - 'title callback' => 'menu_overview_title', - 'title arguments' => array(4), - 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/manage/%menu/list'] = array( - 'title' => 'List links', - 'weight' => -10, - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, - ); - $items['admin/structure/menu/manage/%menu/add'] = array( - 'title' => 'Add link', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_edit_item', 'add', NULL, 4), - 'access arguments' => array('administer menu'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/manage/%menu/edit'] = array( - 'title' => 'Edit menu', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_edit_menu', 'edit', 4), - 'access arguments' => array('administer menu'), - 'type' => MENU_LOCAL_TASK, - 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/manage/%menu/delete'] = array( - 'title' => 'Delete menu', - 'page callback' => 'menu_delete_menu_page', - 'page arguments' => array(4), - 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/item/%menu_link/edit'] = array( - 'title' => 'Edit menu link', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_edit_item', 'edit', 4, NULL), - 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/item/%menu_link/reset'] = array( - 'title' => 'Reset menu link', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('menu_reset_item_confirm', 4), - 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', - ); - $items['admin/structure/menu/item/%menu_link/delete'] = array( - 'title' => 'Delete menu link', - 'page callback' => 'menu_item_delete_page', - 'page arguments' => array(4), - 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', - ); - return $items; -} - -/** - * Implements hook_theme(). - */ -function menu_theme() { - return array( - 'menu_overview_form' => array( - 'file' => 'menu.admin.inc', - 'render element' => 'form', - ), - 'menu_admin_overview' => array( - 'file' => 'menu.admin.inc', - 'variables' => array('title' => NULL, 'name' => NULL, 'description' => NULL), - ), - ); -} - -/** - * Implements hook_enable(). - * - * Add a link for each custom menu. - */ -function menu_enable() { - menu_rebuild(); - $base_link = db_query("SELECT mlid AS plid, menu_name FROM {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc(); - $base_link['router_path'] = 'admin/structure/menu/manage/%'; - $base_link['module'] = 'menu'; - $result = db_query("SELECT * FROM {menu_custom}", array(), array('fetch' => PDO::FETCH_ASSOC)); - foreach ($result as $menu) { - // $link is passed by reference to menu_link_save(), so we make a copy of $base_link. - $link = $base_link; - $link['mlid'] = 0; - $link['link_title'] = $menu['title']; - $link['link_path'] = 'admin/structure/menu/manage/' . $menu['menu_name']; - $menu_link = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND plid = :plid", array( - ':path' => $link['link_path'], - ':plid' => $link['plid'] - )) - ->fetchField(); - if (!$menu_link) { - menu_link_save($link); - } - } - menu_cache_clear_all(); -} - -/** - * Title callback for the menu overview page and links. - */ -function menu_overview_title($menu) { - return $menu['title']; -} - -/** - * Load the data for a single custom menu. - * - * @param $menu_name - * The unique name of a custom menu to load. - * @return - * Array defining the custom menu, or FALSE if the menu doesn't exist. - */ -function menu_load($menu_name) { - $all_menus = menu_load_all(); - return isset($all_menus[$menu_name]) ? $all_menus[$menu_name] : FALSE; -} - -/** - * Load all custom menu data. - * - * @return - * Array of custom menu data. - */ -function menu_load_all() { - $custom_menus = &drupal_static(__FUNCTION__); - if (!isset($custom_menus)) { - if ($cached = cache_get('menu_custom', 'cache_menu')) { - $custom_menus = $cached->data; - } - else { - $custom_menus = db_query('SELECT * FROM {menu_custom}')->fetchAllAssoc('menu_name', PDO::FETCH_ASSOC); - cache_set('menu_custom', $custom_menus, 'cache_menu'); - } - } - return $custom_menus; -} - -/** - * Save a custom menu. - * - * @param $menu - * An array representing a custom menu: - * - menu_name: The unique name of the custom menu (composed of lowercase - * letters, numbers, and hyphens). - * - title: The human readable menu title. - * - description: The custom menu description. - * - * Modules should always pass a fully populated $menu when saving a custom - * menu, so other modules are able to output proper status or watchdog messages. - * - * @see menu_load() - */ -function menu_save($menu) { - $status = db_merge('menu_custom') - ->key(array('menu_name' => $menu['menu_name'])) - ->fields(array( - 'title' => $menu['title'], - 'description' => $menu['description'], - )) - ->execute(); - menu_cache_clear_all(); - - switch ($status) { - case SAVED_NEW: - // Make sure the menu is present in the active menus variable so that its - // items may appear in the menu active trail. - // @see menu_set_active_menu_names() - $active_menus = variable_get('menu_default_active_menus', array_keys(menu_get_menus())); - if (!in_array($menu['menu_name'], $active_menus)) { - $active_menus[] = $menu['menu_name']; - variable_set('menu_default_active_menus', $active_menus); - } - - module_invoke_all('menu_insert', $menu); - break; - - case SAVED_UPDATED: - module_invoke_all('menu_update', $menu); - break; - } -} - -/** - * Delete a custom menu and all contained links. - * - * Note that this function deletes all menu links in a custom menu. While menu - * links derived from router paths may be restored by rebuilding the menu, all - * customized and custom links will be irreversibly gone. Therefore, this - * function should usually be called from a user interface (form submit) handler - * only, which allows the user to confirm the action. - * - * @param $menu - * An array representing a custom menu: - * - menu_name: The unique name of the custom menu. - * - title: The human readable menu title. - * - description: The custom menu description. - * - * Modules should always pass a fully populated $menu when deleting a custom - * menu, so other modules are able to output proper status or watchdog messages. - * - * @see menu_load() - * - * menu_delete_links() will take care of clearing the page cache. Other modules - * should take care of their menu-related data by implementing - * hook_menu_delete(). - */ -function menu_delete($menu) { - // Delete all links from the menu. - menu_delete_links($menu['menu_name']); - - // Remove menu from active menus variable. - $active_menus = variable_get('menu_default_active_menus', array_keys(menu_get_menus())); - foreach ($active_menus as $i => $menu_name) { - if ($menu['menu_name'] == $menu_name) { - unset($active_menus[$i]); - variable_set('menu_default_active_menus', $active_menus); - } - } - - // Delete the custom menu. - db_delete('menu_custom') - ->condition('menu_name', $menu['menu_name']) - ->execute(); - - menu_cache_clear_all(); - module_invoke_all('menu_delete', $menu); -} - -/** - * Return a list of menu items that are valid possible parents for the given menu item. - * - * @param $menus - * An array of menu names and titles, such as from menu_get_menus(). - * @param $item - * The menu item or the node type for which to generate a list of parents. - * If $item['mlid'] == 0 then the complete tree is returned. - * @param $type - * The node type for which to generate a list of parents. - * If $item itself is a node type then $type is ignored. - * @return - * An array of menu link titles keyed on the a string containing the menu name - * and mlid. The list excludes the given item and its children. - * - * @todo This has to be turned into a #process form element callback. The - * 'menu_override_parent_selector' variable is entirely superfluous. - */ -function menu_parent_options($menus, $item, $type = '') { - // The menu_links table can be practically any size and we need a way to - // allow contrib modules to provide more scalable pattern choosers. - // hook_form_alter is too late in itself because all the possible parents are - // retrieved here, unless menu_override_parent_selector is set to TRUE. - if (variable_get('menu_override_parent_selector', FALSE)) { - return array(); - } - - $available_menus = array(); - if (!is_array($item)) { - // If $item is not an array then it is a node type. - // Use it as $type and prepare a dummy menu item for _menu_get_options(). - $type = $item; - $item = array('mlid' => 0); - } - if (empty($type)) { - // If no node type is set, use all menus given to this function. - $available_menus = $menus; - } - else { - // If a node type is set, use all available menus for this type. - $type_menus = variable_get('menu_options_' . $type, array('main-menu' => 'main-menu')); - foreach ($type_menus as $menu) { - $available_menus[$menu] = $menu; - } - } - - return _menu_get_options($menus, $available_menus, $item); -} - -/** - * Page callback. - * Get all the available menus and menu items as a JavaScript array. - */ -function menu_parent_options_js() { - $available_menus = array(); - if (isset($_POST['menus']) && count($_POST['menus'])) { - foreach ($_POST['menus'] as $menu) { - $available_menus[$menu] = $menu; - } - } - $options = _menu_get_options(menu_get_menus(), $available_menus, array('mlid' => 0)); - - drupal_json_output($options); -} - -/** - * Helper function to get the items of the given menu. - */ -function _menu_get_options($menus, $available_menus, $item) { - // If the item has children, there is an added limit to the depth of valid parents. - if (isset($item['parent_depth_limit'])) { - $limit = $item['parent_depth_limit']; - } - else { - $limit = _menu_parent_depth_limit($item); - } - - $options = array(); - foreach ($menus as $menu_name => $title) { - if (isset($available_menus[$menu_name])) { - $tree = menu_tree_all_data($menu_name, NULL); - $options[$menu_name . ':0'] = '<' . $title . '>'; - _menu_parents_recurse($tree, $menu_name, '--', $options, $item['mlid'], $limit); - } - } - return $options; -} - -/** - * Recursive helper function for menu_parent_options(). - */ -function _menu_parents_recurse($tree, $menu_name, $indent, &$options, $exclude, $depth_limit) { - foreach ($tree as $data) { - if ($data['link']['depth'] > $depth_limit) { - // Don't iterate through any links on this level. - break; - } - if ($data['link']['mlid'] != $exclude && $data['link']['hidden'] >= 0) { - $title = $indent . ' ' . truncate_utf8($data['link']['title'], 30, TRUE, FALSE); - if ($data['link']['hidden']) { - $title .= ' (' . t('disabled') . ')'; - } - $options[$menu_name . ':' . $data['link']['mlid']] = $title; - if ($data['below']) { - _menu_parents_recurse($data['below'], $menu_name, $indent . '--', $options, $exclude, $depth_limit); - } - } - } -} - -/** - * Reset a system-defined menu link. - */ -function menu_reset_item($link) { - // To reset the link to its original values, we need to retrieve its - // definition from hook_menu(). Otherwise, for example, the link's menu would - // not be reset, because properties like the original 'menu_name' are not - // stored anywhere else. Since resetting a link happens rarely and this is a - // one-time operation, retrieving the full menu router does no harm. - $menu = menu_get_router(); - $router_item = $menu[$link['router_path']]; - $new_link = _menu_link_build($router_item); - // Merge existing menu link's ID and 'has_children' property. - foreach (array('mlid', 'has_children') as $key) { - $new_link[$key] = $link[$key]; - } - menu_link_save($new_link); - return $new_link; -} - -/** - * Implements hook_block_info(). - */ -function menu_block_info() { - $menus = menu_get_menus(FALSE); - - $blocks = array(); - foreach ($menus as $name => $title) { - $blocks[$name]['info'] = check_plain($title); - // Menu blocks can't be cached because each menu item can have - // a custom access callback. menu.inc manages its own caching. - $blocks[$name]['cache'] = DRUPAL_NO_CACHE; - } - return $blocks; -} - -/** - * Implements hook_block_view(). - */ -function menu_block_view($delta = '') { - $menus = menu_get_menus(FALSE); - $data['subject'] = check_plain($menus[$delta]); - $data['content'] = menu_tree($delta); - // Add contextual links for this block. - if (!empty($data['content'])) { - $data['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($delta)); - } - return $data; -} - -/** - * Implements hook_block_view_alter(). - */ -function menu_block_view_alter(&$data, $block) { - // Add contextual links for system menu blocks. - if ($block->module == 'system' && !empty($data['content'])) { - $system_menus = menu_list_system_menus(); - if (isset($system_menus[$block->delta])) { - $data['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($block->delta)); - } - } -} - -/** - * Implements hook_node_insert(). - */ -function menu_node_insert($node) { - menu_node_save($node); -} - -/** - * Implements hook_node_update(). - */ -function menu_node_update($node) { - menu_node_save($node); -} - -/** - * Helper for hook_node_insert() and hook_node_update(). - */ -function menu_node_save($node) { - if (isset($node->menu)) { - $link = &$node->menu; - if (empty($link['enabled'])) { - if (!empty($link['mlid'])) { - menu_link_delete($link['mlid']); - } - } - elseif (trim($link['link_title'])) { - $link['link_title'] = trim($link['link_title']); - $link['link_path'] = "node/$node->nid"; - if (trim($link['description'])) { - $link['options']['attributes']['title'] = trim($link['description']); - } - else { - // If the description field was left empty, remove the title attribute - // from the menu link. - unset($link['options']['attributes']['title']); - } - if (!menu_link_save($link)) { - drupal_set_message(t('There was an error saving the menu link.'), 'error'); - } - } - } -} - -/** - * Implements hook_node_delete(). - */ -function menu_node_delete($node) { - // Delete all menu module links that point to this node. - $result = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND module = 'menu'", array(':path' => 'node/' . $node->nid), array('fetch' => PDO::FETCH_ASSOC)); - foreach ($result as $m) { - menu_link_delete($m['mlid']); - } -} - -/** - * Implements hook_node_prepare(). - */ -function menu_node_prepare($node) { - if (empty($node->menu)) { - // Prepare the node for the edit form so that $node->menu always exists. - $menu_name = strtok(variable_get('menu_parent_' . $node->type, 'main-menu:0'), ':'); - $item = array(); - if (isset($node->nid)) { - $mlid = FALSE; - // Give priority to the default menu - $type_menus = variable_get('menu_options_' . $node->type, array('main-menu' => 'main-menu')); - if (in_array($menu_name, $type_menus)) { - $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = :path AND menu_name = :menu_name AND module = 'menu' ORDER BY mlid ASC", 0, 1, array( - ':path' => 'node/' . $node->nid, - ':menu_name' => $menu_name, - ))->fetchField(); - } - // Check all allowed menus if a link does not exist in the default menu. - if (!$mlid && !empty($type_menus)) { - $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = :path AND module = 'menu' AND menu_name IN (:type_menus) ORDER BY mlid ASC", 0, 1, array( - ':path' => 'node/' . $node->nid, - ':type_menus' => array_values($type_menus), - ))->fetchField(); - } - if ($mlid) { - $item = menu_link_load($mlid); - } - } - // Set default values. - $node->menu = $item + array( - 'link_title' => '', - 'mlid' => 0, - 'plid' => 0, - 'menu_name' => $menu_name, - 'weight' => 0, - 'options' => array(), - 'module' => 'menu', - 'expanded' => 0, - 'hidden' => 0, - 'has_children' => 0, - 'customized' => 0, - ); - } - // Find the depth limit for the parent select. - if (!isset($node->menu['parent_depth_limit'])) { - $node->menu['parent_depth_limit'] = _menu_parent_depth_limit($node->menu); - } -} - -/** - * Find the depth limit for items in the parent select. - */ -function _menu_parent_depth_limit($item) { - return MENU_MAX_DEPTH - 1 - (($item['mlid'] && $item['has_children']) ? menu_link_children_relative_depth($item) : 0); -} - -/** - * Implements hook_form_BASE_FORM_ID_alter(). - * - * Adds menu item fields to the node form. - * - * @see menu_node_submit() - */ -function menu_form_node_form_alter(&$form, $form_state) { - // Generate a list of possible parents (not including this link or descendants). - // @todo This must be handled in a #process handler. - $link = $form['#node']->menu; - $type = $form['#node']->type; - // menu_parent_options() is goofy and can actually handle either a menu link - // or a node type both as second argument. Pick based on whether there is - // a link already (menu_node_prepare() sets mlid default to 0). - $options = menu_parent_options(menu_get_menus(), $link['mlid'] ? $link : $type, $type); - // If no possible parent menu items were found, there is nothing to display. - if (empty($options)) { - return; - } - - $form['menu'] = array( - '#type' => 'fieldset', - '#title' => t('Menu settings'), - '#access' => user_access('administer menu'), - '#collapsible' => TRUE, - '#collapsed' => !$link['link_title'], - '#group' => 'additional_settings', - '#attached' => array( - 'js' => array(drupal_get_path('module', 'menu') . '/menu.js'), - ), - '#tree' => TRUE, - '#weight' => -2, - '#attributes' => array('class' => array('menu-link-form')), - ); - $form['menu']['enabled'] = array( - '#type' => 'checkbox', - '#title' => t('Provide a menu link'), - '#default_value' => (int) (bool) $link['mlid'], - ); - $form['menu']['link'] = array( - '#type' => 'container', - '#parents' => array('menu'), - '#states' => array( - 'invisible' => array( - 'input[name="menu[enabled]"]' => array('checked' => FALSE), - ), - ), - ); - - // Populate the element with the link data. - foreach (array('mlid', 'module', 'hidden', 'has_children', 'customized', 'options', 'expanded', 'hidden', 'parent_depth_limit') as $key) { - $form['menu']['link'][$key] = array('#type' => 'value', '#value' => $link[$key]); - } - - $form['menu']['link']['link_title'] = array( - '#type' => 'textfield', - '#title' => t('Menu link title'), - '#default_value' => $link['link_title'], - ); - - $form['menu']['link']['description'] = array( - '#type' => 'textarea', - '#title' => t('Description'), - '#default_value' => isset($link['options']['attributes']['title']) ? $link['options']['attributes']['title'] : '', - '#rows' => 1, - '#description' => t('Shown when hovering over the menu link.'), - ); - - $default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-menu:0')); - // If the current parent menu item is not present in options, use the first - // available option as default value. - // @todo User should not be allowed to access menu link settings in such a - // case. - if (!isset($options[$default])) { - $array = array_keys($options); - $default = reset($array); - } - $form['menu']['link']['parent'] = array( - '#type' => 'select', - '#title' => t('Parent item'), - '#default_value' => $default, - '#options' => $options, - '#attributes' => array('class' => array('menu-parent-select')), - ); - $form['menu']['link']['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight'), - '#delta' => 50, - '#default_value' => $link['weight'], - '#description' => t('Menu links with smaller weights are displayed before links with larger weights.'), - ); -} - -/** - * Implements hook_node_submit(). - * - * @see menu_form_node_form_alter() - */ -function menu_node_submit($node, $form, $form_state) { - // Decompose the selected menu parent option into 'menu_name' and 'plid', if - // the form used the default parent selection widget. - if (!empty($form_state['values']['menu']['parent'])) { - list($node->menu['menu_name'], $node->menu['plid']) = explode(':', $form_state['values']['menu']['parent']); - } -} - -/** - * Implements hook_form_FORM_ID_alter(). - * - * Adds menu options to the node type form. - */ -function menu_form_node_type_form_alter(&$form, $form_state) { - $menu_options = menu_get_menus(); - $type = $form['#node_type']; - $form['menu'] = array( - '#type' => 'fieldset', - '#title' => t('Menu settings'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#attached' => array( - 'js' => array(drupal_get_path('module', 'menu') . '/menu.admin.js'), - ), - '#group' => 'additional_settings', - ); - $form['menu']['menu_options'] = array( - '#type' => 'checkboxes', - '#title' => t('Available menus'), - '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu')), - '#options' => $menu_options, - '#description' => t('The menus available to place links in for this content type.'), - ); - // To avoid an 'illegal option' error after saving the form we have to load - // all available menu items. - // Otherwise it is not possible to dynamically add options to the list. - // @todo Convert menu_parent_options() into a #process callback. - $options = menu_parent_options(menu_get_menus(), array('mlid' => 0)); - $form['menu']['menu_parent'] = array( - '#type' => 'select', - '#title' => t('Default parent item'), - '#default_value' => variable_get('menu_parent_' . $type->type, 'main-menu:0'), - '#options' => $options, - '#description' => t('Choose the menu item to be the default parent for a new link in the content authoring form.'), - '#attributes' => array('class' => array('menu-title-select')), - ); - - // Call Drupal.menu_update_parent_list() to filter the list of - // available default parent menu items based on the selected menus. - drupal_add_js( - '(function ($) { Drupal.menu_update_parent_list(); })(jQuery);', - array('scope' => 'footer', 'type' => 'inline') - ); -} - -/** - * Return an associative array of the custom menus names. - * - * @param $all - * If FALSE return only user-added menus, or if TRUE also include - * the menus defined by the system. - * @return - * An array with the machine-readable names as the keys, and human-readable - * titles as the values. - */ -function menu_get_menus($all = TRUE) { - if ($custom_menus = menu_load_all()) { - if (!$all) { - $custom_menus = array_diff_key($custom_menus, menu_list_system_menus()); - } - foreach ($custom_menus as $menu_name => $menu) { - $custom_menus[$menu_name] = t($menu['title']); - } - asort($custom_menus); - } - return $custom_menus; -} diff --git a/modules/menu/menu.test b/modules/menu/menu.test deleted file mode 100644 index 95e0ee9..0000000 --- a/modules/menu/menu.test +++ /dev/null @@ -1,724 +0,0 @@ - 'Menu link creation/deletion', - 'description' => 'Add a custom menu, add menu links to the custom menu and Navigation menu, check their data, and delete them using the menu module UI.', - 'group' => 'Menu' - ); - } - - function setUp() { - parent::setUp('menu'); - // Create users. - $this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content')); - $this->std_user = $this->drupalCreateUser(array()); - } - - /** - * Login users, add menus and menu links, and test menu functionality through the admin and user interfaces. - */ - function testMenu() { - // Login the user. - $this->drupalLogin($this->big_user); - $this->items = array(); - - // Do standard menu tests. - $this->doStandardMenuTests(); - - // Do custom menu tests. - $this->doCustomMenuTests(); - - // Do standard user tests. - // Login the user. - $this->drupalLogin($this->std_user); - $this->verifyAccess(403); - foreach ($this->items as $item) { - $node = node_load(substr($item['link_path'], 5)); // Paths were set as 'node/$nid'. - $this->verifyMenuLink($item, $node); - } - - // Login the user. - $this->drupalLogin($this->big_user); - - // Delete menu links. - foreach ($this->items as $item) { - $this->deleteMenuLink($item); - } - - // Delete custom menu. - $this->deleteCustomMenu($this->menu); - - // Modify and reset a standard menu link. - $item = $this->getStandardMenuLink(); - $old_title = $item['link_title']; - $this->modifyMenuLink($item); - $item = menu_link_load($item['mlid']); - // Verify that a change to the description is saved. - $description = $this->randomName(16); - $item['options']['attributes']['title'] = $description; - menu_link_save($item); - $saved_item = menu_link_load($item['mlid']); - $this->assertEqual($description, $saved_item['options']['attributes']['title'], 'Saving an existing link updates the description (title attribute)'); - $this->resetMenuLink($item, $old_title); - } - - /** - * Test standard menu functionality using navigation menu. - * - */ - function doStandardMenuTests() { - $this->doMenuTests(); - $this->addInvalidMenuLink(); - } - - /** - * Test custom menu functionality using navigation menu. - * - */ - function doCustomMenuTests() { - $this->menu = $this->addCustomMenu(); - $this->doMenuTests($this->menu['menu_name']); - $this->addInvalidMenuLink($this->menu['menu_name']); - $this->addCustomMenuCRUD(); - } - - /** - * Add custom menu using CRUD functions. - */ - function addCustomMenuCRUD() { - // Add a new custom menu. - $menu_name = substr(hash('sha256', $this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI); - $title = $this->randomName(16); - - $menu = array( - 'menu_name' => $menu_name, - 'title' => $title, - 'description' => 'Description text', - ); - menu_save($menu); - - // Assert the new menu. - $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit'); - $this->assertRaw($title, 'Custom menu was added.'); - - // Edit the menu. - $new_title = $this->randomName(16); - $menu['title'] = $new_title; - menu_save($menu); - $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit'); - $this->assertRaw($new_title, 'Custom menu was edited.'); - } - - /** - * Add custom menu. - */ - function addCustomMenu() { - // Add custom menu. - - // Try adding a menu using a menu_name that is too long. - $this->drupalGet('admin/structure/menu/add'); - $menu_name = substr(hash('sha256', $this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI + 1); - $title = $this->randomName(16); - $edit = array( - 'menu_name' => $menu_name, - 'description' => '', - 'title' => $title, - ); - $this->drupalPost('admin/structure/menu/add', $edit, t('Save')); - - // Verify that using a menu_name that is too long results in a validation message. - $this->assertRaw(t('!name cannot be longer than %max characters but is currently %length characters long.', array( - '!name' => t('Menu name'), - '%max' => MENU_MAX_MENU_NAME_LENGTH_UI, - '%length' => drupal_strlen($menu_name), - ))); - - // Change the menu_name so it no longer exceeds the maximum length. - $menu_name = substr(hash('sha256', $this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI); - $edit['menu_name'] = $menu_name; - $this->drupalPost('admin/structure/menu/add', $edit, t('Save')); - - // Verify that no validation error is given for menu_name length. - $this->assertNoRaw(t('!name cannot be longer than %max characters but is currently %length characters long.', array( - '!name' => t('Menu name'), - '%max' => MENU_MAX_MENU_NAME_LENGTH_UI, - '%length' => drupal_strlen($menu_name), - ))); - // Unlike most other modules, there is no confirmation message displayed. - - $this->drupalGet('admin/structure/menu'); - $this->assertText($title, 'Menu created'); - - // Enable the custom menu block. - $menu_name = 'menu-' . $menu_name; // Drupal prepends the name with 'menu-'. - $edit = array(); - $edit['blocks[menu_' . $menu_name . '][region]'] = 'sidebar_first'; - $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); - $this->assertResponse(200); - $this->assertText(t('The block settings have been updated.'), 'Custom menu block was enabled'); - - return menu_load($menu_name); - } - - /** - * Delete custom menu. - * - * @param string $menu_name Custom menu name. - */ - function deleteCustomMenu($menu) { - $menu_name = $this->menu['menu_name']; - $title = $this->menu['title']; - - // Delete custom menu. - $this->drupalPost("admin/structure/menu/manage/$menu_name/delete", array(), t('Delete')); - $this->assertResponse(200); - $this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $title)), 'Custom menu was deleted'); - $this->assertFalse(menu_load($menu_name), 'Custom menu was deleted'); - // Test if all menu links associated to the menu were removed from database. - $result = db_query("SELECT menu_name FROM {menu_links} WHERE menu_name = :menu_name", array(':menu_name' => $menu_name))->fetchField(); - $this->assertFalse($result, 'All menu links associated to the custom menu were deleted.'); - } - - /** - * Test menu functionality using navigation menu. - * - */ - function doMenuTests($menu_name = 'navigation') { - // Add nodes to use as links for menu links. - $node1 = $this->drupalCreateNode(array('type' => 'article')); - $node2 = $this->drupalCreateNode(array('type' => 'article')); - $node3 = $this->drupalCreateNode(array('type' => 'article')); - $node4 = $this->drupalCreateNode(array('type' => 'article')); - $node5 = $this->drupalCreateNode(array('type' => 'article')); - - // Add menu links. - $item1 = $this->addMenuLink(0, 'node/' . $node1->nid, $menu_name); - $item2 = $this->addMenuLink($item1['mlid'], 'node/' . $node2->nid, $menu_name, FALSE); - $item3 = $this->addMenuLink($item2['mlid'], 'node/' . $node3->nid, $menu_name); - $this->assertMenuLink($item1['mlid'], array('depth' => 1, 'has_children' => 1, 'p1' => $item1['mlid'], 'p2' => 0)); - $this->assertMenuLink($item2['mlid'], array('depth' => 2, 'has_children' => 1, 'p1' => $item1['mlid'], 'p2' => $item2['mlid'], 'p3' => 0)); - $this->assertMenuLink($item3['mlid'], array('depth' => 3, 'has_children' => 0, 'p1' => $item1['mlid'], 'p2' => $item2['mlid'], 'p3' => $item3['mlid'], 'p4' => 0)); - - // Verify menu links. - $this->verifyMenuLink($item1, $node1); - $this->verifyMenuLink($item2, $node2, $item1, $node1); - $this->verifyMenuLink($item3, $node3, $item2, $node2); - - // Add more menu links. - $item4 = $this->addMenuLink(0, 'node/' . $node4->nid, $menu_name); - $item5 = $this->addMenuLink($item4['mlid'], 'node/' . $node5->nid, $menu_name); - $this->assertMenuLink($item4['mlid'], array('depth' => 1, 'has_children' => 1, 'p1' => $item4['mlid'], 'p2' => 0)); - $this->assertMenuLink($item5['mlid'], array('depth' => 2, 'has_children' => 0, 'p1' => $item4['mlid'], 'p2' => $item5['mlid'], 'p3' => 0)); - - // Modify menu links. - $this->modifyMenuLink($item1); - $this->modifyMenuLink($item2); - - // Toggle menu links. - $this->toggleMenuLink($item1); - $this->toggleMenuLink($item2); - - // Move link and verify that descendants are updated. - $this->moveMenuLink($item2, $item5['mlid'], $menu_name); - $this->assertMenuLink($item1['mlid'], array('depth' => 1, 'has_children' => 0, 'p1' => $item1['mlid'], 'p2' => 0)); - $this->assertMenuLink($item4['mlid'], array('depth' => 1, 'has_children' => 1, 'p1' => $item4['mlid'], 'p2' => 0)); - $this->assertMenuLink($item5['mlid'], array('depth' => 2, 'has_children' => 1, 'p1' => $item4['mlid'], 'p2' => $item5['mlid'], 'p3' => 0)); - $this->assertMenuLink($item2['mlid'], array('depth' => 3, 'has_children' => 1, 'p1' => $item4['mlid'], 'p2' => $item5['mlid'], 'p3' => $item2['mlid'], 'p4' => 0)); - $this->assertMenuLink($item3['mlid'], array('depth' => 4, 'has_children' => 0, 'p1' => $item4['mlid'], 'p2' => $item5['mlid'], 'p3' => $item2['mlid'], 'p4' => $item3['mlid'], 'p5' => 0)); - - // Enable a link via the overview form. - $this->disableMenuLink($item1); - $edit = array(); - - // Note in the UI the 'mlid:x[hidden]' form element maps to enabled, or - // NOT hidden. - $edit['mlid:' . $item1['mlid'] . '[hidden]'] = TRUE; - $this->drupalPost('admin/structure/menu/manage/' . $item1['menu_name'], $edit, t('Save configuration')); - - // Verify in the database. - $this->assertMenuLink($item1['mlid'], array('hidden' => 0)); - - // Save menu links for later tests. - $this->items[] = $item1; - $this->items[] = $item2; - } - - /** - * Add and remove a menu link with a query string and fragment. - */ - function testMenuQueryAndFragment() { - $this->drupalLogin($this->big_user); - - // Make a path with query and fragment on. - $path = 'node?arg1=value1&arg2=value2'; - $item = $this->addMenuLink(0, $path); - - $this->drupalGet('admin/structure/menu/item/' . $item['mlid'] . '/edit'); - $this->assertFieldByName('link_path', $path, 'Path is found with both query and fragment.'); - - // Now change the path to something without query and fragment. - $path = 'node'; - $this->drupalPost('admin/structure/menu/item/' . $item['mlid'] . '/edit', array('link_path' => $path), t('Save')); - $this->drupalGet('admin/structure/menu/item/' . $item['mlid'] . '/edit'); - $this->assertFieldByName('link_path', $path, 'Path no longer has query or fragment.'); - } - - /** - * Add a menu link using the menu module UI. - * - * @param integer $plid Parent menu link id. - * @param string $link Link path. - * @param string $menu_name Menu name. - * @return array Menu link created. - */ - function addMenuLink($plid = 0, $link = '', $menu_name = 'navigation', $expanded = TRUE) { - // View add menu link page. - $this->drupalGet("admin/structure/menu/manage/$menu_name/add"); - $this->assertResponse(200); - - $title = '!link_' . $this->randomName(16); - $edit = array( - 'link_path' => $link, - 'link_title' => $title, - 'description' => '', - 'enabled' => TRUE, // Use this to disable the menu and test. - 'expanded' => $expanded, // Setting this to true should test whether it works when we do the std_user tests. - 'parent' => $menu_name . ':' . $plid, - 'weight' => '0', - ); - - // Add menu link. - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertResponse(200); - // Unlike most other modules, there is no confirmation message displayed. - $this->assertText($title, 'Menu link was added'); - - $item = db_query('SELECT * FROM {menu_links} WHERE link_title = :title', array(':title' => $title))->fetchAssoc(); - $this->assertTrue(t('Menu link was found in database.')); - $this->assertMenuLink($item['mlid'], array('menu_name' => $menu_name, 'link_path' => $link, 'has_children' => 0, 'plid' => $plid)); - - return $item; - } - - /** - * Attempt to add menu link with invalid path or no access permission. - * - * @param string $menu_name Menu name. - */ - function addInvalidMenuLink($menu_name = 'navigation') { - foreach (array('-&-', 'admin/people/permissions', '#') as $link_path) { - $edit = array( - 'link_path' => $link_path, - 'link_title' => 'title', - ); - $this->drupalPost("admin/structure/menu/manage/$menu_name/add", $edit, t('Save')); - $this->assertRaw(t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $link_path)), 'Menu link was not created'); - } - } - - /** - * Verify a menu link using the menu module UI. - * - * @param array $item Menu link. - * @param object $item_node Menu link content node. - * @param array $parent Parent menu link. - * @param object $parent_node Parent menu link content node. - */ - function verifyMenuLink($item, $item_node, $parent = NULL, $parent_node = NULL) { - // View home page. - $this->drupalGet(''); - $this->assertResponse(200); - - // Verify parent menu link. - if (isset($parent)) { - // Verify menu link. - $title = $parent['link_title']; - $this->assertLink($title, 0, 'Parent menu link was displayed'); - - // Verify menu link link. - $this->clickLink($title); - $title = $parent_node->title; - $this->assertTitle(t("@title | Drupal", array('@title' => $title)), 'Parent menu link link target was correct'); - } - - // Verify menu link. - $title = $item['link_title']; - $this->assertLink($title, 0, 'Menu link was displayed'); - - // Verify menu link link. - $this->clickLink($title); - $title = $item_node->title; - $this->assertTitle(t("@title | Drupal", array('@title' => $title)), 'Menu link link target was correct'); - } - - /** - * Change the parent of a menu link using the menu module UI. - */ - function moveMenuLink($item, $plid, $menu_name) { - $mlid = $item['mlid']; - - $edit = array( - 'parent' => $menu_name . ':' . $plid, - ); - $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); - $this->assertResponse(200); - } - - /** - * Modify a menu link using the menu module UI. - * - * @param array $item Menu link passed by reference. - */ - function modifyMenuLink(&$item) { - $item['link_title'] = $this->randomName(16); - - $mlid = $item['mlid']; - $title = $item['link_title']; - - // Edit menu link. - $edit = array(); - $edit['link_title'] = $title; - $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); - $this->assertResponse(200); - // Unlike most other modules, there is no confirmation message displayed. - - // Verify menu link. - $this->drupalGet('admin/structure/menu/manage/' . $item['menu_name']); - $this->assertText($title, 'Menu link was edited'); - } - - /** - * Reset a standard menu link using the menu module UI. - * - * @param array $item Menu link. - * @param string $old_title Original title for menu link. - */ - function resetMenuLink($item, $old_title) { - $mlid = $item['mlid']; - $title = $item['link_title']; - - // Reset menu link. - $this->drupalPost("admin/structure/menu/item/$mlid/reset", array(), t('Reset')); - $this->assertResponse(200); - $this->assertRaw(t('The menu link was reset to its default settings.'), 'Menu link was reset'); - - // Verify menu link. - $this->drupalGet(''); - $this->assertNoText($title, 'Menu link was reset'); - $this->assertText($old_title, 'Menu link was reset'); - } - - /** - * Delete a menu link using the menu module UI. - * - * @param array $item Menu link. - */ - function deleteMenuLink($item) { - $mlid = $item['mlid']; - $title = $item['link_title']; - - // Delete menu link. - $this->drupalPost("admin/structure/menu/item/$mlid/delete", array(), t('Confirm')); - $this->assertResponse(200); - $this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), 'Menu link was deleted'); - - // Verify deletion. - $this->drupalGet(''); - $this->assertNoText($title, 'Menu link was deleted'); - } - - /** - * Alternately disable and enable a menu link. - * - * @param $item - * Menu link. - */ - function toggleMenuLink($item) { - $this->disableMenuLink($item); - - // Verify menu link is absent. - $this->drupalGet(''); - $this->assertNoText($item['link_title'], 'Menu link was not displayed'); - $this->enableMenuLink($item); - - // Verify menu link is displayed. - $this->drupalGet(''); - $this->assertText($item['link_title'], 'Menu link was displayed'); - } - - /** - * Disable a menu link. - * - * @param $item - * Menu link. - */ - function disableMenuLink($item) { - $mlid = $item['mlid']; - $edit['enabled'] = FALSE; - $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); - - // Unlike most other modules, there is no confirmation message displayed. - // Verify in the database. - $this->assertMenuLink($mlid, array('hidden' => 1)); - } - - /** - * Enable a menu link. - * - * @param $item - * Menu link. - */ - function enableMenuLink($item) { - $mlid = $item['mlid']; - $edit['enabled'] = TRUE; - $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save')); - - // Verify in the database. - $this->assertMenuLink($mlid, array('hidden' => 0)); - } - - /** - * Fetch the menu item from the database and compare it to the specified - * array. - * - * @param $mlid - * Menu item id. - * @param $item - * Array containing properties to verify. - */ - function assertMenuLink($mlid, array $expected_item) { - // Retrieve menu link. - $item = db_query('SELECT * FROM {menu_links} WHERE mlid = :mlid', array(':mlid' => $mlid))->fetchAssoc(); - $options = unserialize($item['options']); - if (!empty($options['query'])) { - $item['link_path'] .= '?' . drupal_http_build_query($options['query']); - } - if (!empty($options['fragment'])) { - $item['link_path'] .= '#' . $options['fragment']; - } - foreach ($expected_item as $key => $value) { - $this->assertEqual($item[$key], $value, format_string('Parameter %key had expected value.', array('%key' => $key))); - } - } - - /** - * Get standard menu link. - */ - private function getStandardMenuLink() { - // Retrieve menu link id of the Log out menu link, which will always be on the front page. - $mlid = db_query("SELECT mlid FROM {menu_links} WHERE module = 'system' AND router_path = 'user/logout'")->fetchField(); - $this->assertTrue($mlid > 0, 'Standard menu link id was found'); - // Load menu link. - // Use api function so that link is translated for rendering. - $item = menu_link_load($mlid); - $this->assertTrue((bool) $item, 'Standard menu link was loaded'); - return $item; - } - - /** - * Verify the logged in user has the desired access to the various menu nodes. - * - * @param integer $response HTTP response code. - */ - private function verifyAccess($response = 200) { - // View menu help node. - $this->drupalGet('admin/help/menu'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertText(t('Menu'), 'Menu help was displayed'); - } - - // View menu build overview node. - $this->drupalGet('admin/structure/menu'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertText(t('Menus'), 'Menu build overview node was displayed'); - } - - // View navigation menu customization node. - $this->drupalGet('admin/structure/menu/manage/navigation'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertText(t('Navigation'), 'Navigation menu node was displayed'); - } - - // View menu edit node. - $item = $this->getStandardMenuLink(); - $this->drupalGet('admin/structure/menu/item/' . $item['mlid'] . '/edit'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertText(t('Edit menu item'), 'Menu edit node was displayed'); - } - - // View menu settings node. - $this->drupalGet('admin/structure/menu/settings'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertText(t('Menus'), 'Menu settings node was displayed'); - } - - // View add menu node. - $this->drupalGet('admin/structure/menu/add'); - $this->assertResponse($response); - if ($response == 200) { - $this->assertText(t('Menus'), 'Add menu node was displayed'); - } - } -} - -/** - * Test menu settings for nodes. - */ -class MenuNodeTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Menu settings for nodes', - 'description' => 'Add, edit, and delete a node with menu link.', - 'group' => 'Menu', - ); - } - - function setUp() { - parent::setUp('menu'); - - $this->admin_user = $this->drupalCreateUser(array( - 'access administration pages', - 'administer content types', - 'administer menu', - 'create page content', - 'edit any page content', - 'delete any page content', - )); - $this->drupalLogin($this->admin_user); - } - - /** - * Test creating, editing, deleting menu links via node form widget. - */ - function testMenuNodeFormWidget() { - // Enable Navigation menu as available menu. - $edit = array( - 'menu_options[navigation]' => 1, - ); - $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); - // Change default parent item to Navigation menu, so we can assert more - // easily. - $edit = array( - 'menu_parent' => 'navigation:0', - ); - $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); - - // Create a node. - $node_title = $this->randomName(); - $language = LANGUAGE_NONE; - $edit = array( - "title" => $node_title, - "body[$language][0][value]" => $this->randomString(), - ); - $this->drupalPost('node/add/page', $edit, t('Save')); - $node = $this->drupalGetNodeByTitle($node_title); - // Assert that there is no link for the node. - $this->drupalGet(''); - $this->assertNoLink($node_title); - - // Edit the node, enable the menu link setting, but skip the link title. - $edit = array( - 'menu[enabled]' => 1, - ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - // Assert that there is no link for the node. - $this->drupalGet(''); - $this->assertNoLink($node_title); - - // Edit the node and create a menu link. - $edit = array( - 'menu[enabled]' => 1, - 'menu[link_title]' => $node_title, - 'menu[weight]' => 17, - ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - // Assert that the link exists. - $this->drupalGet(''); - $this->assertLink($node_title); - - $this->drupalGet('node/' . $node->nid . '/edit'); - $this->assertOptionSelected('edit-menu-weight', 17, 'Menu weight correct in edit form'); - - // Edit the node and remove the menu link. - $edit = array( - 'menu[enabled]' => FALSE, - ); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - // Assert that there is no link for the node. - $this->drupalGet(''); - $this->assertNoLink($node_title); - - // Add a menu link to the Management menu. - $item = array( - 'link_path' => 'node/' . $node->nid, - 'link_title' => $this->randomName(16), - 'menu_name' => 'management', - ); - menu_link_save($item); - - // Assert that disabled Management menu is not shown on the node/$nid/edit page. - $this->drupalGet('node/' . $node->nid . '/edit'); - $this->assertText('Provide a menu link', 'Link in not allowed menu not shown in node edit form'); - // Assert that the link is still in the management menu after save. - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $link = menu_link_load($item['mlid']); - $this->assertTrue($link, 'Link in not allowed menu still exists after saving node'); - - // Move the menu link back to the Navigation menu. - $item['menu_name'] = 'navigation'; - menu_link_save($item); - // Create a second node. - $child_node = $this->drupalCreateNode(array('type' => 'article')); - // Assign a menu link to the second node, being a child of the first one. - $child_item = array( - 'link_path' => 'node/'. $child_node->nid, - 'link_title' => $this->randomName(16), - 'plid' => $item['mlid'], - ); - menu_link_save($child_item); - // Edit the first node. - $this->drupalGet('node/'. $node->nid .'/edit'); - // Assert that it is not possible to set the parent of the first node to itself or the second node. - $this->assertNoOption('edit-menu-parent', 'navigation:'. $item['mlid']); - $this->assertNoOption('edit-menu-parent', 'navigation:'. $child_item['mlid']); - // Assert that unallowed Management menu is not available in options. - $this->assertNoOption('edit-menu-parent', 'management:0'); - } - - /** - * Asserts that a select option in the current page does not exist. - * - * @param $id - * Id of select field to assert. - * @param $option - * Option to assert. - * @param $message - * Message to display. - * @return - * TRUE on pass, FALSE on fail. - * - * @todo move to simpletest drupal_web_test_case.php. - */ - protected function assertNoOption($id, $option, $message = '') { - $selects = $this->xpath('//select[@id=:id]', array(':id' => $id)); - $options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option)); - return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : t('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), t('Browser')); - } -} diff --git a/modules/node/content_types.js b/modules/node/content_types.js deleted file mode 100644 index 0031c32..0000000 --- a/modules/node/content_types.js +++ /dev/null @@ -1,34 +0,0 @@ -(function ($) { - -Drupal.behaviors.contentTypes = { - attach: function (context) { - // Provide the vertical tab summaries. - $('fieldset#edit-submission', context).drupalSetSummary(function(context) { - var vals = []; - vals.push(Drupal.checkPlain($('#edit-title-label', context).val()) || Drupal.t('Requires a title')); - return vals.join(', '); - }); - $('fieldset#edit-workflow', context).drupalSetSummary(function(context) { - var vals = []; - $("input[name^='node_options']:checked", context).parent().each(function() { - vals.push(Drupal.checkPlain($(this).text())); - }); - if (!$('#edit-node-options-status', context).is(':checked')) { - vals.unshift(Drupal.t('Not published')); - } - return vals.join(', '); - }); - $('fieldset#edit-display', context).drupalSetSummary(function(context) { - var vals = []; - $('input:checked', context).next('label').each(function() { - vals.push(Drupal.checkPlain($(this).text())); - }); - if (!$('#edit-node-submitted', context).is(':checked')) { - vals.unshift(Drupal.t("Don't display post information")); - } - return vals.join(', '); - }); - } -}; - -})(jQuery); diff --git a/modules/node/node.css b/modules/node/node.css deleted file mode 100644 index 07540fa..0000000 --- a/modules/node/node.css +++ /dev/null @@ -1,10 +0,0 @@ - -.node-unpublished { - background-color: #fff4f4; -} -.preview .node { - background-color: #ffffea; -} -td.revision-current { - background: #ffc; -} diff --git a/modules/node/node.info b/modules/node/node.info deleted file mode 100644 index 85866e7..0000000 --- a/modules/node/node.info +++ /dev/null @@ -1,10 +0,0 @@ -name = Node -description = Allows content to be submitted to the site and displayed on pages. -package = Core -version = VERSION -core = 7.x -files[] = node.module -files[] = node.test -required = TRUE -configure = admin/structure/types -stylesheets[all][] = node.css diff --git a/modules/node/node.js b/modules/node/node.js deleted file mode 100644 index ebf68eb..0000000 --- a/modules/node/node.js +++ /dev/null @@ -1,43 +0,0 @@ - -(function ($) { - -Drupal.behaviors.nodeFieldsetSummaries = { - attach: function (context) { - $('fieldset.node-form-revision-information', context).drupalSetSummary(function (context) { - var revisionCheckbox = $('.form-item-revision input', context); - - // Return 'New revision' if the 'Create new revision' checkbox is checked, - // or if the checkbox doesn't exist, but the revision log does. For users - // without the "Administer content" permission the checkbox won't appear, - // but the revision log will if the content type is set to auto-revision. - if (revisionCheckbox.is(':checked') || (!revisionCheckbox.length && $('.form-item-log textarea', context).length)) { - return Drupal.t('New revision'); - } - - return Drupal.t('No revision'); - }); - - $('fieldset.node-form-author', context).drupalSetSummary(function (context) { - var name = $('.form-item-name input', context).val() || Drupal.settings.anonymous, - date = $('.form-item-date input', context).val(); - return date ? - Drupal.t('By @name on @date', { '@name': name, '@date': date }) : - Drupal.t('By @name', { '@name': name }); - }); - - $('fieldset.node-form-options', context).drupalSetSummary(function (context) { - var vals = []; - - $('input:checked', context).parent().each(function () { - vals.push(Drupal.checkPlain($.trim($(this).text()))); - }); - - if (!$('.form-item-status input', context).is(':checked')) { - vals.unshift(Drupal.t('Not published')); - } - return vals.join(', '); - }); - } -}; - -})(jQuery); diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php deleted file mode 100644 index 4c358a1..0000000 --- a/modules/node/node.tpl.php +++ /dev/null @@ -1,112 +0,0 @@ -body becomes $body. When needing to - * access a field's raw values, developers/themers are strongly encouraged to - * use these variables. Otherwise they will have to explicitly specify the - * desired field language; for example, $node->body['en'], thus overriding any - * language negotiation rule that was previously applied. - * - * @see template_preprocess() - * @see template_preprocess_node() - * @see template_process() - * - * @ingroup themeable - */ -?> - diff --git a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info deleted file mode 100644 index dc5e530..0000000 --- a/modules/node/tests/node_access_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "Node module access tests" -description = "Support module for node permission testing." -package = Testing -version = VERSION -core = 7.x -hidden = TRUE diff --git a/modules/node/tests/node_access_test.install b/modules/node/tests/node_access_test.install deleted file mode 100644 index 1f33d51..0000000 --- a/modules/node/tests/node_access_test.install +++ /dev/null @@ -1,42 +0,0 @@ - 'The base table for node_access_test.', - 'fields' => array( - 'nid' => array( - 'description' => 'The {node}.nid this record affects.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'private' => array( - 'description' => 'Boolean indicating whether the node is private (visible to administrator) or not (visible to non-administrators).', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - ), - ), - 'indexes' => array( - 'nid' => array('nid'), - ), - 'primary key' => array('nid'), - 'foreign keys' => array( - 'versioned_node' => array( - 'table' => 'node', - 'columns' => array('nid' => 'nid'), - ), - ), - ); - - return $schema; -} diff --git a/modules/node/tests/node_access_test.module b/modules/node/tests/node_access_test.module deleted file mode 100644 index ec35c41..0000000 --- a/modules/node/tests/node_access_test.module +++ /dev/null @@ -1,230 +0,0 @@ -uid); - if ($op == 'view' && user_access('node test view', $account)) { - $grants['node_access_test'] = array(8888, 8889); - } - if ($op == 'view' && $account->uid == variable_get('node_test_node_access_all_uid', 0)) { - $grants['node_access_all'] = array(0); - } - return $grants; -} - -/** - * Implements hook_node_access_records(). - */ -function node_access_test_node_access_records($node) { - $grants = array(); - // For NodeAccessBaseTableTestCase, only set records for private nodes. - if (!variable_get('node_access_test_private') || $node->private) { - $grants[] = array( - 'realm' => 'node_access_test', - 'gid' => 8888, - 'grant_view' => 1, - 'grant_update' => 0, - 'grant_delete' => 0, - 'priority' => 0, - ); - $grants[] = array( - 'realm' => 'node_access_test', - 'gid' => 8889, - 'grant_view' => 1, - 'grant_update' => 0, - 'grant_delete' => 0, - 'priority' => 0, - ); - // For the author realm, the GID is equivalent to a UID, which - // means there are many many groups of just 1 user. - $grants[] = array( - 'realm' => 'node_access_test_author', - 'gid' => $node->uid, - 'grant_view' => 1, - 'grant_update' => 1, - 'grant_delete' => 1, - 'priority' => 0, - ); - } - - return $grants; -} - -/** - * Implements hook_permission(). - * - * Sets up permissions for this module. - */ -function node_access_test_permission() { - return array('node test view' => array('title' => 'View content')); -} - -/** - * Implements hook_menu(). - * - * Sets up a page that lists nodes. - */ -function node_access_test_menu() { - $items = array(); - $items['node_access_test_page'] = array( - 'title' => 'Node access test', - 'page callback' => 'node_access_test_page', - 'access arguments' => array('access content'), - 'type' => MENU_SUGGESTED_ITEM, - ); - $items['node_access_entity_test_page'] = array( - 'title' => 'Node access test', - 'page callback' => 'node_access_entity_test_page', - 'access arguments' => array('access content'), - 'type' => MENU_SUGGESTED_ITEM, - ); - return $items; -} - -/** - * Page callback for node access test page. - * - * Page should say "No nodes" if there are no nodes, and "Yes, # nodes" (with - * the number filled in) if there were nodes the user could access. Also, the - * database query is shown, and a list of the node IDs, for debugging purposes. - * And if there is a query exception, the page says "Exception" and gives the - * error. - */ -function node_access_test_page() { - $output = ''; - - try { - $query = db_select('node', 'mytab') - ->fields('mytab'); - $query->addTag('node_access'); - $result = $query->execute()->fetchAll(); - - if (count($result)) { - $output .= ' Yes, ' . count($result) . ' nodes
'; - $output .= '- ';
- foreach ($result as $item) {
- $output .= '
- ' . $item->nid . ' '; - } - $output .= '
No nodes
'; - } - - $output .= '' . ((string) $query ) . '
'; - } - catch (Exception $e) { - $output = 'Exception
'; - $output .= '' . $e->getMessage() . '
'; - } - - return $output; -} - -/** - * Page callback for node access entity test page. - * - * Page should say "No nodes" if there are no nodes, and "Yes, # nodes" (with - * the number filled in) if there were nodes the user could access. Also, the - * database query is shown, and a list of the node IDs, for debugging purposes. - * And if there is a query exception, the page says "Exception" and gives the - * error. - * - * @see node_access_test_menu() - */ -function node_access_entity_test_page() { - $output = ''; - try { - $query = new EntityFieldQuery; - $result = $query->fieldCondition('body', 'value', 'A', 'STARTS_WITH')->execute(); - if (!empty($result['node'])) { - $output .= 'Yes, ' . count($result['node']) . ' nodes
'; - $output .= '- ';
- foreach ($result['node'] as $nid => $v) {
- $output .= '
- ' . $nid . ' '; - } - $output .= '
No nodes
'; - } - } - catch (Exception $e) { - $output = 'Exception
'; - $output .= '' . $e->getMessage() . '
'; - } - - return $output; -} - -/** - * Implements hook_form_BASE_FORM_ID_alter(). - */ -function node_access_test_form_node_form_alter(&$form, $form_state) { - // Only show this checkbox for NodeAccessBaseTableTestCase. - if (variable_get('node_access_test_private')) { - $form['private'] = array( - '#type' => 'checkbox', - '#title' => t('Private'), - '#description' => t('Check here if this content should be set private and only shown to privileged users.'), - '#default_value' => isset($form['#node']->private) ? $form['#node']->private : FALSE, - ); - } -} - -/** - * Implements hook_node_load(). - */ -function node_access_test_node_load($nodes, $types) { - $result = db_query('SELECT nid, private FROM {node_access_test} WHERE nid IN(:nids)', array(':nids' => array_keys($nodes))); - foreach ($result as $record) { - $nodes[$record->nid]->private = $record->private; - } -} - -/** - * Implements hook_node_delete(). - */ - -function node_access_test_node_delete($node) { - db_delete('node_access_test')->condition('nid', $node->nid)->execute(); -} - -/** - * Implements hook_node_insert(). - */ -function node_access_test_node_insert($node) { - _node_access_test_node_write($node); -} - -/** - * Implements hook_nodeapi_update(). - */ -function node_access_test_node_update($node) { - _node_access_test_node_write($node); -} - -/** - * Helper for node insert/update. - */ -function _node_access_test_node_write($node) { - if (isset($node->private)) { - db_merge('node_access_test') - ->key(array('nid' => $node->nid)) - ->fields(array('private' => (int) $node->private)) - ->execute(); - } -} diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info deleted file mode 100644 index fa6c093..0000000 --- a/modules/node/tests/node_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "Node module tests" -description = "Support module for node related testing." -package = Testing -version = VERSION -core = 7.x -hidden = TRUE diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info deleted file mode 100644 index 1a339e0..0000000 --- a/modules/node/tests/node_test_exception.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "Node module exception tests" -description = "Support module for node related exception testing." -package = Testing -version = VERSION -core = 7.x -hidden = TRUE diff --git a/modules/node/tests/node_test_exception.module b/modules/node/tests/node_test_exception.module deleted file mode 100644 index 66bc717..0000000 --- a/modules/node/tests/node_test_exception.module +++ /dev/null @@ -1,15 +0,0 @@ -title == 'testing_transaction_exception') { - throw new Exception('Test exception for rollback.'); - } -} diff --git a/modules/openid/login-bg.png b/modules/openid/login-bg.png deleted file mode 100644 index 532614f..0000000 Binary files a/modules/openid/login-bg.png and /dev/null differ diff --git a/modules/openid/openid-rtl.css b/modules/openid/openid-rtl.css deleted file mode 100644 index 861f6d7..0000000 --- a/modules/openid/openid-rtl.css +++ /dev/null @@ -1,18 +0,0 @@ - -#edit-openid-identifier { - background-position: right 50%; - padding-left: 0; - padding-right: 20px; -} -#user-login .openid-links { - padding-right: 0; -} -html.js #user-login-form li.openid-link, -html.js #user-login li.openid-link { - margin-right: 0; -} -#user-login-form li.openid-link a, -#user-login li.openid-link a { - background-position: right top; - padding: 0 1.5em 0 0; -} diff --git a/modules/openid/openid.api.php b/modules/openid/openid.api.php deleted file mode 100644 index 5e3d15d..0000000 --- a/modules/openid/openid.api.php +++ /dev/null @@ -1,116 +0,0 @@ - '_my_discovery_method', - ); -} - -/** - * Allow modules to alter discovery methods. - */ -function hook_openid_discovery_method_info_alter(&$methods) { - // Remove XRI discovery scheme. - unset($methods['xri']); -} - -/** - * Allow modules to declare OpenID normalization methods. - * - * The discovery function callbacks will be called in turn with an unique - * parameter, the identifier to normalize. They have to return a normalized - * identifier, or NULL if the identifier is not in a form they can handle. - * - * The first normalization method that succeed (return a value that is not NULL) - * will stop the normalization process. - * - * @return - * An array with a set of function callbacks, that will be called in turn - * when normalizing an OpenID identifier. The normalization functions have - * to return a normalized identifier, or NULL if the identifier is not in - * a form they can handle. - * @see hook_openid_normalization_method_info_alter() - */ -function hook_openid_normalization_method_info() { - return array( - 'new_normalization_idea' => '_my_normalization_method', - ); -} - -/** - * Allow modules to alter normalization methods. - */ -function hook_openid_normalization_method_info_alter(&$methods) { - // Remove Google IDP normalization. - unset($methods['google_idp']); -} - -/** - * @} End of "addtogroup hooks". - */ diff --git a/modules/openid/openid.css b/modules/openid/openid.css deleted file mode 100644 index 48b170f..0000000 --- a/modules/openid/openid.css +++ /dev/null @@ -1,46 +0,0 @@ - -#edit-openid-identifier { - background-image: url("login-bg.png"); - background-position: left 50%; /* LTR */ - background-repeat: no-repeat; - padding-left: 20px; /* LTR */ -} -div.form-item-openid-identifier { - display: block; -} -html.js #user-login-form div.form-item-openid-identifier, -html.js #user-login div.form-item-openid-identifier { - display: none; -} -#user-login-form ul { - margin-top: 0; -} -#user-login ul { - margin: 0 0 5px; -} -#user-login ul li { - margin: 0; -} -#user-login-form .openid-links { - padding-bottom: 0; -} -#user-login .openid-links { - padding-left: 0; /* LTR */ -} -#user-login-form .openid-links li, -#user-login .openid-links li { - display: none; - list-style: none; -} -html.js #user-login-form li.openid-link, -html.js #user-login li.openid-link { - display: block; - margin-left: 0; /* LTR */ -} -#user-login-form li.openid-link a, -#user-login li.openid-link a { - background-image: url("login-bg.png"); - background-position: left top; /* LTR */ - background-repeat: no-repeat; - padding: 0 0 0 1.5em; /* LTR */ -} diff --git a/modules/openid/openid.info b/modules/openid/openid.info deleted file mode 100644 index 6a1843c..0000000 --- a/modules/openid/openid.info +++ /dev/null @@ -1,6 +0,0 @@ -name = OpenID -description = "Allows users to log into your site using OpenID." -version = VERSION -package = Core -core = 7.x -files[] = openid.test diff --git a/modules/openid/openid.js b/modules/openid/openid.js deleted file mode 100644 index 4a09e5a..0000000 --- a/modules/openid/openid.js +++ /dev/null @@ -1,49 +0,0 @@ -(function ($) { - -Drupal.behaviors.openid = { - attach: function (context) { - var loginElements = $('.form-item-name, .form-item-pass, li.openid-link'); - var openidElements = $('.form-item-openid-identifier, li.user-link'); - var cookie = $.cookie('Drupal.visitor.openid_identifier'); - - // This behavior attaches by ID, so is only valid once on a page. - if (!$('#edit-openid-identifier.openid-processed').length) { - if (cookie) { - $('#edit-openid-identifier').val(cookie); - } - if ($('#edit-openid-identifier').val() || location.hash == '#openid-login') { - $('#edit-openid-identifier').addClass('openid-processed'); - loginElements.hide(); - // Use .css('display', 'block') instead of .show() to be Konqueror friendly. - openidElements.css('display', 'block'); - } - } - - $('li.openid-link:not(.openid-processed)', context) - .addClass('openid-processed') - .click(function () { - loginElements.hide(); - openidElements.css('display', 'block'); - // Remove possible error message. - $('#edit-name, #edit-pass').removeClass('error'); - $('div.messages.error').hide(); - // Set focus on OpenID Identifier field. - $('#edit-openid-identifier')[0].focus(); - return false; - }); - $('li.user-link:not(.openid-processed)', context) - .addClass('openid-processed') - .click(function () { - openidElements.hide(); - loginElements.css('display', 'block'); - // Clear OpenID Identifier field and remove possible error message. - $('#edit-openid-identifier').val('').removeClass('error'); - $('div.messages.error').css('display', 'block'); - // Set focus on username field. - $('#edit-name')[0].focus(); - return false; - }); - } -}; - -})(jQuery); diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc deleted file mode 100644 index 8a52f20..0000000 --- a/modules/openid/openid.pages.inc +++ /dev/null @@ -1,116 +0,0 @@ -fields(array( - 'uid' => $account->uid, - 'authname' => $identity, - 'module' => 'openid', - )) - ->execute(); - drupal_set_message(t('Successfully added %identity', array('%identity' => $identity))); - } - - $header = array(t('OpenID'), t('Operations')); - $rows = array(); - - $result = db_query("SELECT * FROM {authmap} WHERE module='openid' AND uid=:uid", array(':uid' => $account->uid)); - foreach ($result as $identity) { - $rows[] = array(check_plain($identity->authname), l(t('Delete'), 'user/' . $account->uid . '/openid/delete/' . $identity->aid)); - } - - $build['openid_table'] = array( - '#theme' => 'table', - '#header' => $header, - '#rows' => $rows, - '#empty' => t('No OpenID identities available for this account.'), - ); - $build['openid_user_add'] = drupal_get_form('openid_user_add'); - return $build; -} - -/** - * Form builder; Add an OpenID identity. - * - * @ingroup forms - * @see openid_user_add_validate() - */ -function openid_user_add() { - $form['openid_identifier'] = array( - '#type' => 'textfield', - '#title' => t('OpenID'), - ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Add an OpenID')); - return $form; -} - -function openid_user_add_validate($form, &$form_state) { - // Check for existing entries. - $claimed_id = openid_normalize($form_state['values']['openid_identifier']); - if (db_query("SELECT authname FROM {authmap} WHERE authname = :authname", (array(':authname' => $claimed_id)))->fetchField()) { - form_set_error('openid_identifier', t('That OpenID is already in use on this site.')); - } -} - -function openid_user_add_submit($form, &$form_state) { - $return_to = url('user/' . arg(1) . '/openid', array('absolute' => TRUE)); - openid_begin($form_state['values']['openid_identifier'], $return_to); -} - -/** - * Menu callback; Delete the specified OpenID identity from the system. - */ -function openid_user_delete_form($form, $form_state, $account, $aid = 0) { - $authname = db_query("SELECT authname FROM {authmap} WHERE uid = :uid AND aid = :aid AND module = 'openid'", array( - ':uid' => $account->uid, - ':aid' => $aid, - )) - ->fetchField(); - return confirm_form(array(), t('Are you sure you want to delete the OpenID %authname for %user?', array('%authname' => $authname, '%user' => $account->name)), 'user/' . $account->uid . '/openid'); -} - -function openid_user_delete_form_submit($form, &$form_state) { - $query = db_delete('authmap') - ->condition('uid', $form_state['build_info']['args'][0]->uid) - ->condition('aid', $form_state['build_info']['args'][1]) - ->condition('module', 'openid') - ->execute(); - if ($query) { - drupal_set_message(t('OpenID deleted.')); - } - $form_state['redirect'] = 'user/' . $form_state['build_info']['args'][0]->uid . '/openid'; -} diff --git a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info deleted file mode 100644 index 755a5ee..0000000 --- a/modules/openid/tests/openid_test.info +++ /dev/null @@ -1,7 +0,0 @@ -name = OpenID dummy provider -description = "OpenID provider used for testing." -package = Testing -version = VERSION -core = 7.x -dependencies[] = openid -hidden = TRUE diff --git a/modules/openid/tests/openid_test.module b/modules/openid/tests/openid_test.module deleted file mode 100644 index bcf9f42..0000000 --- a/modules/openid/tests/openid_test.module +++ /dev/null @@ -1,367 +0,0 @@ - 'XRDS service document', - 'page callback' => 'openid_test_yadis_xrds', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/yadis/x-xrds-location'] = array( - 'title' => 'Yadis discovery using X-XRDS-Location header', - 'page callback' => 'openid_test_yadis_x_xrds_location', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/yadis/http-equiv'] = array( - 'title' => 'Yadis discovery using ', - 'page callback' => 'openid_test_yadis_http_equiv', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/html/openid1'] = array( - 'title' => 'HTML-based discovery using ', - 'page callback' => 'openid_test_html_openid1', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/html/openid2'] = array( - 'title' => 'HTML-based discovery using ', - 'page callback' => 'openid_test_html_openid2', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/endpoint'] = array( - 'title' => 'OpenID Provider Endpoint', - 'page callback' => 'openid_test_endpoint', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/redirect'] = array( - 'title' => 'OpenID Provider Redirection Point', - 'page callback' => 'openid_test_redirect', - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - $items['openid-test/redirected/%/%'] = array( - 'title' => 'OpenID Provider Final URL', - 'page callback' => 'openid_test_redirected_method', - 'page arguments' => array(2, 3), - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - return $items; -} - -/** - * Implements hook_menu_site_status_alter(). - */ -function openid_test_menu_site_status_alter(&$menu_site_status, $path) { - // Allow access to openid endpoint and identity even in offline mode. - if ($menu_site_status == MENU_SITE_OFFLINE && user_is_anonymous() && in_array($path, array('openid-test/yadis/xrds', 'openid-test/endpoint'))) { - $menu_site_status = MENU_SITE_ONLINE; - } -} - -/** - * Menu callback; XRDS document that references the OP Endpoint URL. - */ -function openid_test_yadis_xrds() { - if ($_SERVER['HTTP_ACCEPT'] == 'application/xrds+xml') { - // Only respond to XRI requests for one specific XRI. The is used to verify - // that the XRI has been properly encoded. The "+" sign in the _xrd_r query - // parameter is decoded to a space by PHP. - if (arg(3) == 'xri') { - if (variable_get('clean_url', 0)) { - if (arg(4) != '@example*résumé;%25' || $_GET['_xrd_r'] != 'application/xrds xml') { - drupal_not_found(); - } - } - else { - // Drupal cannot properly emulate an XRI proxy resolver using unclean - // URLs, so the arguments gets messed up. - if (arg(4) . '/' . arg(5) != '@example*résumé;%25?_xrd_r=application/xrds xml') { - drupal_not_found(); - } - } - } - drupal_add_http_header('Content-Type', 'application/xrds+xml'); - print ''; - if (!empty($_GET['doctype'])) { - print "\n ]>\n"; - } - print ' -- -- xri://@ -http://example.com/user -- -http://example.com/this-is-ignored -- -http://openid.net/signon/1.0 -http://example.com/this-is-only-openid-1.0 -- -http://specs.openid.net/auth/2.0/signon -http://openid.net/srv/ax/1.0 -' . url('openid-test/endpoint', array('absolute' => TRUE)) . ' -http://example.com/xrds -- -http://specs.openid.net/auth/2.0/signon -http://example.com/this-has-too-low-priority -- - '; - if (arg(3) == 'server') { - print ' -http://specs.openid.net/auth/2.0/signon -http://example.com/this-has-too-low-priority -- -http://specs.openid.net/auth/2.0/server -http://example.com/this-has-too-low-priority -- '; - } - elseif (arg(3) == 'delegate') { - print ' -http://specs.openid.net/auth/2.0/server -' . url('openid-test/endpoint', array('absolute' => TRUE)) . ' -- '; - } - print ' -http://specs.openid.net/auth/2.0/signon -http://openid.net/srv/ax/1.0 -' . url('openid-test/endpoint', array('absolute' => TRUE)) . ' -'; -}; - -/** - * Theme function to create an overlay iframe element. - */ -Drupal.theme.prototype.overlayElement = function (url) { - return ''; -}; - -})(jQuery); diff --git a/modules/overlay/overlay.api.php b/modules/overlay/overlay.api.php deleted file mode 100644 index bc23546..0000000 --- a/modules/overlay/overlay.api.php +++ /dev/null @@ -1,40 +0,0 @@ -#overlay=admin/modules on hook_init(). - $_SESSION['overlay_enable_redirect'] = 1; - } -} diff --git a/modules/overlay/overlay.tpl.php b/modules/overlay/overlay.tpl.php deleted file mode 100644 index df86337..0000000 --- a/modules/overlay/overlay.tpl.php +++ /dev/null @@ -1,39 +0,0 @@ - - - - diff --git a/modules/path/path.admin.inc b/modules/path/path.admin.inc deleted file mode 100644 index 28b0618..0000000 --- a/modules/path/path.admin.inc +++ /dev/null @@ -1,314 +0,0 @@ - :language', 0, 1, array(':language' => LANGUAGE_NONE))->fetchField(); - $multilanguage = (module_exists('locale') || $alias_exists); - - $header = array(); - $header[] = array('data' => t('Alias'), 'field' => 'alias', 'sort' => 'asc'); - $header[] = array('data' => t('System'), 'field' => 'source'); - if ($multilanguage) { - $header[] = array('data' => t('Language'), 'field' => 'language'); - } - $header[] = array('data' => t('Operations')); - - $query = db_select('url_alias')->extend('PagerDefault')->extend('TableSort'); - if ($keys) { - // Replace wildcards with PDO wildcards. - $query->condition('alias', '%' . preg_replace('!\*+!', '%', $keys) . '%', 'LIKE'); - } - $result = $query - ->fields('url_alias') - ->orderByHeader($header) - ->limit(50) - ->execute(); - - $rows = array(); - $destination = drupal_get_destination(); - foreach ($result as $data) { - $row = array(); - $row['data']['alias'] = l($data->alias, $data->source); - $row['data']['source'] = l($data->source, $data->source, array('alias' => TRUE)); - if ($multilanguage) { - $row['data']['language'] = module_invoke('locale', 'language_name', $data->language); - } - - $operations = array(); - $operations['edit'] = array( - 'title' => t('edit'), - 'href' => "admin/config/search/path/edit/$data->pid", - 'query' => $destination, - ); - $operations['delete'] = array( - 'title' => t('delete'), - 'href' => "admin/config/search/path/delete/$data->pid", - 'query' => $destination, - ); - $row['data']['operations'] = array( - 'data' => array( - '#theme' => 'links', - '#links' => $operations, - '#attributes' => array('class' => array('links', 'inline', 'nowrap')), - ), - ); - - // If the system path maps to a different URL alias, highlight this table - // row to let the user know of old aliases. - if ($data->alias != drupal_get_path_alias($data->source, $data->language)) { - $row['class'] = array('warning'); - } - - $rows[] = $row; - } - - $build['path_table'] = array( - '#theme' => 'table', - '#header' => $header, - '#rows' => $rows, - '#empty' => t('No URL aliases available. Add URL alias.', array('@link' => url('admin/config/search/path/add'))), - ); - $build['path_pager'] = array('#theme' => 'pager'); - - return $build; -} - -/** - * Page callback: Returns a form creating or editing a path alias. - * - * @param $path - * An array containing the path ID, source, alias, and language code. - * - * @return - * A form for adding or editing a URL alias. - * - * @see path_menu() - */ -function path_admin_edit($path = array()) { - if ($path) { - drupal_set_title($path['alias']); - $output = drupal_get_form('path_admin_form', $path); - } - else { - $output = drupal_get_form('path_admin_form'); - } - - return $output; -} - -/** - * Form constructor for the path administration form. - * - * @param $path - * An array containing the path ID, source, alias, and language code. - * - * @ingroup forms - * @see path_admin_form_validate() - * @see path_admin_form_submit() - * @see path_admin_form_delete_submit() - */ -function path_admin_form($form, &$form_state, $path = array('source' => '', 'alias' => '', 'language' => LANGUAGE_NONE, 'pid' => NULL)) { - $form['source'] = array( - '#type' => 'textfield', - '#title' => t('Existing system path'), - '#default_value' => $path['source'], - '#maxlength' => 255, - '#size' => 45, - '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1.'), - '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='), - '#required' => TRUE, - ); - $form['alias'] = array( - '#type' => 'textfield', - '#title' => t('Path alias'), - '#default_value' => $path['alias'], - '#maxlength' => 255, - '#size' => 45, - '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), - '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='), - '#required' => TRUE, - ); - - // This will be a hidden value unless locale module is enabled. - $form['language'] = array( - '#type' => 'value', - '#value' => $path['language'] - ); - - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save'), - ); - if ($path['pid']) { - $form['pid'] = array( - '#type' => 'hidden', - '#value' => $path['pid'], - ); - $form['actions']['delete'] = array( - '#type' => 'submit', - '#value' => t('Delete'), - '#submit' => array('path_admin_form_delete_submit'), - ); - } - - return $form; -} - -/** - * Form submission handler for the 'Delete' button on path_admin_form(). - * - * @see path_admin_form_validate() - * @see path_admin_form_submit() - */ -function path_admin_form_delete_submit($form, &$form_state) { - $destination = array(); - if (isset($_GET['destination'])) { - $destination = drupal_get_destination(); - unset($_GET['destination']); - } - $form_state['redirect'] = array('admin/config/search/path/delete/' . $form_state['values']['pid'], array('query' => $destination)); -} - -/** - * Form validation handler for path_admin_form(). - * - * @see path_admin_form_submit() - * @see path_admin_form_delete_submit() - */ -function path_admin_form_validate($form, &$form_state) { - $source = &$form_state['values']['source']; - $source = drupal_get_normal_path($source); - $alias = $form_state['values']['alias']; - $pid = isset($form_state['values']['pid']) ? $form_state['values']['pid'] : 0; - // Language is only set if locale module is enabled, otherwise save for all languages. - $language = isset($form_state['values']['language']) ? $form_state['values']['language'] : LANGUAGE_NONE; - - $has_alias = db_query("SELECT COUNT(alias) FROM {url_alias} WHERE pid <> :pid AND alias = :alias AND language = :language", array( - ':pid' => $pid, - ':alias' => $alias, - ':language' => $language, - )) - ->fetchField(); - - if ($has_alias) { - form_set_error('alias', t('The alias %alias is already in use in this language.', array('%alias' => $alias))); - } - if (!drupal_valid_path($source)) { - form_set_error('source', t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $source))); - } -} - -/** - * Form submission handler for path_admin_form(). - * - * @see path_admin_form_validate() - * @see path_admin_form_delete_submit() - */ -function path_admin_form_submit($form, &$form_state) { - // Remove unnecessary values. - form_state_values_clean($form_state); - - path_save($form_state['values']); - - drupal_set_message(t('The alias has been saved.')); - $form_state['redirect'] = 'admin/config/search/path'; -} - -/** - * Form constructor for the path deletion form. - * - * @param $path - * The path alias that will be deleted. - * - * @see path_admin_delete_confirm_submit() - */ -function path_admin_delete_confirm($form, &$form_state, $path) { - if (user_access('administer url aliases')) { - $form_state['path'] = $path; - return confirm_form( - $form, - t('Are you sure you want to delete path alias %title?', - array('%title' => $path['alias'])), - 'admin/config/search/path' - ); - } - return array(); -} - -/** - * Form submission handler for path_admin_delete_confirm(). - */ -function path_admin_delete_confirm_submit($form, &$form_state) { - if ($form_state['values']['confirm']) { - path_delete($form_state['path']['pid']); - $form_state['redirect'] = 'admin/config/search/path'; - } -} - -/** - * Form constructor for the path admin overview filter form. - * - * @ingroup forms - * @see path_admin_filter_form_submit_filter() - * @see path_admin_filter_form_submit_reset() - */ -function path_admin_filter_form($form, &$form_state, $keys = '') { - $form['#attributes'] = array('class' => array('search-form')); - $form['basic'] = array('#type' => 'fieldset', - '#title' => t('Filter aliases'), - '#attributes' => array('class' => array('container-inline')), - ); - $form['basic']['filter'] = array( - '#type' => 'textfield', - '#title' => 'Path alias', - '#title_display' => 'invisible', - '#default_value' => $keys, - '#maxlength' => 128, - '#size' => 25, - ); - $form['basic']['submit'] = array( - '#type' => 'submit', - '#value' => t('Filter'), - '#submit' => array('path_admin_filter_form_submit_filter'), - ); - if ($keys) { - $form['basic']['reset'] = array( - '#type' => 'submit', - '#value' => t('Reset'), - '#submit' => array('path_admin_filter_form_submit_reset'), - ); - } - return $form; -} - -/** - * Form submission handler for the path_admin_filter_form() Filter button. - * - * @see path_admin_filter_form_submit_reset() - */ -function path_admin_filter_form_submit_filter($form, &$form_state) { - $form_state['redirect'] = 'admin/config/search/path/list/' . trim($form_state['values']['filter']); -} - -/** - * Form submission handler for the path_admin_filter_form() Reset button. - * - * @see path_admin_filter_form_submit_filter() - */ -function path_admin_filter_form_submit_reset($form, &$form_state) { - $form_state['redirect'] = 'admin/config/search/path/list'; -} diff --git a/modules/path/path.api.php b/modules/path/path.api.php deleted file mode 100644 index 0a17e2c..0000000 --- a/modules/path/path.api.php +++ /dev/null @@ -1,73 +0,0 @@ -fields(array( - 'alias' => $path['alias'], - 'pid' => $path['pid'], - )) - ->execute(); -} - -/** - * Respond to a path being updated. - * - * @param $path - * An associative array containing the following keys: - * - source: The internal system path. - * - alias: The URL alias. - * - pid: Unique path alias identifier. - * - language: The language of the alias. - * - * @see path_save() - */ -function hook_path_update($path) { - db_update('mytable') - ->fields(array('alias' => $path['alias'])) - ->condition('pid', $path['pid']) - ->execute(); -} - -/** - * Respond to a path being deleted. - * - * @param $path - * An associative array containing the following keys: - * - source: The internal system path. - * - alias: The URL alias. - * - pid: Unique path alias identifier. - * - language: The language of the alias. - * - * @see path_delete() - */ -function hook_path_delete($path) { - db_delete('mytable') - ->condition('pid', $path['pid']) - ->execute(); -} - -/** - * @} End of "addtogroup hooks". - */ diff --git a/modules/path/path.info b/modules/path/path.info deleted file mode 100644 index 8b6b67c..0000000 --- a/modules/path/path.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Path -description = Allows users to rename URLs. -package = Core -version = VERSION -core = 7.x -files[] = path.test -configure = admin/config/search/path diff --git a/modules/path/path.js b/modules/path/path.js deleted file mode 100644 index c4f3cd0..0000000 --- a/modules/path/path.js +++ /dev/null @@ -1,21 +0,0 @@ - -/** - * @file - * Attaches behaviors for the Path module. - */ - -(function ($) { - -Drupal.behaviors.pathFieldsetSummaries = { - attach: function (context) { - $('fieldset.path-form', context).drupalSetSummary(function (context) { - var path = $('.form-item-path-alias input').val(); - - return path ? - Drupal.t('Alias: @alias', { '@alias': path }) : - Drupal.t('No alias'); - }); - } -}; - -})(jQuery); diff --git a/modules/path/path.module b/modules/path/path.module deleted file mode 100644 index 81c7bb2..0000000 --- a/modules/path/path.module +++ /dev/null @@ -1,313 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Path module allows you to specify an alias, or custom URL, for any existing internal system path. Aliases should not be confused with URL redirects, which allow you to forward a changed or inactive URL to a new URL. In addition to making URLs more readable, aliases also help search engines index content more effectively. Multiple aliases may be used for a single internal system path. To automate the aliasing of paths, you can install the contributed module Pathauto. For more information, see the online handbook entry for the Path module.', array('@path' => 'http://drupal.org/documentation/modules/path', '@pathauto' => 'http://drupal.org/project/pathauto')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
- ' . t('Creating aliases') . ' '; - $output .= '
- ' . t('Users with sufficient permissions can create aliases under the URL path settings section when they create or edit content. Some examples of aliases are: ', array('@permissions' => url('admin/people/permissions', array('fragment' => 'module-path'))));
- $output .= '
- ' . t('member/jane-smith aliased to internal path user/123') . ' '; - $output .= '
- ' . t('about-us/team aliased to internal path node/456') . ' '; - $output .= '
';
- $output .= ' - ' . t('Managing aliases') . ' '; - $output .= '
- ' . t('The Path module provides a way to search and view a list of all aliases that are in use on your website. Aliases can be added, edited and deleted through this list.', array('@aliases' => url('admin/config/search/path'))) . ' '; - $output .= '
' . t("An alias defines a different name for an existing URL path - for example, the alias 'about' for the URL path 'node/1'. A URL path can have multiple aliases.") . '
'; - - case 'admin/config/search/path/add': - return '' . t('Enter the path you wish to create the alias for, followed by the name of the new alias.') . '
'; - } -} - -/** - * Implements hook_permission(). - */ -function path_permission() { - return array( - 'administer url aliases' => array( - 'title' => t('Administer URL aliases'), - ), - 'create url aliases' => array( - 'title' => t('Create and edit URL aliases'), - ), - ); -} - -/** - * Implements hook_menu(). - */ -function path_menu() { - $items['admin/config/search/path'] = array( - 'title' => 'URL aliases', - 'description' => "Change your site's URL paths by aliasing them.", - 'page callback' => 'path_admin_overview', - 'access arguments' => array('administer url aliases'), - 'weight' => -5, - 'file' => 'path.admin.inc', - ); - $items['admin/config/search/path/edit/%path'] = array( - 'title' => 'Edit alias', - 'page callback' => 'path_admin_edit', - 'page arguments' => array(5), - 'access arguments' => array('administer url aliases'), - 'file' => 'path.admin.inc', - ); - $items['admin/config/search/path/delete/%path'] = array( - 'title' => 'Delete alias', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('path_admin_delete_confirm', 5), - 'access arguments' => array('administer url aliases'), - 'file' => 'path.admin.inc', - ); - $items['admin/config/search/path/list'] = array( - 'title' => 'List', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['admin/config/search/path/add'] = array( - 'title' => 'Add alias', - 'page callback' => 'path_admin_edit', - 'access arguments' => array('administer url aliases'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'path.admin.inc', - ); - - return $items; -} - -/** - * Implements hook_form_BASE_FORM_ID_alter() for node_form(). - * - * @see path_form_element_validate() - */ -function path_form_node_form_alter(&$form, $form_state) { - $path = array(); - if (!empty($form['#node']->nid)) { - $conditions = array('source' => 'node/' . $form['#node']->nid); - $langcode = entity_language('node', $form['#node']); - if ($langcode != LANGUAGE_NONE) { - $conditions['language'] = $langcode; - } - $path = path_load($conditions); - if ($path === FALSE) { - $path = array(); - } - } - $path += array( - 'pid' => NULL, - 'source' => isset($form['#node']->nid) ? 'node/' . $form['#node']->nid : NULL, - 'alias' => '', - 'language' => isset($langcode) ? $langcode : LANGUAGE_NONE, - ); - - $form['path'] = array( - '#type' => 'fieldset', - '#title' => t('URL path settings'), - '#collapsible' => TRUE, - '#collapsed' => empty($path['alias']), - '#group' => 'additional_settings', - '#attributes' => array( - 'class' => array('path-form'), - ), - '#attached' => array( - 'js' => array(drupal_get_path('module', 'path') . '/path.js'), - ), - '#access' => user_access('create url aliases') || user_access('administer url aliases'), - '#weight' => 30, - '#tree' => TRUE, - '#element_validate' => array('path_form_element_validate'), - ); - $form['path']['alias'] = array( - '#type' => 'textfield', - '#title' => t('URL alias'), - '#default_value' => $path['alias'], - '#maxlength' => 255, - '#description' => t('Optionally specify an alternative URL by which this content can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), - ); - $form['path']['pid'] = array('#type' => 'value', '#value' => $path['pid']); - $form['path']['source'] = array('#type' => 'value', '#value' => $path['source']); - $form['path']['language'] = array('#type' => 'value', '#value' => $path['language']); -} - -/** - * Form element validation handler for URL alias form element. - * - * @see path_form_node_form_alter() - */ -function path_form_element_validate($element, &$form_state, $complete_form) { - // Trim the submitted value. - $alias = trim($form_state['values']['path']['alias']); - if (!empty($alias)) { - form_set_value($element['alias'], $alias, $form_state); - // Node language (Locale module) needs special care. Since the language of - // the URL alias depends on the node language, and the node language can be - // switched right within the same form, we need to conditionally overload - // the originally assigned URL alias language. - // @todo Remove this after converting Path module to a field, and, after - // stopping Locale module from abusing the content language system. - if (isset($form_state['values']['language'])) { - form_set_value($element['language'], $form_state['values']['language'], $form_state); - } - - $path = $form_state['values']['path']; - - // Ensure that the submitted alias does not exist yet. - $query = db_select('url_alias') - ->condition('alias', $path['alias']) - ->condition('language', $path['language']); - if (!empty($path['source'])) { - $query->condition('source', $path['source'], '<>'); - } - $query->addExpression('1'); - $query->range(0, 1); - if ($query->execute()->fetchField()) { - form_error($element, t('The alias is already in use.')); - } - } -} - -/** - * Implements hook_node_insert(). - */ -function path_node_insert($node) { - if (isset($node->path)) { - $path = $node->path; - $path['alias'] = trim($path['alias']); - // Only save a non-empty alias. - if (!empty($path['alias'])) { - // Ensure fields for programmatic executions. - $langcode = entity_language('node', $node); - $path['source'] = 'node/' . $node->nid; - $path['language'] = isset($langcode) ? $langcode : LANGUAGE_NONE; - path_save($path); - } - } -} - -/** - * Implements hook_node_update(). - */ -function path_node_update($node) { - if (isset($node->path)) { - $path = $node->path; - $path['alias'] = trim($path['alias']); - // Delete old alias if user erased it. - if (!empty($path['pid']) && empty($path['alias'])) { - path_delete($path['pid']); - } - path_node_insert($node); - } -} - -/** - * Implements hook_node_delete(). - */ -function path_node_delete($node) { - // Delete all aliases associated with this node. - path_delete(array('source' => 'node/' . $node->nid)); -} - -/** - * Implements hook_form_FORM_ID_alter() for taxonomy_form_term(). - */ -function path_form_taxonomy_form_term_alter(&$form, $form_state) { - // Make sure this does not show up on the delete confirmation form. - if (empty($form_state['confirm_delete'])) { - $langcode = entity_language('taxonomy_term', (object) $form['#term']); - $langcode = !empty($langcode) ? $langcode : LANGUAGE_NONE; - $conditions = array('source' => 'taxonomy/term/' . $form['#term']['tid'], 'language' => $langcode); - $path = (isset($form['#term']['tid']) ? path_load($conditions) : array()); - if ($path === FALSE) { - $path = array(); - } - $path += array( - 'pid' => NULL, - 'source' => isset($form['#term']['tid']) ? 'taxonomy/term/' . $form['#term']['tid'] : NULL, - 'alias' => '', - 'language' => $langcode, - ); - $form['path'] = array( - '#access' => user_access('create url aliases') || user_access('administer url aliases'), - '#tree' => TRUE, - '#element_validate' => array('path_form_element_validate'), - ); - $form['path']['alias'] = array( - '#type' => 'textfield', - '#title' => t('URL alias'), - '#default_value' => $path['alias'], - '#maxlength' => 255, - '#weight' => 0, - '#description' => t("Optionally specify an alternative URL by which this term can be accessed. Use a relative path and don't add a trailing slash or the URL alias won't work."), - ); - $form['path']['pid'] = array('#type' => 'value', '#value' => $path['pid']); - $form['path']['source'] = array('#type' => 'value', '#value' => $path['source']); - $form['path']['language'] = array('#type' => 'value', '#value' => $path['language']); - } -} - -/** - * Implements hook_taxonomy_term_insert(). - */ -function path_taxonomy_term_insert($term) { - if (isset($term->path)) { - $path = $term->path; - $path['alias'] = trim($path['alias']); - // Only save a non-empty alias. - if (!empty($path['alias'])) { - // Ensure fields for programmatic executions. - $path['source'] = 'taxonomy/term/' . $term->tid; - // Core does not provide a way to store the term language but contrib - // modules can do it so we need to take this into account. - $langcode = entity_language('taxonomy_term', $term); - $path['language'] = !empty($langcode) ? $langcode : LANGUAGE_NONE; - path_save($path); - } - } -} - -/** - * Implements hook_taxonomy_term_update(). - */ -function path_taxonomy_term_update($term) { - if (isset($term->path)) { - $path = $term->path; - $path['alias'] = trim($path['alias']); - // Delete old alias if user erased it. - if (!empty($path['pid']) && empty($path['alias'])) { - path_delete($path['pid']); - } - // Only save a non-empty alias. - if (!empty($path['alias'])) { - // Ensure fields for programmatic executions. - $path['source'] = 'taxonomy/term/' . $term->tid; - // Core does not provide a way to store the term language but contrib - // modules can do it so we need to take this into account. - $langcode = entity_language('taxonomy_term', $term); - $path['language'] = !empty($langcode) ? $langcode : LANGUAGE_NONE; - path_save($path); - } - } -} - -/** - * Implements hook_taxonomy_term_delete(). - */ -function path_taxonomy_term_delete($term) { - // Delete all aliases associated with this term. - path_delete(array('source' => 'taxonomy/term/' . $term->tid)); -} diff --git a/modules/path/path.test b/modules/path/path.test deleted file mode 100644 index edecff5..0000000 --- a/modules/path/path.test +++ /dev/null @@ -1,537 +0,0 @@ - 'Path alias functionality', - 'description' => 'Add, edit, delete, and change alias and verify its consistency in the database.', - 'group' => 'Path', - ); - } - - function setUp() { - parent::setUp('path'); - - // Create test user and login. - $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases')); - $this->drupalLogin($web_user); - } - - /** - * Tests the path cache. - */ - function testPathCache() { - // Create test node. - $node1 = $this->drupalCreateNode(); - - // Create alias. - $edit = array(); - $edit['source'] = 'node/' . $node1->nid; - $edit['alias'] = $this->randomName(8); - $this->drupalPost('admin/config/search/path/add', $edit, t('Save')); - - // Visit the system path for the node and confirm a cache entry is - // created. - cache_clear_all('*', 'cache_path', TRUE); - $this->drupalGet($edit['source']); - $this->assertTrue(cache_get($edit['source'], 'cache_path'), 'Cache entry was created.'); - - // Visit the alias for the node and confirm a cache entry is created. - cache_clear_all('*', 'cache_path', TRUE); - $this->drupalGet($edit['alias']); - $this->assertTrue(cache_get($edit['source'], 'cache_path'), 'Cache entry was created.'); - } - - /** - * Tests alias functionality through the admin interfaces. - */ - function testAdminAlias() { - // Create test node. - $node1 = $this->drupalCreateNode(); - - // Create alias. - $edit = array(); - $edit['source'] = 'node/' . $node1->nid; - $edit['alias'] = $this->randomName(8); - $this->drupalPost('admin/config/search/path/add', $edit, t('Save')); - - // Confirm that the alias works. - $this->drupalGet($edit['alias']); - $this->assertText($node1->title, 'Alias works.'); - $this->assertResponse(200); - - // Change alias to one containing "exotic" characters. - $pid = $this->getPID($edit['alias']); - - $previous = $edit['alias']; - $edit['alias'] = "- ._~!$'\"()*@[]?&+%#,;=:" . // "Special" ASCII characters. - "%23%25%26%2B%2F%3F" . // Characters that look like a percent-escaped string. - "éøïвβ中國書۞"; // Characters from various non-ASCII alphabets. - $this->drupalPost('admin/config/search/path/edit/' . $pid, $edit, t('Save')); - - // Confirm that the alias works. - $this->drupalGet($edit['alias']); - $this->assertText($node1->title, 'Changed alias works.'); - $this->assertResponse(200); - - drupal_static_reset('drupal_lookup_path'); - // Confirm that previous alias no longer works. - $this->drupalGet($previous); - $this->assertNoText($node1->title, 'Previous alias no longer works.'); - $this->assertResponse(404); - - // Create second test node. - $node2 = $this->drupalCreateNode(); - - // Set alias to second test node. - $edit['source'] = 'node/' . $node2->nid; - // leave $edit['alias'] the same - $this->drupalPost('admin/config/search/path/add', $edit, t('Save')); - - // Confirm no duplicate was created. - $this->assertRaw(t('The alias %alias is already in use in this language.', array('%alias' => $edit['alias'])), 'Attempt to move alias was rejected.'); - - // Delete alias. - $this->drupalPost('admin/config/search/path/edit/' . $pid, array(), t('Delete')); - $this->drupalPost(NULL, array(), t('Confirm')); - - // Confirm that the alias no longer works. - $this->drupalGet($edit['alias']); - $this->assertNoText($node1->title, 'Alias was successfully deleted.'); - $this->assertResponse(404); - } - - /** - * Tests alias functionality through the node interfaces. - */ - function testNodeAlias() { - // Create test node. - $node1 = $this->drupalCreateNode(); - - // Create alias. - $edit = array(); - $edit['path[alias]'] = $this->randomName(8); - $this->drupalPost('node/' . $node1->nid . '/edit', $edit, t('Save')); - - // Confirm that the alias works. - $this->drupalGet($edit['path[alias]']); - $this->assertText($node1->title, 'Alias works.'); - $this->assertResponse(200); - - // Change alias to one containing "exotic" characters. - $previous = $edit['path[alias]']; - $edit['path[alias]'] = "- ._~!$'\"()*@[]?&+%#,;=:" . // "Special" ASCII characters. - "%23%25%26%2B%2F%3F" . // Characters that look like a percent-escaped string. - "éøïвβ中國書۞"; // Characters from various non-ASCII alphabets. - $this->drupalPost('node/' . $node1->nid . '/edit', $edit, t('Save')); - - // Confirm that the alias works. - $this->drupalGet($edit['path[alias]']); - $this->assertText($node1->title, 'Changed alias works.'); - $this->assertResponse(200); - - // Make sure that previous alias no longer works. - $this->drupalGet($previous); - $this->assertNoText($node1->title, 'Previous alias no longer works.'); - $this->assertResponse(404); - - // Create second test node. - $node2 = $this->drupalCreateNode(); - - // Set alias to second test node. - // Leave $edit['path[alias]'] the same. - $this->drupalPost('node/' . $node2->nid . '/edit', $edit, t('Save')); - - // Confirm that the alias didn't make a duplicate. - $this->assertText(t('The alias is already in use.'), 'Attempt to moved alias was rejected.'); - - // Delete alias. - $this->drupalPost('node/' . $node1->nid . '/edit', array('path[alias]' => ''), t('Save')); - - // Confirm that the alias no longer works. - $this->drupalGet($edit['path[alias]']); - $this->assertNoText($node1->title, 'Alias was successfully deleted.'); - $this->assertResponse(404); - } - - /** - * Returns the path ID. - * - * @param $alias - * A string containing an aliased path. - * - * @return int - * Integer representing the path ID. - */ - function getPID($alias) { - return db_query("SELECT pid FROM {url_alias} WHERE alias = :alias", array(':alias' => $alias))->fetchField(); - } - - /** - * Tests that duplicate aliases fail validation. - */ - function testDuplicateNodeAlias() { - // Create one node with a random alias. - $node_one = $this->drupalCreateNode(); - $edit = array(); - $edit['path[alias]'] = $this->randomName(); - $this->drupalPost('node/' . $node_one->nid . '/edit', $edit, t('Save')); - - // Now create another node and try to set the same alias. - $node_two = $this->drupalCreateNode(); - $this->drupalPost('node/' . $node_two->nid . '/edit', $edit, t('Save')); - $this->assertText(t('The alias is already in use.')); - $this->assertFieldByXPath("//input[@name='path[alias]' and contains(@class, 'error')]", $edit['path[alias]'], 'Textfield exists and has the error class.'); - } -} - -/** - * Tests URL aliases for taxonomy terms. - */ -class PathTaxonomyTermTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Taxonomy term URL aliases', - 'description' => 'Tests URL aliases for taxonomy terms.', - 'group' => 'Path', - ); - } - - function setUp() { - parent::setUp('path', 'taxonomy'); - - // Create and login user. - $web_user = $this->drupalCreateUser(array('administer url aliases', 'administer taxonomy', 'access administration pages')); - $this->drupalLogin($web_user); - } - - /** - * Tests alias functionality through the admin interfaces. - */ - function testTermAlias() { - // Create a term in the default 'Tags' vocabulary with URL alias. - $vocabulary = taxonomy_vocabulary_load(1); - $description = $this->randomName();; - $edit = array(); - $edit['name'] = $this->randomName(); - $edit['description[value]'] = $description; - $edit['path[alias]'] = $this->randomName(); - $this->drupalPost('admin/structure/taxonomy/' . $vocabulary->machine_name . '/add', $edit, t('Save')); - - // Confirm that the alias works. - $this->drupalGet($edit['path[alias]']); - $this->assertText($description, 'Term can be accessed on URL alias.'); - - // Change the term's URL alias. - $tid = db_query("SELECT tid FROM {taxonomy_term_data} WHERE name = :name", array(':name' => $edit['name']))->fetchField(); - $edit2 = array(); - $edit2['path[alias]'] = $this->randomName(); - $this->drupalPost('taxonomy/term/' . $tid . '/edit', $edit2, t('Save')); - - // Confirm that the changed alias works. - $this->drupalGet($edit2['path[alias]']); - $this->assertText($description, 'Term can be accessed on changed URL alias.'); - - // Confirm that the old alias no longer works. - $this->drupalGet($edit['path[alias]']); - $this->assertNoText($description, 'Old URL alias has been removed after altering.'); - $this->assertResponse(404, 'Old URL alias returns 404.'); - - // Remove the term's URL alias. - $edit3 = array(); - $edit3['path[alias]'] = ''; - $this->drupalPost('taxonomy/term/' . $tid . '/edit', $edit3, t('Save')); - - // Confirm that the alias no longer works. - $this->drupalGet($edit2['path[alias]']); - $this->assertNoText($description, 'Old URL alias has been removed after altering.'); - $this->assertResponse(404, 'Old URL alias returns 404.'); - } -} - -/** - * Tests URL aliases for translated nodes. - */ -class PathLanguageTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Path aliases with translated nodes', - 'description' => 'Confirm that paths work with translated nodes', - 'group' => 'Path', - ); - } - - function setUp() { - parent::setUp('path', 'locale', 'translation'); - - // Create and login user. - $this->web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'translate content', 'access administration pages')); - $this->drupalLogin($this->web_user); - - // Enable French language. - $edit = array(); - $edit['langcode'] = 'fr'; - - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); - - // Enable URL language detection and selection. - $edit = array('language[enabled][locale-url]' => 1); - $this->drupalPost('admin/config/regional/language/configure', $edit, t('Save settings')); - } - - /** - * Test alias functionality through the admin interfaces. - */ - function testAliasTranslation() { - // Set 'page' content type to enable translation. - variable_set('language_content_type_page', 2); - - $english_node = $this->drupalCreateNode(array('type' => 'page')); - $english_alias = $this->randomName(); - - // Edit the node to set language and path. - $edit = array(); - $edit['language'] = 'en'; - $edit['path[alias]'] = $english_alias; - $this->drupalPost('node/' . $english_node->nid . '/edit', $edit, t('Save')); - - // Confirm that the alias works. - $this->drupalGet($english_alias); - $this->assertText($english_node->title, 'Alias works.'); - - // Translate the node into French. - $this->drupalGet('node/' . $english_node->nid . '/translate'); - $this->clickLink(t('add translation')); - $edit = array(); - $langcode = LANGUAGE_NONE; - $edit["title"] = $this->randomName(); - $edit["body[$langcode][0][value]"] = $this->randomName(); - $french_alias = $this->randomName(); - $edit['path[alias]'] = $french_alias; - $this->drupalPost(NULL, $edit, t('Save')); - - // Clear the path lookup cache. - drupal_lookup_path('wipe'); - - // Ensure the node was created. - $french_node = $this->drupalGetNodeByTitle($edit["title"]); - $this->assertTrue(($french_node), 'Node found in database.'); - - // Confirm that the alias works. - $this->drupalGet('fr/' . $edit['path[alias]']); - $this->assertText($french_node->title, 'Alias for French translation works.'); - - // Confirm that the alias is returned by url(). - drupal_static_reset('language_list'); - drupal_static_reset('locale_url_outbound_alter'); - $languages = language_list(); - $url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->language])); - $this->assertTrue(strpos($url, $edit['path[alias]']), 'URL contains the path alias.'); - - // Confirm that the alias works even when changing language negotiation - // options. Enable User language detection and selection over URL one. - $edit = array( - 'language[enabled][locale-user]' => 1, - 'language[weight][locale-user]' => -9, - 'language[enabled][locale-url]' => 1, - 'language[weight][locale-url]' => -8, - ); - $this->drupalPost('admin/config/regional/language/configure', $edit, t('Save settings')); - - // Change user language preference. - $edit = array('language' => 'fr'); - $this->drupalPost("user/{$this->web_user->uid}/edit", $edit, t('Save')); - - // Check that the English alias works. In this situation French is the - // current UI and content language, while URL language is English (since we - // do not have a path prefix we fall back to the site's default language). - // We need to ensure that the user language preference is not taken into - // account while determining the path alias language, because if this - // happens we have no way to check that the path alias is valid: there is no - // path alias for French matching the english alias. So drupal_lookup_path() - // needs to use the URL language to check whether the alias is valid. - $this->drupalGet($english_alias); - $this->assertText($english_node->title, 'Alias for English translation works.'); - - // Check that the French alias works. - $this->drupalGet("fr/$french_alias"); - $this->assertText($french_node->title, 'Alias for French translation works.'); - - // Disable URL language negotiation. - $edit = array('language[enabled][locale-url]' => FALSE); - $this->drupalPost('admin/config/regional/language/configure', $edit, t('Save settings')); - - // Check that the English alias still works. - $this->drupalGet($english_alias); - $this->assertText($english_node->title, 'Alias for English translation works.'); - - // Check that the French alias is not available. We check the unprefixed - // alias because we disabled URL language negotiation above. In this - // situation only aliases in the default language and language neutral ones - // should keep working. - $this->drupalGet($french_alias); - $this->assertResponse(404, 'Alias for French translation is unavailable when URL language negotiation is disabled.'); - - // drupal_lookup_path() has an internal static cache. Check to see that - // it has the appropriate contents at this point. - drupal_lookup_path('wipe'); - $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language); - $this->assertEqual($french_node_path, 'node/' . $french_node->nid, 'Normal path works.'); - // Second call should return the same path. - $french_node_path = drupal_lookup_path('source', $french_alias, $french_node->language); - $this->assertEqual($french_node_path, 'node/' . $french_node->nid, 'Normal path is the same.'); - - // Confirm that the alias works. - $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language); - $this->assertEqual($french_node_alias, $french_alias, 'Alias works.'); - // Second call should return the same alias. - $french_node_alias = drupal_lookup_path('alias', 'node/' . $french_node->nid, $french_node->language); - $this->assertEqual($french_node_alias, $french_alias, 'Alias is the same.'); - } -} - -/** - * Tests the user interface for creating path aliases, with languages. - */ -class PathLanguageUITestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Path aliases with languages', - 'description' => 'Confirm that the Path module user interface works with languages.', - 'group' => 'Path', - ); - } - - function setUp() { - parent::setUp('path', 'locale'); - - // Create and login user. - $web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'access administration pages')); - $this->drupalLogin($web_user); - - // Enable French language. - $edit = array(); - $edit['langcode'] = 'fr'; - - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); - - // Enable URL language detection and selection. - $edit = array('language[enabled][locale-url]' => 1); - $this->drupalPost('admin/config/regional/language/configure', $edit, t('Save settings')); - } - - /** - * Tests that a language-neutral URL alias works. - */ - function testLanguageNeutralURLs() { - $name = $this->randomName(8); - $edit = array(); - $edit['source'] = 'admin/config/search/path'; - $edit['alias'] = $name; - $this->drupalPost('admin/config/search/path/add', $edit, t('Save')); - - $this->drupalGet($name); - $this->assertText(t('Filter aliases'), 'Language-neutral URL alias works'); - } - - /** - * Tests that a default language URL alias works. - */ - function testDefaultLanguageURLs() { - $name = $this->randomName(8); - $edit = array(); - $edit['source'] = 'admin/config/search/path'; - $edit['alias'] = $name; - $edit['language'] = 'en'; - $this->drupalPost('admin/config/search/path/add', $edit, t('Save')); - - $this->drupalGet($name); - $this->assertText(t('Filter aliases'), 'English URL alias works'); - } - - /** - * Tests that a non-default language URL alias works. - */ - function testNonDefaultURLs() { - $name = $this->randomName(8); - $edit = array(); - $edit['source'] = 'admin/config/search/path'; - $edit['alias'] = $name; - $edit['language'] = 'fr'; - $this->drupalPost('admin/config/search/path/add', $edit, t('Save')); - - $this->drupalGet('fr/' . $name); - $this->assertText(t('Filter aliases'), 'Foreign URL alias works'); - } - -} - -/** - * Tests that paths are not prefixed on a monolingual site. - */ -class PathMonolingualTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Paths on non-English monolingual sites', - 'description' => 'Confirm that paths are not changed on monolingual non-English sites', - 'group' => 'Path', - ); - } - - function setUp() { - global $language; - parent::setUp('path', 'locale', 'translation'); - - // Create and login user. - $web_user = $this->drupalCreateUser(array('administer languages', 'access administration pages')); - $this->drupalLogin($web_user); - - // Enable French language. - $edit = array(); - $edit['langcode'] = 'fr'; - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); - - // Make French the default language. - $edit = array('site_default' => 'fr'); - $this->drupalPost('admin/config/regional/language', $edit, t('Save configuration')); - - // Disable English. - $edit = array('enabled[en]' => FALSE); - $this->drupalPost('admin/config/regional/language', $edit, t('Save configuration')); - - // Verify that French is the only language. - $this->assertFalse(drupal_multilingual(), 'Site is mono-lingual'); - $this->assertEqual(language_default('language'), 'fr', 'French is the default language'); - - // Set language detection to URL. - $edit = array('language[enabled][locale-url]' => TRUE); - $this->drupalPost('admin/config/regional/language/configure', $edit, t('Save settings')); - - // Force languages to be initialized. - drupal_language_initialize(); - } - - /** - * Verifies that links do not have language prefixes in them. - */ - function testPageLinks() { - // Navigate to 'admin/config' path. - $this->drupalGet('admin/config'); - - // Verify that links in this page do not have a 'fr/' prefix. - $this->assertNoLinkByHref('/fr/', 'Links do not contain language prefix'); - - // Verify that links in this page can be followed and work. - $this->clickLink(t('Languages')); - $this->assertResponse(200, 'Clicked link results in a valid page'); - $this->assertText(t('Add language'), 'Page contains the add language text'); - } -} diff --git a/modules/php/php.info b/modules/php/php.info deleted file mode 100644 index cf86362..0000000 --- a/modules/php/php.info +++ /dev/null @@ -1,6 +0,0 @@ -name = PHP filter -description = Allows embedded PHP code/snippets to be evaluated. -package = Core -version = VERSION -core = 7.x -files[] = php.test diff --git a/modules/php/php.install b/modules/php/php.install deleted file mode 100644 index 12944dd..0000000 --- a/modules/php/php.install +++ /dev/null @@ -1,45 +0,0 @@ - 'PHP code'))->fetchField(); - // Add a PHP code text format, if it does not exist. Do this only for the - // first install (or if the format has been manually deleted) as there is no - // reliable method to identify the format in an uninstall hook or in - // subsequent clean installs. - if (!$format_exists) { - $php_format = array( - 'format' => 'php_code', - 'name' => 'PHP code', - // 'Plain text' format is installed with a weight of 10 by default. Use a - // higher weight here to ensure that this format will not be the default - // format for anyone. - 'weight' => 11, - 'filters' => array( - // Enable the PHP evaluator filter. - 'php_code' => array( - 'weight' => 0, - 'status' => 1, - ), - ), - ); - $php_format = (object) $php_format; - filter_format_save($php_format); - - drupal_set_message(t('A PHP code text format has been created.', array('@php-code' => url('admin/config/content/formats/' . $php_format->format)))); - } -} - -/** - * Implements hook_disable(). - */ -function php_disable() { - drupal_set_message(t('The PHP module has been disabled. Any existing content that was using the PHP filter will now be visible in plain text. This might pose a security risk by exposing sensitive information, if any, used in the PHP code.')); -} diff --git a/modules/php/php.test b/modules/php/php.test deleted file mode 100644 index 3b11b48..0000000 --- a/modules/php/php.test +++ /dev/null @@ -1,120 +0,0 @@ -drupalCreateUser(array('administer filters')); - $this->drupalLogin($admin_user); - - // Verify that the PHP code text format was inserted. - $php_format_id = 'php_code'; - $this->php_code_format = filter_format_load($php_format_id); - $this->assertEqual($this->php_code_format->name, 'PHP code', 'PHP code text format was created.'); - - // Verify that the format has the PHP code filter enabled. - $filters = filter_list_format($php_format_id); - $this->assertTrue($filters['php_code']->status, 'PHP code filter is enabled.'); - - // Verify that the format exists on the administration page. - $this->drupalGet('admin/config/content/formats'); - $this->assertText('PHP code', 'PHP code text format was created.'); - - // Verify that anonymous and authenticated user roles do not have access. - $this->drupalGet('admin/config/content/formats/' . $php_format_id); - $this->assertFieldByName('roles[' . DRUPAL_ANONYMOUS_RID . ']', FALSE, 'Anonymous users do not have access to PHP code format.'); - $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', FALSE, 'Authenticated users do not have access to PHP code format.'); - } - - /** - * Creates a test node with PHP code in the body. - * - * @return stdObject Node object. - */ - function createNodeWithCode() { - return $this->drupalCreateNode(array('body' => array(LANGUAGE_NONE => array(array('value' => ''))))); - } -} - -/** - * Tests to make sure the PHP filter actually evaluates PHP code when used. - */ -class PHPFilterTestCase extends PHPTestCase { - public static function getInfo() { - return array( - 'name' => 'PHP filter functionality', - 'description' => 'Make sure that PHP filter properly evaluates PHP code when enabled.', - 'group' => 'PHP', - ); - } - - /** - * Makes sure that the PHP filter evaluates PHP code when used. - */ - function testPHPFilter() { - // Log in as a user with permission to use the PHP code text format. - $php_code_permission = filter_permission_name(filter_format_load('php_code')); - $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content', $php_code_permission)); - $this->drupalLogin($web_user); - - // Create a node with PHP code in it. - $node = $this->createNodeWithCode(); - - // Make sure that the PHP code shows up as text. - $this->drupalGet('node/' . $node->nid); - $this->assertText('print "SimpleTest PHP was executed!"', 'PHP code is displayed.'); - - // Change filter to PHP filter and see that PHP code is evaluated. - $edit = array(); - $langcode = LANGUAGE_NONE; - $edit["body[$langcode][0][format]"] = $this->php_code_format->format; - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node->title)), 'PHP code filter turned on.'); - - // Make sure that the PHP code shows up as text. - $this->assertNoText('print "SimpleTest PHP was executed!"', "PHP code isn't displayed."); - $this->assertText('SimpleTest PHP was executed!', 'PHP code has been evaluated.'); - } -} - -/** - * Tests to make sure access to the PHP filter is properly restricted. - */ -class PHPAccessTestCase extends PHPTestCase { - public static function getInfo() { - return array( - 'name' => 'PHP filter access check', - 'description' => 'Make sure that users who don\'t have access to the PHP filter can\'t see it.', - 'group' => 'PHP', - ); - } - - /** - * Makes sure that the user can't use the PHP filter when not given access. - */ - function testNoPrivileges() { - // Create node with PHP filter enabled. - $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content')); - $this->drupalLogin($web_user); - $node = $this->createNodeWithCode(); - - // Make sure that the PHP code shows up as text. - $this->drupalGet('node/' . $node->nid); - $this->assertText('print', 'PHP code was not evaluated.'); - - // Make sure that user doesn't have access to filter. - $this->drupalGet('node/' . $node->nid . '/edit'); - $this->assertNoRaw('
- ', array('li')); - $this->assertNoNormalized($f, 'style', 'HTML filter attributes removal -- style, no evasion.'); - - $f = filter_xss('
-
-
- '), -1, PREG_SPLIT_NO_EMPTY));
-}
-
-/**
- * Checks and sanitizes the aggregator configuration.
- *
- * Goes through all fetchers, parsers and processors and checks whether they
- * are available. If one is missing, resets to standard configuration.
- *
- * @return
- * TRUE if this function resets the configuration; FALSE if not.
- */
-function aggregator_sanitize_configuration() {
- $reset = FALSE;
- list($fetcher, $parser, $processors) = _aggregator_get_variables();
- if (!module_exists($fetcher)) {
- $reset = TRUE;
- }
- if (!module_exists($parser)) {
- $reset = TRUE;
- }
- foreach ($processors as $processor) {
- if (!module_exists($processor)) {
- $reset = TRUE;
- break;
- }
- }
- if ($reset) {
- variable_del('aggregator_fetcher');
- variable_del('aggregator_parser');
- variable_del('aggregator_processors');
- return TRUE;
- }
- return FALSE;
-}
-
-/**
- * Helper function for drupal_map_assoc.
- *
- * @param $count
- * Items count.
- *
- * @return
- * A string that is plural-formatted as "@count items".
- */
-function _aggregator_items($count) {
- return format_plural($count, '1 item', '@count items');
-}
diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc
deleted file mode 100644
index bfba3ff..0000000
--- a/modules/aggregator/aggregator.pages.inc
+++ /dev/null
@@ -1,582 +0,0 @@
-title);
- $feed_source = theme('aggregator_feed_source', array('feed' => $feed));
-
- // It is safe to include the fid in the query because it's loaded from the
- // database by aggregator_feed_load.
- $items = aggregator_feed_items_load('source', $feed);
-
- return _aggregator_page_list($items, arg(3), $feed_source);
-}
-
-/**
- * Page callback: Displays a form with all items captured from a feed.
- *
- * @param $feed
- * The feed for which to list all of the aggregated items.
- *
- * @return
- * The rendered list of items for the feed.
- *
- * @see aggregator_page_source()
- */
-function aggregator_page_source_form($form, $form_state, $feed) {
- return aggregator_page_source($feed);
-}
-
-/**
- * Page callback: Displays all the items aggregated in a particular category.
- *
- * @param $category
- * The category for which to list all of the aggregated items.
- *
- * @return
- * The rendered list of items for the feed.
- */
-function aggregator_page_category($category) {
- drupal_add_feed('aggregator/rss/' . $category['cid'], variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category['title'])));
-
- // It is safe to include the cid in the query because it's loaded from the
- // database by aggregator_category_load.
- $items = aggregator_feed_items_load('category', $category);
-
- return _aggregator_page_list($items, arg(3));
-}
-
-/**
- * Page callback: Displays a form containing items aggregated in a category.
- *
- * @param $category
- * The category for which to list all of the aggregated items.
- *
- * @return
- * The rendered list of items for the feed.
- *
- * @see aggregator_page_category()
- */
-function aggregator_page_category_form($form, $form_state, $category) {
- return aggregator_page_category($category);
-}
-
-/**
- * Loads and optionally filters feed items.
- *
- * @param $type
- * The type of filter for the items. Possible values are:
- * - sum: No filtering.
- * - source: Filter the feed items, limiting the result to items from a
- * single source.
- * - category: Filter the feed items by category.
- * @param $data
- * Feed or category data used for filtering. The type and value of $data
- * depends on $type:
- * - source: $data is an object with $data->fid identifying the feed used to
- * as filter.
- * - category: $data is an array with $data['cid'] being the category id to
- * filter on.
- * The $data parameter is not used when $type is 'sum'.
- *
- * @return
- * An array of the feed items.
- */
-function aggregator_feed_items_load($type, $data = NULL) {
- $items = array();
- switch ($type) {
- case 'sum':
- $query = db_select('aggregator_item', 'i');
- $query->join('aggregator_feed', 'f', 'i.fid = f.fid');
- $query->fields('i');
- $query->addField('f', 'title', 'ftitle');
- $query->addField('f', 'link', 'flink');
- break;
- case 'source':
- $query = db_select('aggregator_item', 'i');
- $query
- ->fields('i')
- ->condition('i.fid', $data->fid);
- break;
- case 'category':
- $query = db_select('aggregator_category_item', 'c');
- $query->leftJoin('aggregator_item', 'i', 'c.iid = i.iid');
- $query->leftJoin('aggregator_feed', 'f', 'i.fid = f.fid');
- $query
- ->fields('i')
- ->condition('cid', $data['cid']);
- $query->addField('f', 'title', 'ftitle');
- $query->addField('f', 'link', 'flink');
- break;
- }
-
- $result = $query
- ->extend('PagerDefault')
- ->limit(20)
- ->orderBy('i.timestamp', 'DESC')
- ->orderBy('i.iid', 'DESC')
- ->execute();
-
- foreach ($result as $item) {
- $item->categories = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = :iid ORDER BY c.title', array(':iid' => $item->iid))->fetchAll();
- $items[] = $item;
- }
-
- return $items;
-}
-
-/**
- * Prints an aggregator page listing a number of feed items.
- *
- * Various menu callbacks use this function to print their feeds.
- *
- * @param $items
- * The items to be listed.
- * @param $op
- * Which form should be added to the items. Only 'categorize' is now
- * recognized.
- * @param $feed_source
- * The feed source URL.
- *
- * @return
- * The rendered list of items for the feed.
- */
-function _aggregator_page_list($items, $op, $feed_source = '') {
- if (user_access('administer news feeds') && ($op == 'categorize')) {
- // Get form data.
- $output = aggregator_categorize_items($items, $feed_source);
- }
- else {
- // Assemble themed output.
- $output = $feed_source;
- foreach ($items as $item) {
- $output .= theme('aggregator_item', array('item' => $item));
- }
- $output = theme('aggregator_wrapper', array('content' => $output));
- }
-
- return $output;
-}
-
-/**
- * Form constructor to build the page list form.
- *
- * @param $items
- * An array of the feed items.
- * @param $feed_source
- * (optional) The feed source URL. Defaults to an empty string.
- *
- * @return array
- * An array of FAPI elements.
- *
- * @see aggregator_categorize_items_submit()
- * @see theme_aggregator_categorize_items()
- * @ingroup forms
- */
-function aggregator_categorize_items($items, $feed_source = '') {
- $form['#submit'][] = 'aggregator_categorize_items_submit';
- $form['#theme'] = 'aggregator_categorize_items';
- $form['feed_source'] = array(
- '#value' => $feed_source,
- );
- $categories = array();
- $done = FALSE;
- $form['items'] = array();
- $form['categories'] = array(
- '#tree' => TRUE,
- );
- foreach ($items as $item) {
- $form['items'][$item->iid] = array('#markup' => theme('aggregator_item', array('item' => $item)));
- $form['categories'][$item->iid] = array();
- $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = :iid', array(':iid' => $item->iid));
- $selected = array();
- foreach ($categories_result as $category) {
- if (!$done) {
- $categories[$category->cid] = check_plain($category->title);
- }
- if ($category->iid) {
- $selected[] = $category->cid;
- }
- }
- $done = TRUE;
- $form['categories'][$item->iid] = array(
- '#type' => variable_get('aggregator_category_selector', 'checkboxes'),
- '#default_value' => $selected,
- '#options' => $categories,
- '#size' => 10,
- '#multiple' => TRUE
- );
- }
- $form['actions'] = array('#type' => 'actions');
- $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save categories'));
-
- return $form;
-}
-
-/**
- * Form submission handler for aggregator_categorize_items().
- */
-function aggregator_categorize_items_submit($form, &$form_state) {
- if (!empty($form_state['values']['categories'])) {
- foreach ($form_state['values']['categories'] as $iid => $selection) {
- db_delete('aggregator_category_item')
- ->condition('iid', $iid)
- ->execute();
- $insert = db_insert('aggregator_category_item')->fields(array('iid', 'cid'));
- $has_values = FALSE;
- foreach ($selection as $cid) {
- if ($cid && $iid) {
- $has_values = TRUE;
- $insert->values(array(
- 'iid' => $iid,
- 'cid' => $cid,
- ));
- }
- }
- if ($has_values) {
- $insert->execute();
- }
- }
- }
- drupal_set_message(t('The categories have been saved.'));
-}
-
-/**
- * Returns HTML for the aggregator page list form for assigning categories.
- *
- * @param $variables
- * An associative array containing:
- * - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_aggregator_categorize_items($variables) {
- $form = $variables['form'];
-
- $output = drupal_render($form['feed_source']);
- $rows = array();
- if (!empty($form['items'])) {
- foreach (element_children($form['items']) as $key) {
- $rows[] = array(
- drupal_render($form['items'][$key]),
- array('data' => drupal_render($form['categories'][$key]), 'class' => array('categorize-item')),
- );
- }
- }
- $output .= theme('table', array('header' => array('', t('Categorize')), 'rows' => $rows));
- $output .= drupal_render($form['submit']);
- $output .= drupal_render_children($form);
-
- return theme('aggregator_wrapper', array('content' => $output));
-}
-
-/**
- * Processes variables for aggregator-wrapper.tpl.php.
- *
- * @see aggregator-wrapper.tpl.php
- */
-function template_preprocess_aggregator_wrapper(&$variables) {
- $variables['pager'] = theme('pager');
-}
-
-/**
- * Processes variables for aggregator-item.tpl.php.
- *
- * @see aggregator-item.tpl.php
- */
-function template_preprocess_aggregator_item(&$variables) {
- $item = $variables['item'];
-
- $variables['feed_url'] = check_url($item->link);
- $variables['feed_title'] = check_plain($item->title);
- $variables['content'] = aggregator_filter_xss($item->description);
-
- $variables['source_url'] = '';
- $variables['source_title'] = '';
- if (isset($item->ftitle) && isset($item->fid)) {
- $variables['source_url'] = url("aggregator/sources/$item->fid");
- $variables['source_title'] = check_plain($item->ftitle);
- }
- if (date('Ymd', $item->timestamp) == date('Ymd')) {
- $variables['source_date'] = t('%ago ago', array('%ago' => format_interval(REQUEST_TIME - $item->timestamp)));
- }
- else {
- $variables['source_date'] = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, m/d/Y - H:i'));
- }
-
- $variables['categories'] = array();
- foreach ($item->categories as $category) {
- $variables['categories'][$category->cid] = l($category->title, 'aggregator/categories/' . $category->cid);
- }
-}
-
-/**
- * Page callback: Displays all the feeds used by the aggregator.
- *
- * @return
- * An HTML-formatted string.
- *
- * @see aggregator_menu()
- */
-function aggregator_page_sources() {
- $result = db_query('SELECT f.fid, f.title, f.description, f.image, MAX(i.timestamp) AS last FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.description, f.image ORDER BY last DESC, f.title');
-
- $output = '';
- foreach ($result as $feed) {
- // Most recent items:
- $summary_items = array();
- if (variable_get('aggregator_summary_items', 3)) {
- $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = :fid ORDER BY i.timestamp DESC', 0, variable_get('aggregator_summary_items', 3), array(':fid' => $feed->fid));
- foreach ($items as $item) {
- $summary_items[] = theme('aggregator_summary_item', array('item' => $item));
- }
- }
- $feed->url = url('aggregator/sources/' . $feed->fid);
- $output .= theme('aggregator_summary_items', array('summary_items' => $summary_items, 'source' => $feed));
- }
- $output .= theme('feed_icon', array('url' => 'aggregator/opml', 'title' => t('OPML feed')));
-
- return theme('aggregator_wrapper', array('content' => $output));
-}
-
-/**
- * Page callback: Displays all the categories used by the Aggregator module.
- *
- * @return string
- * An HTML formatted string.
- *
- * @see aggregator_menu()
- */
-function aggregator_page_categories() {
- $result = db_query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');
-
- $output = '';
- foreach ($result as $category) {
- if (variable_get('aggregator_summary_items', 3)) {
- $summary_items = array();
- $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = :cid ORDER BY i.timestamp DESC', 0, variable_get('aggregator_summary_items', 3), array(':cid' => $category->cid));
- foreach ($items as $item) {
- $summary_items[] = theme('aggregator_summary_item', array('item' => $item));
- }
- }
- $category->url = url('aggregator/categories/' . $category->cid);
- $output .= theme('aggregator_summary_items', array('summary_items' => $summary_items, 'source' => $category));
- }
-
- return theme('aggregator_wrapper', array('content' => $output));
-}
-
-/**
- * Page callback: Generates an RSS 0.92 feed of aggregator items or categories.
- *
- * @return string
- * An HTML formatted string.
- */
-function aggregator_page_rss() {
- $result = NULL;
- // arg(2) is the passed cid, only select for that category.
- if (arg(2)) {
- $category = db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = :cid', array(':cid' => arg(2)))->fetchObject();
- $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = :cid ORDER BY timestamp DESC, i.iid DESC', 0, variable_get('feed_default_items', 10), array(':cid' => $category->cid));
- }
- // Or, get the default aggregator items.
- else {
- $category = NULL;
- $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', 0, variable_get('feed_default_items', 10));
- }
-
- $feeds = $result->fetchAll();
- return theme('aggregator_page_rss', array('feeds' => $feeds, 'category' => $category));
-}
-
-/**
- * Prints the RSS page for a feed.
- *
- * @param $variables
- * An associative array containing:
- * - feeds: An array of the feeds to theme.
- * - category: A common category, if any, for all the feeds.
- *
- * @return void
- *
- * @ingroup themeable
- */
-function theme_aggregator_page_rss($variables) {
- $feeds = $variables['feeds'];
- $category = $variables['category'];
-
- drupal_add_http_header('Content-Type', 'application/rss+xml; charset=utf-8');
-
- $items = '';
- $feed_length = variable_get('feed_item_length', 'fulltext');
- foreach ($feeds as $feed) {
- switch ($feed_length) {
- case 'teaser':
- $summary = text_summary($feed->description, NULL, variable_get('aggregator_teaser_length', 600));
- if ($summary != $feed->description) {
- $summary .= '\n";
- }
- $feed->description = $summary;
- break;
- case 'title':
- $feed->description = '';
- break;
- }
- $items .= format_rss_item($feed->ftitle . ': ' . $feed->title, $feed->link, $feed->description, array('pubDate' => date('r', $feed->timestamp)));
- }
-
- $site_name = variable_get('site_name', 'Drupal');
- $url = url((isset($category) ? 'aggregator/categories/' . $category->cid : 'aggregator'), array('absolute' => TRUE));
- $description = isset($category) ? t('@site_name - aggregated feeds in category @title', array('@site_name' => $site_name, '@title' => $category->title)) : t('@site_name - aggregated feeds', array('@site_name' => $site_name));
-
- $output = "\n";
- $output .= "
\n"; - $output .= format_rss_channel(t('@site_name aggregator', array('@site_name' => $site_name)), $url, $description, $items); - $output .= " \n"; - - print $output; -} - -/** - * Page callback: Generates an OPML representation of all feeds. - * - * @param $cid - * (optional) If set, feeds are exported only from a category with this ID. - * Otherwise, all feeds are exported. Defaults to NULL. - * - * @return - * An OPML formatted string. - */ -function aggregator_page_opml($cid = NULL) { - if ($cid) { - $result = db_query('SELECT f.title, f.url FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} c on f.fid = c.fid WHERE c.cid = :cid ORDER BY title', array(':cid' => $cid)); - } - else { - $result = db_query('SELECT * FROM {aggregator_feed} ORDER BY title'); - } - - $feeds = $result->fetchAll(); - return theme('aggregator_page_opml', array('feeds' => $feeds)); -} - -/** - * Prints the OPML page for the feed. - * - * @param $variables - * An associative array containing: - * - feeds: An array of the feeds to theme. - * - * @ingroup themeable - */ -function theme_aggregator_page_opml($variables) { - $feeds = $variables['feeds']; - - drupal_add_http_header('Content-Type', 'text/xml; charset=utf-8'); - - $output = "\n"; - $output .= "\n"; - $output .= "\n"; - $output .= ' \n"; - - print $output; -} - -/** - * Processes variables for aggregator-summary-items.tpl.php. - * - * @see aggregator-summary-items.tpl.php - */ -function template_preprocess_aggregator_summary_items(&$variables) { - $variables['title'] = check_plain($variables['source']->title); - $variables['summary_list'] = theme('item_list', array('items' => $variables['summary_items'])); - $variables['source_url'] = $variables['source']->url; -} - -/** - * Processes variables for aggregator-summary-item.tpl.php. - * - * @see aggregator-summary-item.tpl.php - */ -function template_preprocess_aggregator_summary_item(&$variables) { - $item = $variables['item']; - - $variables['feed_url'] = check_url($item->link); - $variables['feed_title'] = check_plain($item->title); - $variables['feed_age'] = t('%age old', array('%age' => format_interval(REQUEST_TIME - $item->timestamp))); - - $variables['source_url'] = ''; - $variables['source_title'] = ''; - if (!empty($item->feed_link)) { - $variables['source_url'] = check_url($item->feed_link); - $variables['source_title'] = check_plain($item->feed_title); - } -} - -/** - * Processes variables for aggregator-feed-source.tpl.php. - * - * @see aggregator-feed-source.tpl.php - */ -function template_preprocess_aggregator_feed_source(&$variables) { - $feed = $variables['feed']; - - $variables['source_icon'] = theme('feed_icon', array('url' => $feed->url, 'title' => t('!title feed', array('!title' => $feed->title)))); - - if (!empty($feed->image) && !empty($feed->title) && !empty($feed->link)) { - $variables['source_image'] = l(theme('image', array('path' => $feed->image, 'alt' => $feed->title)), $feed->link, array('html' => TRUE, 'attributes' => array('class' => 'feed-image'))); - } - else { - $variables['source_image'] = ''; - } - - $variables['source_description'] = aggregator_filter_xss($feed->description); - $variables['source_url'] = check_url(url($feed->link, array('absolute' => TRUE))); - - if ($feed->checked) { - $variables['last_checked'] = t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))); - } - else { - $variables['last_checked'] = t('never'); - } - - if (user_access('administer news feeds')) { - $variables['last_checked'] = l($variables['last_checked'], 'admin/config/services/aggregator'); - } -} diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc deleted file mode 100644 index 91fbe3a..0000000 --- a/modules/aggregator/aggregator.parser.inc +++ /dev/null @@ -1,329 +0,0 @@ - t('Default parser'), - 'description' => t('Parses RSS, Atom and RDF feeds.'), - ); -} - -/** - * Implements hook_aggregator_parse(). - */ -function aggregator_aggregator_parse($feed) { - global $channel, $image; - - // Filter the input data. - if (aggregator_parse_feed($feed->source_string, $feed)) { - $modified = empty($feed->http_headers['last-modified']) ? 0 : strtotime($feed->http_headers['last-modified']); - - // Prepare the channel data. - foreach ($channel as $key => $value) { - $channel[$key] = trim($value); - } - - // Prepare the image data (if any). - foreach ($image as $key => $value) { - $image[$key] = trim($value); - } - - $etag = empty($feed->http_headers['etag']) ? '' : $feed->http_headers['etag']; - - // Add parsed data to the feed object. - $feed->link = !empty($channel['link']) ? $channel['link'] : ''; - $feed->description = !empty($channel['description']) ? $channel['description'] : ''; - $feed->image = !empty($image['url']) ? $image['url'] : ''; - $feed->etag = $etag; - $feed->modified = $modified; - - // Clear the cache. - cache_clear_all(); - - return TRUE; - } - - return FALSE; -} - -/** - * Parses a feed and stores its items. - * - * @param $data - * The feed data. - * @param $feed - * An object describing the feed to be parsed. - * - * @return - * FALSE on error, TRUE otherwise. - */ -function aggregator_parse_feed(&$data, $feed) { - global $items, $image, $channel; - - // Unset the global variables before we use them. - unset($GLOBALS['element'], $GLOBALS['item'], $GLOBALS['tag']); - $items = array(); - $image = array(); - $channel = array(); - - // Parse the data. - $xml_parser = drupal_xml_parser_create($data); - xml_set_element_handler($xml_parser, 'aggregator_element_start', 'aggregator_element_end'); - xml_set_character_data_handler($xml_parser, 'aggregator_element_data'); - - if (!xml_parse($xml_parser, $data, 1)) { - watchdog('aggregator', 'The feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => $feed->title, '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser)), WATCHDOG_WARNING); - drupal_set_message(t('The feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => $feed->title, '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error'); - return FALSE; - } - xml_parser_free($xml_parser); - - // We reverse the array such that we store the first item last, and the last - // item first. In the database, the newest item should be at the top. - $items = array_reverse($items); - - // Initialize items array. - $feed->items = array(); - foreach ($items as $item) { - - // Prepare the item: - foreach ($item as $key => $value) { - $item[$key] = trim($value); - } - - // Resolve the item's title. If no title is found, we use up to 40 - // characters of the description ending at a word boundary, but not - // splitting potential entities. - if (!empty($item['title'])) { - $item['title'] = $item['title']; - } - elseif (!empty($item['description'])) { - $item['title'] = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", truncate_utf8($item['description'], 40)); - } - else { - $item['title'] = ''; - } - - // Resolve the items link. - if (!empty($item['link'])) { - $item['link'] = $item['link']; - } - else { - $item['link'] = $feed->link; - } - - // Atom feeds have an ID tag instead of a GUID tag. - if (!isset($item['guid'])) { - $item['guid'] = isset($item['id']) ? $item['id'] : ''; - } - - // Atom feeds have a content and/or summary tag instead of a description tag. - if (!empty($item['content:encoded'])) { - $item['description'] = $item['content:encoded']; - } - elseif (!empty($item['summary'])) { - $item['description'] = $item['summary']; - } - elseif (!empty($item['content'])) { - $item['description'] = $item['content']; - } - - // Try to resolve and parse the item's publication date. - $date = ''; - foreach (array('pubdate', 'dc:date', 'dcterms:issued', 'dcterms:created', 'dcterms:modified', 'issued', 'created', 'modified', 'published', 'updated') as $key) { - if (!empty($item[$key])) { - $date = $item[$key]; - break; - } - } - - $item['timestamp'] = strtotime($date); - - if ($item['timestamp'] === FALSE) { - $item['timestamp'] = aggregator_parse_w3cdtf($date); // Aggregator_parse_w3cdtf() returns FALSE on failure. - } - - // Resolve dc:creator tag as the item author if author tag is not set. - if (empty($item['author']) && !empty($item['dc:creator'])) { - $item['author'] = $item['dc:creator']; - } - - $item += array('author' => '', 'description' => ''); - - // Store on $feed object. This is where processors will look for parsed items. - $feed->items[] = $item; - } - - return TRUE; -} - -/** - * Performs an action when an opening tag is encountered. - * - * Callback function used by xml_parse() within aggregator_parse_feed(). - */ -function aggregator_element_start($parser, $name, $attributes) { - global $item, $element, $tag, $items, $channel; - - $name = strtolower($name); - switch ($name) { - case 'image': - case 'textinput': - case 'summary': - case 'tagline': - case 'subtitle': - case 'logo': - case 'info': - $element = $name; - break; - case 'id': - case 'content': - if ($element != 'item') { - $element = $name; - } - case 'link': - // According to RFC 4287, link elements in Atom feeds without a 'rel' - // attribute should be interpreted as though the relation type is - // "alternate". - if (!empty($attributes['HREF']) && (empty($attributes['REL']) || $attributes['REL'] == 'alternate')) { - if ($element == 'item') { - $items[$item]['link'] = $attributes['HREF']; - } - else { - $channel['link'] = $attributes['HREF']; - } - } - break; - case 'item': - $element = $name; - $item += 1; - break; - case 'entry': - $element = 'item'; - $item += 1; - break; - } - - $tag = $name; -} - -/** - * Performs an action when a closing tag is encountered. - * - * Callback function used by xml_parse() within aggregator_parse_feed(). - */ -function aggregator_element_end($parser, $name) { - global $element; - - switch ($name) { - case 'image': - case 'textinput': - case 'item': - case 'entry': - case 'info': - $element = ''; - break; - case 'id': - case 'content': - if ($element == $name) { - $element = ''; - } - } -} - -/** - * Performs an action when data is encountered. - * - * Callback function used by xml_parse() within aggregator_parse_feed(). - */ -function aggregator_element_data($parser, $data) { - global $channel, $element, $items, $item, $image, $tag; - $items += array($item => array()); - switch ($element) { - case 'item': - $items[$item] += array($tag => ''); - $items[$item][$tag] .= $data; - break; - case 'image': - case 'logo': - $image += array($tag => ''); - $image[$tag] .= $data; - break; - case 'link': - if ($data) { - $items[$item] += array($tag => ''); - $items[$item][$tag] .= $data; - } - break; - case 'content': - $items[$item] += array('content' => ''); - $items[$item]['content'] .= $data; - break; - case 'summary': - $items[$item] += array('summary' => ''); - $items[$item]['summary'] .= $data; - break; - case 'tagline': - case 'subtitle': - $channel += array('description' => ''); - $channel['description'] .= $data; - break; - case 'info': - case 'id': - case 'textinput': - // The sub-element is not supported. However, we must recognize - // it or its contents will end up in the item array. - break; - default: - $channel += array($tag => ''); - $channel[$tag] .= $data; - } -} - -/** - * Parses the W3C date/time format, a subset of ISO 8601. - * - * PHP date parsing functions do not handle this format. See - * http://www.w3.org/TR/NOTE-datetime for more information. Originally from - * MagpieRSS (http://magpierss.sourceforge.net/). - * - * @param $date_str - * A string with a potentially W3C DTF date. - * - * @return - * A timestamp if parsed successfully or FALSE if not. - */ -function aggregator_parse_w3cdtf($date_str) { - if (preg_match('/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/', $date_str, $match)) { - list($year, $month, $day, $hours, $minutes, $seconds) = array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]); - // Calculate the epoch for current date assuming GMT. - $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year); - if ($match[10] != 'Z') { // Z is zulu time, aka GMT - list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]); - // Zero out the variables. - if (!$tz_hour) { - $tz_hour = 0; - } - if (!$tz_min) { - $tz_min = 0; - } - $offset_secs = (($tz_hour * 60) + $tz_min) * 60; - // Is timezone ahead of GMT? If yes, subtract offset. - if ($tz_mod == '+') { - $offset_secs *= -1; - } - $epoch += $offset_secs; - } - return $epoch; - } - else { - return FALSE; - } -} diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc deleted file mode 100644 index 44ed549..0000000 --- a/modules/aggregator/aggregator.processor.inc +++ /dev/null @@ -1,213 +0,0 @@ - t('Default processor'), - 'description' => t('Creates lightweight records from feed items.'), - ); -} - -/** - * Implements hook_aggregator_process(). - */ -function aggregator_aggregator_process($feed) { - if (is_object($feed)) { - if (is_array($feed->items)) { - foreach ($feed->items as $item) { - // Save this item. Try to avoid duplicate entries as much as possible. If - // we find a duplicate entry, we resolve it and pass along its ID is such - // that we can update it if needed. - if (!empty($item['guid'])) { - $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND guid = :guid", array(':fid' => $feed->fid, ':guid' => $item['guid']))->fetchObject(); - } - elseif ($item['link'] && $item['link'] != $feed->link && $item['link'] != $feed->url) { - $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND link = :link", array(':fid' => $feed->fid, ':link' => $item['link']))->fetchObject(); - } - else { - $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND title = :title", array(':fid' => $feed->fid, ':title' => $item['title']))->fetchObject(); - } - if (!$item['timestamp']) { - $item['timestamp'] = isset($entry->timestamp) ? $entry->timestamp : REQUEST_TIME; - } - - // Make sure the item title and author fit in the 255 varchar column. - $item['title'] = truncate_utf8($item['title'], 255, TRUE, TRUE); - $item['author'] = truncate_utf8($item['author'], 255, TRUE, TRUE); - aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid : ''), 'fid' => $feed->fid, 'timestamp' => $item['timestamp'], 'title' => $item['title'], 'link' => $item['link'], 'author' => $item['author'], 'description' => $item['description'], 'guid' => $item['guid'])); - } - } - } -} - -/** - * Implements hook_aggregator_remove(). - */ -function aggregator_aggregator_remove($feed) { - $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchCol(); - if ($iids) { - db_delete('aggregator_category_item') - ->condition('iid', $iids, 'IN') - ->execute(); - } - db_delete('aggregator_item') - ->condition('fid', $feed->fid) - ->execute(); - - drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed->title))); -} - -/** - * Implements hook_form_aggregator_admin_form_alter(). - * - * Form alter aggregator module's own form to keep processor functionality - * separate from aggregator API functionality. - */ -function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) { - if (in_array('aggregator', variable_get('aggregator_processors', array('aggregator')))) { - $info = module_invoke('aggregator', 'aggregator_process', 'info'); - $items = drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items'); - $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); - $period[AGGREGATOR_CLEAR_NEVER] = t('Never'); - - // Only wrap into a collapsible fieldset if there is a basic configuration. - if (isset($form['basic_conf'])) { - $form['modules']['aggregator'] = array( - '#type' => 'fieldset', - '#title' => t('Default processor settings'), - '#description' => $info['description'], - '#collapsible' => TRUE, - '#collapsed' => !in_array('aggregator', variable_get('aggregator_processors', array('aggregator'))), - ); - } - else { - $form['modules']['aggregator'] = array(); - } - - $form['modules']['aggregator']['aggregator_summary_items'] = array( - '#type' => 'select', - '#title' => t('Number of items shown in listing pages'), - '#default_value' => variable_get('aggregator_summary_items', 3), - '#empty_value' => 0, - '#options' => $items, - ); - - $form['modules']['aggregator']['aggregator_clear'] = array( - '#type' => 'select', - '#title' => t('Discard items older than'), - '#default_value' => variable_get('aggregator_clear', 9676800), - '#options' => $period, - '#description' => t('Requires a correctly configured cron maintenance task.', array('@cron' => url('admin/reports/status'))), - ); - - $form['modules']['aggregator']['aggregator_category_selector'] = array( - '#type' => 'radios', - '#title' => t('Select categories using'), - '#default_value' => variable_get('aggregator_category_selector', 'checkboxes'), - '#options' => array('checkboxes' => t('checkboxes'), - 'select' => t('multiple selector')), - '#description' => t('For a small number of categories, checkboxes are easier to use, while a multiple selector works well with large numbers of categories.'), - ); - $form['modules']['aggregator']['aggregator_teaser_length'] = array( - '#type' => 'select', - '#title' => t('Length of trimmed description'), - '#default_value' => variable_get('aggregator_teaser_length', 600), - '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_aggregator_characters'), - '#description' => t("The maximum number of characters used in the trimmed version of content.") - ); - - } -} - -/** - * Creates display text for teaser length option values. - * - * Callback for drupal_map_assoc() within - * aggregator_form_aggregator_admin_form_alter(). - * - * @param $length - * The desired length of teaser text, in bytes. - * - * @return - * A translated string explaining the teaser string length. - */ -function _aggregator_characters($length) { - return ($length == 0) ? t('Unlimited') : format_plural($length, '1 character', '@count characters'); -} - -/** - * Adds/edits/deletes an aggregator item. - * - * @param $edit - * An associative array describing the item to be added/edited/deleted. - */ -function aggregator_save_item($edit) { - if ($edit['title'] && empty($edit['iid'])) { - $edit['iid'] = db_insert('aggregator_item') - ->fields(array( - 'title' => $edit['title'], - 'link' => $edit['link'], - 'author' => $edit['author'], - 'description' => $edit['description'], - 'guid' => $edit['guid'], - 'timestamp' => $edit['timestamp'], - 'fid' => $edit['fid'], - )) - ->execute(); - } - if ($edit['iid'] && !$edit['title']) { - db_delete('aggregator_item') - ->condition('iid', $edit['iid']) - ->execute(); - db_delete('aggregator_category_item') - ->condition('iid', $edit['iid']) - ->execute(); - } - elseif ($edit['title'] && $edit['link']) { - // file the items in the categories indicated by the feed - $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $edit['fid'])); - foreach ($result as $category) { - db_merge('aggregator_category_item') - ->key(array( - 'iid' => $edit['iid'], - 'cid' => $category->cid, - )) - ->execute(); - } - } -} - -/** - * Expires items from a feed depending on expiration settings. - * - * @param $feed - * Object describing feed. - */ -function aggregator_expire($feed) { - $aggregator_clear = variable_get('aggregator_clear', 9676800); - - if ($aggregator_clear != AGGREGATOR_CLEAR_NEVER) { - // Remove all items that are older than flush item timer. - $age = REQUEST_TIME - $aggregator_clear; - $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array( - ':fid' => $feed->fid, - ':timestamp' => $age, - )) - ->fetchCol(); - if ($iids) { - db_delete('aggregator_category_item') - ->condition('iid', $iids, 'IN') - ->execute(); - db_delete('aggregator_item') - ->condition('iid', $iids, 'IN') - ->execute(); - } - } -} diff --git a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info deleted file mode 100644 index b8dd19d..0000000 --- a/modules/aggregator/tests/aggregator_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "Aggregator module tests" -description = "Support module for aggregator related testing." -package = Testing -version = VERSION -core = 7.x -hidden = TRUE diff --git a/modules/aggregator/tests/aggregator_test.module b/modules/aggregator/tests/aggregator_test.module deleted file mode 100644 index 2d26a5d..0000000 --- a/modules/aggregator/tests/aggregator_test.module +++ /dev/null @@ -1,58 +0,0 @@ - 'Test feed static last modified date', - 'description' => "A cached test feed with a static last modified date.", - 'page callback' => 'aggregator_test_feed', - 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, - ); - return $items; -} - -/** - * Page callback. Generates a test feed and simulates last-modified and etags. - * - * @param $use_last_modified - * Set TRUE to send a last modified header. - * @param $use_etag - * Set TRUE to send an etag. - */ -function aggregator_test_feed($use_last_modified = FALSE, $use_etag = FALSE) { - $last_modified = strtotime('Sun, 19 Nov 1978 05:00:00 GMT'); - $etag = drupal_hash_base64($last_modified); - - $if_modified_since = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) : FALSE; - $if_none_match = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : FALSE; - - // Send appropriate response. We respond with a 304 not modified on either - // etag or on last modified. - if ($use_last_modified) { - drupal_add_http_header('Last-Modified', gmdate(DATE_RFC1123, $last_modified)); - } - if ($use_etag) { - drupal_add_http_header('ETag', $etag); - } - // Return 304 not modified if either last modified or etag match. - if ($last_modified == $if_modified_since || $etag == $if_none_match) { - drupal_add_http_header('Status', '304 Not Modified'); - return; - } - - // The following headers force validation of cache: - drupal_add_http_header('Expires', 'Sun, 19 Nov 1978 05:00:00 GMT'); - drupal_add_http_header('Cache-Control', 'must-revalidate'); - drupal_add_http_header('Content-Type', 'application/rss+xml; charset=utf-8'); - - // Read actual feed from file. - $file_name = DRUPAL_ROOT . '/' . drupal_get_path('module', 'aggregator') . '/tests/aggregator_test_rss091.xml'; - $handle = fopen($file_name, 'r'); - $feed = fread($handle, filesize($file_name)); - fclose($handle); - - print $feed; -} diff --git a/modules/aggregator/tests/aggregator_test_atom.xml b/modules/aggregator/tests/aggregator_test_atom.xml deleted file mode 100644 index 357b2e5..0000000 --- a/modules/aggregator/tests/aggregator_test_atom.xml +++ /dev/null @@ -1,20 +0,0 @@ - -' . check_plain(variable_get('site_name', 'Drupal')) . " \n"; - $output .= '' . gmdate(DATE_RFC2822, REQUEST_TIME) . " \n"; - $output .= "\n"; - $output .= "\n"; - foreach ($feeds as $feed) { - $output .= '\n"; - } - $output .= "\n"; - $output .= " - - diff --git a/modules/aggregator/tests/aggregator_test_rss091.xml b/modules/aggregator/tests/aggregator_test_rss091.xml deleted file mode 100644 index 2944022..0000000 --- a/modules/aggregator/tests/aggregator_test_rss091.xml +++ /dev/null @@ -1,41 +0,0 @@ - -Example Feed - -2003-12-13T18:30:02Z -- -John Doe -urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 - -- - -Atom-Powered Robots Run Amok - -urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a -2003-12-13T18:30:02Z -Some text. -- diff --git a/modules/block/block-admin-display-form.tpl.php b/modules/block/block-admin-display-form.tpl.php deleted file mode 100644 index 17a15e4..0000000 --- a/modules/block/block-admin-display-form.tpl.php +++ /dev/null @@ -1,69 +0,0 @@ -region_title: Region title for the listed block. - * - $data->block_title: Block title. - * - $data->region_select: Drop-down menu for assigning a region. - * - $data->weight_select: Drop-down menu for setting weights. - * - $data->configure_link: Block configuration link. - * - $data->delete_link: For deleting user added blocks. - * - * @see template_preprocess_block_admin_display_form() - * @see theme_block_admin_display() - * - * @ingroup themeable - */ -?> - $title) { - drupal_add_tabledrag('blocks', 'match', 'sibling', 'block-region-select', 'block-region-' . $region, NULL, FALSE); - drupal_add_tabledrag('blocks', 'order', 'sibling', 'block-weight', 'block-weight-' . $region); - } -?> -- -Example - http://example.com -Example updates -en-us -Copyright 2000, Example team. -editor@example.com -webmaster@example.com -- -Example -http://example.com/images/druplicon.png - http://example.com -88 -100 -Example updates -- -
- - diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc deleted file mode 100644 index bd61790..0000000 --- a/modules/block/block.admin.inc +++ /dev/null @@ -1,700 +0,0 @@ - 'value', - '#value' => $theme, - ); - $form['block_regions'] = array( - '#type' => 'value', - // Add a last region for disabled blocks. - '#value' => $block_regions + array(BLOCK_REGION_NONE => BLOCK_REGION_NONE), - ); - $form['blocks'] = array(); - $form['#tree'] = TRUE; - - foreach ($blocks as $i => $block) { - $key = $block['module'] . '_' . $block['delta']; - $form['blocks'][$key]['module'] = array( - '#type' => 'value', - '#value' => $block['module'], - ); - $form['blocks'][$key]['delta'] = array( - '#type' => 'value', - '#value' => $block['delta'], - ); - $form['blocks'][$key]['info'] = array( - '#markup' => check_plain($block['info']), - ); - $form['blocks'][$key]['theme'] = array( - '#type' => 'hidden', - '#value' => $theme, - ); - $form['blocks'][$key]['weight'] = array( - '#type' => 'weight', - '#default_value' => $block['weight'], - '#delta' => $weight_delta, - '#title_display' => 'invisible', - '#title' => t('Weight for @block block', array('@block' => $block['info'])), - ); - $form['blocks'][$key]['region'] = array( - '#type' => 'select', - '#default_value' => $block['region'] != BLOCK_REGION_NONE ? $block['region'] : NULL, - '#empty_value' => BLOCK_REGION_NONE, - '#title_display' => 'invisible', - '#title' => t('Region for @block block', array('@block' => $block['info'])), - '#options' => $block_regions, - ); - $form['blocks'][$key]['configure'] = array( - '#type' => 'link', - '#title' => t('configure'), - '#href' => 'admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/configure', - ); - if ($block['module'] == 'block') { - $form['blocks'][$key]['delete'] = array( - '#type' => 'link', - '#title' => t('delete'), - '#href' => 'admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/delete', - ); - } - } - // Do not allow disabling the main system content block when it is present. - if (isset($form['blocks']['system_main']['region'])) { - $form['blocks']['system_main']['region']['#required'] = TRUE; - } - - $form['actions'] = array( - '#tree' => FALSE, - '#type' => 'actions', - ); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save blocks'), - ); - - return $form; -} - -/** - * Form submission handler for block_admin_display_form(). - * - * @see block_admin_display_form() - */ -function block_admin_display_form_submit($form, &$form_state) { - $transaction = db_transaction(); - try { - foreach ($form_state['values']['blocks'] as $block) { - $block['status'] = (int) ($block['region'] != BLOCK_REGION_NONE); - $block['region'] = $block['status'] ? $block['region'] : ''; - db_update('block') - ->fields(array( - 'status' => $block['status'], - 'weight' => $block['weight'], - 'region' => $block['region'], - )) - ->condition('module', $block['module']) - ->condition('delta', $block['delta']) - ->condition('theme', $block['theme']) - ->execute(); - } - } - catch (Exception $e) { - $transaction->rollback(); - watchdog_exception('block', $e); - throw $e; - } - drupal_set_message(t('The block settings have been updated.')); - cache_clear_all(); -} - -/** - * Sorts active blocks by region, then by weight; sorts inactive blocks by name. - * - * Callback for usort() in block_admin_display_prepare_blocks(). - */ -function _block_compare($a, $b) { - global $theme_key; - - // Theme should be set before calling this function, or the current theme - // is being used. - $theme = &drupal_static(__FUNCTION__ . ':theme'); - if (!isset($theme)) { - $theme = $theme_key; - } - - $regions = &drupal_static(__FUNCTION__ . ':regions'); - // We need the region list to correctly order by region. - if (!isset($regions)) { - $regions = array_flip(array_keys(system_region_list($theme))); - $regions[BLOCK_REGION_NONE] = count($regions); - } - - // Separate enabled from disabled. - $status = $b['status'] - $a['status']; - if ($status) { - return $status; - } - // Sort by region (in the order defined by theme .info file). - if ((!empty($a['region']) && !empty($b['region'])) && ($place = ($regions[$a['region']] - $regions[$b['region']]))) { - return $place; - } - // Sort by weight, unless disabled. - if ($a['region'] != BLOCK_REGION_NONE) { - $weight = $a['weight'] - $b['weight']; - if ($weight) { - return $weight; - } - } - // Sort by title. - return strcmp($a['info'], $b['info']); -} - -/** - * Form constructor for the block configuration form. - * - * Also used by block_add_block_form() for adding a new custom block. - * - * @param $module - * Name of the module that implements the block to be configured. - * @param $delta - * Unique ID of the block within the context of $module. - * - * @see block_admin_configure_validate() - * @see block_admin_configure_submit() - * @ingroup forms - */ -function block_admin_configure($form, &$form_state, $module, $delta) { - $block = block_load($module, $delta); - $form['module'] = array( - '#type' => 'value', - '#value' => $block->module, - ); - $form['delta'] = array( - '#type' => 'value', - '#value' => $block->delta, - ); - - // Get the block subject for the page title. - $info = module_invoke($block->module, 'block_info'); - if (isset($info[$block->delta])) { - drupal_set_title(t("'%name' block", array('%name' => $info[$block->delta]['info'])), PASS_THROUGH); - } - - $form['settings']['title'] = array( - '#type' => 'textfield', - '#title' => t('Block title'), - '#maxlength' => 64, - '#description' => $block->module == 'block' ? t('The title of the block as shown to the user.') : t('Override the default title for the block. Use !placeholder to display no title, or leave blank to use the default block title.', array('!placeholder' => '<none>')), - '#default_value' => isset($block->title) ? $block->title : '', - '#weight' => -19, - ); - - // Module-specific block configuration. - if ($settings = module_invoke($block->module, 'block_configure', $block->delta)) { - foreach ($settings as $k => $v) { - $form['settings'][$k] = $v; - } - } - - // Region settings. - $form['regions'] = array( - '#type' => 'fieldset', - '#title' => t('Region settings'), - '#collapsible' => FALSE, - '#description' => t('Specify in which themes and regions this block is displayed.'), - '#tree' => TRUE, - ); - - $theme_default = variable_get('theme_default', 'bartik'); - $admin_theme = variable_get('admin_theme'); - foreach (list_themes() as $key => $theme) { - // Only display enabled themes - if ($theme->status) { - $region = db_query("SELECT region FROM {block} WHERE module = :module AND delta = :delta AND theme = :theme", array( - ':module' => $block->module, - ':delta' => $block->delta, - ':theme' => $key, - ))->fetchField(); - - // Use a meaningful title for the main site theme and administrative - // theme. - $theme_title = $theme->info['name']; - if ($key == $theme_default) { - $theme_title = t('!theme (default theme)', array('!theme' => $theme_title)); - } - elseif ($admin_theme && $key == $admin_theme) { - $theme_title = t('!theme (administration theme)', array('!theme' => $theme_title)); - } - $form['regions'][$key] = array( - '#type' => 'select', - '#title' => $theme_title, - '#default_value' => !empty($region) && $region != -1 ? $region : NULL, - '#empty_value' => BLOCK_REGION_NONE, - '#options' => system_region_list($key, REGIONS_VISIBLE), - '#weight' => ($key == $theme_default ? 9 : 10), - ); - } - } - - // Visibility settings. - $form['visibility_title'] = array( - '#type' => 'item', - '#title' => t('Visibility settings'), - ); - $form['visibility'] = array( - '#type' => 'vertical_tabs', - '#attached' => array( - 'js' => array(drupal_get_path('module', 'block') . '/block.js'), - ), - ); - - // Per-path visibility. - $form['visibility']['path'] = array( - '#type' => 'fieldset', - '#title' => t('Pages'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'visibility', - '#weight' => 0, - ); - - $access = user_access('use PHP for settings'); - if (isset($block->visibility) && $block->visibility == BLOCK_VISIBILITY_PHP && !$access) { - $form['visibility']['path']['visibility'] = array( - '#type' => 'value', - '#value' => BLOCK_VISIBILITY_PHP, - ); - $form['visibility']['path']['pages'] = array( - '#type' => 'value', - '#value' => isset($block->pages) ? $block->pages : '', - ); - } - else { - $options = array( - BLOCK_VISIBILITY_NOTLISTED => t('All pages except those listed'), - BLOCK_VISIBILITY_LISTED => t('Only the listed pages'), - ); - $description = t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '- - - - - $title): ?> -- - - - - - - $data): ?> -- - - - - - -block_title; ?> -region_select; ?> -weight_select; ?> -configure_link; ?> -delete_link; ?> -')); - - if (module_exists('php') && $access) { - $options += array(BLOCK_VISIBILITY_PHP => t('Pages on which this PHP code returns TRUE(experts only)')); - $title = t('Pages or PHP code'); - $description .= ' ' . t('If the PHP option is chosen, enter PHP code between %php. Note that executing incorrect PHP code can break your Drupal site.', array('%php' => '')); - } - else { - $title = t('Pages'); - } - $form['visibility']['path']['visibility'] = array( - '#type' => 'radios', - '#title' => t('Show block on specific pages'), - '#options' => $options, - '#default_value' => isset($block->visibility) ? $block->visibility : BLOCK_VISIBILITY_NOTLISTED, - ); - $form['visibility']['path']['pages'] = array( - '#type' => 'textarea', - '#title' => '' . $title . '', - '#default_value' => isset($block->pages) ? $block->pages : '', - '#description' => $description, - ); - } - - // Per-role visibility. - $default_role_options = db_query("SELECT rid FROM {block_role} WHERE module = :module AND delta = :delta", array( - ':module' => $block->module, - ':delta' => $block->delta, - ))->fetchCol(); - $role_options = array_map('check_plain', user_roles()); - $form['visibility']['role'] = array( - '#type' => 'fieldset', - '#title' => t('Roles'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'visibility', - '#weight' => 10, - ); - $form['visibility']['role']['roles'] = array( - '#type' => 'checkboxes', - '#title' => t('Show block for specific roles'), - '#default_value' => $default_role_options, - '#options' => $role_options, - '#description' => t('Show this block only for the selected role(s). If you select no roles, the block will be visible to all users.'), - ); - - // Per-user visibility. - $form['visibility']['user'] = array( - '#type' => 'fieldset', - '#title' => t('Users'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'visibility', - '#weight' => 20, - ); - $form['visibility']['user']['custom'] = array( - '#type' => 'radios', - '#title' => t('Customizable per user'), - '#options' => array( - BLOCK_CUSTOM_FIXED => t('Not customizable'), - BLOCK_CUSTOM_ENABLED => t('Customizable, visible by default'), - BLOCK_CUSTOM_DISABLED => t('Customizable, hidden by default'), - ), - '#description' => t('Allow individual users to customize the visibility of this block in their account settings.'), - '#default_value' => isset($block->custom) ? $block->custom : BLOCK_CUSTOM_FIXED, - ); - - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save block'), - ); - - return $form; -} - -/** - * Form validation handler for block_admin_configure(). - * - * @see block_admin_configure() - * @see block_admin_configure_submit() - */ -function block_admin_configure_validate($form, &$form_state) { - if ($form_state['values']['module'] == 'block') { - $custom_block_exists = (bool) db_query_range('SELECT 1 FROM {block_custom} WHERE bid <> :bid AND info = :info', 0, 1, array( - ':bid' => $form_state['values']['delta'], - ':info' => $form_state['values']['info'], - ))->fetchField(); - if (empty($form_state['values']['info']) || $custom_block_exists) { - form_set_error('info', t('Ensure that each block description is unique.')); - } - } -} - -/** - * Form submission handler for block_admin_configure(). - * - * @see block_admin_configure() - * @see block_admin_configure_validate() - */ -function block_admin_configure_submit($form, &$form_state) { - if (!form_get_errors()) { - $transaction = db_transaction(); - try { - db_update('block') - ->fields(array( - 'visibility' => (int) $form_state['values']['visibility'], - 'pages' => trim($form_state['values']['pages']), - 'custom' => (int) $form_state['values']['custom'], - 'title' => $form_state['values']['title'], - )) - ->condition('module', $form_state['values']['module']) - ->condition('delta', $form_state['values']['delta']) - ->execute(); - - db_delete('block_role') - ->condition('module', $form_state['values']['module']) - ->condition('delta', $form_state['values']['delta']) - ->execute(); - $query = db_insert('block_role')->fields(array('rid', 'module', 'delta')); - foreach (array_filter($form_state['values']['roles']) as $rid) { - $query->values(array( - 'rid' => $rid, - 'module' => $form_state['values']['module'], - 'delta' => $form_state['values']['delta'], - )); - } - $query->execute(); - - // Store regions per theme for this block - foreach ($form_state['values']['regions'] as $theme => $region) { - db_merge('block') - ->key(array('theme' => $theme, 'delta' => $form_state['values']['delta'], 'module' => $form_state['values']['module'])) - ->fields(array( - 'region' => ($region == BLOCK_REGION_NONE ? '' : $region), - 'pages' => trim($form_state['values']['pages']), - 'status' => (int) ($region != BLOCK_REGION_NONE), - )) - ->execute(); - } - - module_invoke($form_state['values']['module'], 'block_save', $form_state['values']['delta'], $form_state['values']); - } - catch (Exception $e) { - $transaction->rollback(); - watchdog_exception('block', $e); - throw $e; - } - drupal_set_message(t('The block configuration has been saved.')); - cache_clear_all(); - $form_state['redirect'] = 'admin/structure/block'; - } -} - -/** - * Form constructor for the add block form. - * - * @see block_add_block_form_validate() - * @see block_add_block_form_submit() - * @ingroup forms - */ -function block_add_block_form($form, &$form_state) { - return block_admin_configure($form, $form_state, 'block', NULL); -} - -/** - * Form validation handler for block_add_block_form(). - * - * @see block_add_block_form() - * @see block_add_block_form_submit() - */ -function block_add_block_form_validate($form, &$form_state) { - $custom_block_exists = (bool) db_query_range('SELECT 1 FROM {block_custom} WHERE info = :info', 0, 1, array(':info' => $form_state['values']['info']))->fetchField(); - - if (empty($form_state['values']['info']) || $custom_block_exists) { - form_set_error('info', t('Ensure that each block description is unique.')); - } -} - -/** - * Form submission handler for block_add_block_form(). - * - * Saves the new custom block. - * - * @see block_add_block_form() - * @see block_add_block_form_validate() - */ -function block_add_block_form_submit($form, &$form_state) { - $delta = db_insert('block_custom') - ->fields(array( - 'body' => $form_state['values']['body']['value'], - 'info' => $form_state['values']['info'], - 'format' => $form_state['values']['body']['format'], - )) - ->execute(); - // Store block delta to allow other modules to work with new block. - $form_state['values']['delta'] = $delta; - - $query = db_insert('block')->fields(array('visibility', 'pages', 'custom', 'title', 'module', 'theme', 'status', 'weight', 'delta', 'cache')); - foreach (list_themes() as $key => $theme) { - if ($theme->status) { - $query->values(array( - 'visibility' => (int) $form_state['values']['visibility'], - 'pages' => trim($form_state['values']['pages']), - 'custom' => (int) $form_state['values']['custom'], - 'title' => $form_state['values']['title'], - 'module' => $form_state['values']['module'], - 'theme' => $theme->name, - 'status' => 0, - 'weight' => 0, - 'delta' => $delta, - 'cache' => DRUPAL_NO_CACHE, - )); - } - } - $query->execute(); - - $query = db_insert('block_role')->fields(array('rid', 'module', 'delta')); - foreach (array_filter($form_state['values']['roles']) as $rid) { - $query->values(array( - 'rid' => $rid, - 'module' => $form_state['values']['module'], - 'delta' => $delta, - )); - } - $query->execute(); - - // Store regions per theme for this block - foreach ($form_state['values']['regions'] as $theme => $region) { - db_merge('block') - ->key(array('theme' => $theme, 'delta' => $delta, 'module' => $form_state['values']['module'])) - ->fields(array( - 'region' => ($region == BLOCK_REGION_NONE ? '' : $region), - 'pages' => trim($form_state['values']['pages']), - 'status' => (int) ($region != BLOCK_REGION_NONE), - )) - ->execute(); - } - - drupal_set_message(t('The block has been created.')); - cache_clear_all(); - $form_state['redirect'] = 'admin/structure/block'; -} - -/** - * Form constructor for the custom block deletion form. - * - * @param $module - * The name of the module that implements the block to be deleted. This should - * always equal 'block' since it only allows custom blocks to be deleted. - * @param $delta - * The unique ID of the block within the context of $module. - * - * @see block_custom_block_delete_submit() - */ -function block_custom_block_delete($form, &$form_state, $module, $delta) { - $block = block_load($module, $delta); - $custom_block = block_custom_block_get($block->delta); - $form['info'] = array('#type' => 'hidden', '#value' => $custom_block['info'] ? $custom_block['info'] : $custom_block['title']); - $form['bid'] = array('#type' => 'hidden', '#value' => $block->delta); - - return confirm_form($form, t('Are you sure you want to delete the block %name?', array('%name' => $custom_block['info'])), 'admin/structure/block', '', t('Delete'), t('Cancel')); -} - -/** - * Form submission handler for block_custom_block_delete(). - * - * @see block_custom_block_delete() - */ -function block_custom_block_delete_submit($form, &$form_state) { - db_delete('block_custom') - ->condition('bid', $form_state['values']['bid']) - ->execute(); - db_delete('block') - ->condition('module', 'block') - ->condition('delta', $form_state['values']['bid']) - ->execute(); - db_delete('block_role') - ->condition('module', 'block') - ->condition('delta', $form_state['values']['bid']) - ->execute(); - drupal_set_message(t('The block %name has been removed.', array('%name' => $form_state['values']['info']))); - cache_clear_all(); - $form_state['redirect'] = 'admin/structure/block'; - return; -} - -/** - * Processes variables for block-admin-display-form.tpl.php. - * - * The $variables array contains the following arguments: - * - $form - * - * @see block-admin-display.tpl.php - * @see theme_block_admin_display() - */ -function template_preprocess_block_admin_display_form(&$variables) { - $variables['block_regions'] = $variables['form']['block_regions']['#value']; - if (isset($variables['block_regions'][BLOCK_REGION_NONE])) { - $variables['block_regions'][BLOCK_REGION_NONE] = t('Disabled'); - } - - foreach ($variables['block_regions'] as $key => $value) { - // Initialize an empty array for the region. - $variables['block_listing'][$key] = array(); - } - - // Initialize disabled blocks array. - $variables['block_listing'][BLOCK_REGION_NONE] = array(); - - // Add each block in the form to the appropriate place in the block listing. - foreach (element_children($variables['form']['blocks']) as $i) { - $block = &$variables['form']['blocks'][$i]; - - // Fetch the region for the current block. - $region = (isset($block['region']['#default_value']) ? $block['region']['#default_value'] : BLOCK_REGION_NONE); - - // Set special classes needed for table drag and drop. - $block['region']['#attributes']['class'] = array('block-region-select', 'block-region-' . $region); - $block['weight']['#attributes']['class'] = array('block-weight', 'block-weight-' . $region); - - $variables['block_listing'][$region][$i] = new stdClass(); - $variables['block_listing'][$region][$i]->row_class = !empty($block['#attributes']['class']) ? implode(' ', $block['#attributes']['class']) : ''; - $variables['block_listing'][$region][$i]->block_modified = !empty($block['#attributes']['class']) && in_array('block-modified', $block['#attributes']['class']); - $variables['block_listing'][$region][$i]->block_title = drupal_render($block['info']); - $variables['block_listing'][$region][$i]->region_select = drupal_render($block['region']) . drupal_render($block['theme']); - $variables['block_listing'][$region][$i]->weight_select = drupal_render($block['weight']); - $variables['block_listing'][$region][$i]->configure_link = drupal_render($block['configure']); - $variables['block_listing'][$region][$i]->delete_link = !empty($block['delete']) ? drupal_render($block['delete']) : ''; - $variables['block_listing'][$region][$i]->printed = FALSE; - } - - $variables['form_submit'] = drupal_render_children($variables['form']); -} - diff --git a/modules/block/block.css b/modules/block/block.css deleted file mode 100644 index 214c8a2..0000000 --- a/modules/block/block.css +++ /dev/null @@ -1,36 +0,0 @@ - -#blocks tr.region-title td { - font-weight: bold; -} -#blocks tr.region-message { - font-weight: normal; - color: #999; -} -#blocks tr.region-populated { - display: none; -} -.block-region { - background-color: #ff6; - margin-top: 4px; - margin-bottom: 4px; - padding: 3px; -} -a.block-demo-backlink, -a.block-demo-backlink:link, -a.block-demo-backlink:visited { - background-color: #B4D7F0; - -moz-border-radius: 0 0 10px 10px; - -webkit-border-radius: 0 0 10px 10px; - border-radius: 0 0 10px 10px; - color: #000; - font-family: "Lucida Grande", Verdana, sans-serif; - font-size: small; - line-height: 20px; - left: 20px; /*LTR*/ - padding: 5px 10px; - position: fixed; - z-index: 499; -} -a.block-demo-backlink:hover { - text-decoration: underline; -} diff --git a/modules/block/block.info b/modules/block/block.info deleted file mode 100644 index f8c0f0c..0000000 --- a/modules/block/block.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Block -description = Controls the visual building blocks a page is constructed with. Blocks are boxes of content rendered into an area, or region, of a web page. -package = Core -version = VERSION -core = 7.x -files[] = block.test -configure = admin/structure/block diff --git a/modules/block/block.install b/modules/block/block.install deleted file mode 100644 index a78c885..0000000 --- a/modules/block/block.install +++ /dev/null @@ -1,477 +0,0 @@ - 'Stores block settings, such as region and visibility settings.', - 'fields' => array( - 'bid' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'Primary Key: Unique block ID.', - ), - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => "The module from which the block originates; for example, 'user' for the Who's Online block, and 'block' for any custom blocks.", - ), - 'delta' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '0', - 'description' => 'Unique ID for block within a module.', - ), - 'theme' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The theme under which the block settings apply.', - ), - 'status' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Block enabled status. (1 = enabled, 0 = disabled)', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Block weight within region.', - ), - 'region' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Theme region within which the block is set.', - ), - 'custom' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Flag to indicate how users may control visibility of the block. (0 = Users cannot control, 1 = On by default, but can be hidden, 2 = Hidden by default, but can be shown)', - ), - 'visibility' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Flag to indicate how to show blocks on pages. (0 = Show on all pages except listed pages, 1 = Show only on listed pages, 2 = Use custom PHP code to determine visibility)', - ), - 'pages' => array( - 'type' => 'text', - 'not null' => TRUE, - 'description' => 'Contents of the "Pages" block; contains either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.', - ), - 'title' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Custom title for the block. (Empty string will use block default title,will remove the title, text will cause block to use specified title.)', - 'translatable' => TRUE, - ), - 'cache' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 1, - 'size' => 'tiny', - 'description' => 'Binary flag to indicate block cache mode. (-2: Custom cache, -1: Do not cache, 1: Cache per role, 2: Cache per user, 4: Cache per page, 8: Block cache global) See DRUPAL_CACHE_* constants in ../includes/common.inc for more detailed information.', - ), - ), - 'primary key' => array('bid'), - 'unique keys' => array( - 'tmd' => array('theme', 'module', 'delta'), - ), - 'indexes' => array( - 'list' => array('theme', 'status', 'region', 'weight', 'module'), - ), - ); - - $schema['block_role'] = array( - 'description' => 'Sets up access permissions for blocks based on user roles', - 'fields' => array( - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'description' => "The block's origin module, from {block}.module.", - ), - 'delta' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'description' => "The block's unique delta within module, from {block}.delta.", - ), - 'rid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => "The user's role ID from {users_roles}.rid.", - ), - ), - 'primary key' => array('module', 'delta', 'rid'), - 'indexes' => array( - 'rid' => array('rid'), - ), - ); - - $schema['block_custom'] = array( - 'description' => 'Stores contents of custom-made blocks.', - 'fields' => array( - 'bid' => array( - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => "The block's {block}.bid.", - ), - 'body' => array( - 'type' => 'text', - 'not null' => FALSE, - 'size' => 'big', - 'description' => 'Block contents.', - 'translatable' => TRUE, - ), - 'info' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Block description.', - ), - 'format' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - 'description' => 'The {filter_format}.format of the block body.', - ), - ), - 'unique keys' => array( - 'info' => array('info'), - ), - 'primary key' => array('bid'), - ); - - $schema['cache_block'] = drupal_get_schema_unprocessed('system', 'cache'); - $schema['cache_block']['description'] = 'Cache table for the Block module to store already built blocks, identified by module, delta, and various contexts which may change the block, such as theme, locale, and caching mode defined for the block.'; - - return $schema; -} - -/** - * Implements hook_install(). - */ -function block_install() { - - // Block should go first so that other modules can alter its output - // during hook_page_alter(). Almost everything on the page is a block, - // so before block module runs, there will not be much to alter. - db_update('system') - ->fields(array('weight' => -5)) - ->condition('name', 'block') - ->execute(); -} - -/** - * Implements hook_update_dependencies(). - */ -function block_update_dependencies() { - // block_update_7005() needs to query the {filter_format} table to get a list - // of existing text formats, so it must run after filter_update_7000(), which - // creates that table. - $dependencies['block'][7005] = array( - 'filter' => 7000, - ); - - return $dependencies; -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Set system.weight to a low value for block module. - * - * Block should go first so that other modules can alter its output - * during hook_page_alter(). Almost everything on the page is a block, - * so before block module runs, there will not be much to alter. - */ -function block_update_7000() { - db_update('system') - ->fields(array('weight' => '-5')) - ->condition('name', 'block') - ->execute(); -} - -/** - * Rename {blocks} table to {block}, {blocks_roles} to {block_role} and - * {boxes} to {block_custom}. - */ -function block_update_7002() { - db_drop_index('blocks', 'list'); - db_rename_table('blocks', 'block'); - db_rename_table('blocks_roles', 'block_role'); - db_rename_table('boxes', 'block_custom'); -} - -/** - * Change the weight column to normal int. - */ -function block_update_7003() { - db_change_field('block', 'weight', 'weight', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Block weight within region.', - ), array( - 'indexes' => array( - 'list' => array('theme', 'status', 'region', 'weight', 'module'), - ), - )); -} - -/** - * Add new blocks to new regions, migrate custom variables to blocks. - */ -function block_update_7004() { - // Collect a list of themes with blocks. - $themes_with_blocks = array(); - $result = db_query("SELECT s.name FROM {system} s INNER JOIN {block} b ON s.name = b.theme WHERE s.type = 'theme' GROUP by s.name"); - - $insert = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'pages', 'cache')); - foreach ($result as $theme) { - $themes_with_blocks[] = $theme->name; - // Add new system generated help block. - $insert->values(array( - 'module' => 'system', - 'delta' => 'help', - 'theme' => $theme->name, - 'status' => 1, - 'weight' => 0, - 'region' => 'help', - 'pages' => '', - 'cache' => DRUPAL_CACHE_PER_ROLE, - )); - // Add new system generated main page content block. - $insert->values(array( - 'module' => 'system', - 'delta' => 'main', - 'theme' => $theme->name, - 'status' => 1, - 'weight' => 0, - 'region' => 'content', - 'pages' => '', - 'cache' => DRUPAL_NO_CACHE, - )); - } - $insert->execute(); - - // Migrate blocks from left/right regions to first/second regions. - db_update('block') - ->fields(array('region' => 'sidebar_first')) - ->condition('region', 'left') - ->execute(); - db_update('block') - ->fields(array('region' => 'sidebar_second')) - ->condition('region', 'right') - ->execute(); - - // Migrate contact form information. - $default_format = variable_get('filter_default_format', 1); - if ($contact_help = variable_get('contact_form_information', '')) { - $bid = db_insert('block_custom') - ->fields(array( - 'body' => $contact_help, - 'info' => 'Contact page help', - 'format' => $default_format, - )) - ->execute(); - - $insert = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'visibility', 'pages', 'cache')); - foreach ($themes_with_blocks as $theme) { - // Add contact help block for themes, which had blocks. - $insert->values(array( - 'module' => 'block', - 'delta' => $bid, - 'theme' => $theme, - 'status' => 1, - 'weight' => 5, - 'region' => 'help', - 'visibility' => BLOCK_VISIBILITY_LISTED, - 'pages' => 'contact', - 'cache' => DRUPAL_NO_CACHE, - )); - } - drupal_set_message('The contact form information setting was migrated to a custom block and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right.'); - } - $insert->execute(); - - // Migrate user help setting. - if ($user_help = variable_get('user_registration_help', '')) { - $bid = db_insert('block_custom')->fields(array('body' => $user_help, 'info' => 'User registration guidelines', 'format' => $default_format))->execute(); - - $insert = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'visibility', 'pages', 'cache')); - foreach ($themes_with_blocks as $theme) { - // Add user registration help block for themes, which had blocks. - $insert->values(array( - 'module' => 'block', - 'delta' => $bid, - 'theme' => $theme, - 'status' => 1, - 'weight' => 5, - 'region' => 'help', - 'visibility' => BLOCK_VISIBILITY_LISTED, - 'pages' => 'user/register', - 'cache' => DRUPAL_NO_CACHE, - )); - } - drupal_set_message('The user registration guidelines were migrated to a custom block and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right.'); - $insert->execute(); - } - - // Migrate site mission setting. - if ($mission = variable_get('site_mission')) { - $bid = db_insert('block_custom')->fields(array('body' => $mission, 'info' => 'Site mission', 'format' => $default_format))->execute(); - - $insert = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'visibility', 'pages', 'cache')); - foreach ($themes_with_blocks as $theme) { - // Add mission block for themes, which had blocks. - $insert->values(array( - 'module' => 'block', - 'delta' => $bid, - 'theme' => $theme, - 'status' => 1, - 'weight' => 0, - 'region' => 'highlighted', - 'visibility' => BLOCK_VISIBILITY_LISTED, - 'pages' => ' ', - 'cache' => DRUPAL_NO_CACHE, - )); - } - drupal_set_message('The site mission was migrated to a custom block and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to relocate the block.'); - $insert->execute(); - // Migrate mission to RSS site description. - variable_set('feed_description', $mission); - } - - // Migrate site footer message to a custom block. - if ($footer_message = variable_get('site_footer', '')) { - $bid = db_insert('block_custom')->fields(array('body' => $footer_message, 'info' => 'Footer message', 'format' => $default_format))->execute(); - - $insert = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'pages', 'cache')); - foreach ($themes_with_blocks as $theme) { - // Add site footer block for themes, which had blocks. - // Set low weight, so the block comes early (it used to be - // before the other blocks). - $insert->values(array( - 'module' => 'block', - 'delta' => $bid, - 'theme' => $theme, - 'status' => 1, - 'weight' => -10, - 'region' => 'footer', - 'pages' => '', - 'cache' => DRUPAL_NO_CACHE, - )); - } - drupal_set_message('The footer message was migrated to a custom block and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right. If your theme does not have a footer region, you might need to relocate the block.'); - $insert->execute(); - } - - // Remove the variables (even if they were saved empty on the admin interface), - // to avoid keeping clutter in the variables table. - variable_del('contact_form_information'); - variable_del('user_registration_help'); - variable_del('site_mission'); - variable_del('site_footer'); - - // Rebuild theme data, so the new 'help' region is identified. - system_rebuild_theme_data(); -} - -/** - * Update the {block_custom}.format column. - */ -function block_update_7005() { - // For an explanation of these updates, see the code comments in - // user_update_7010(). - db_change_field('block_custom', 'format', 'format', array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => FALSE, - 'description' => 'The {filter_format}.format of the block body.', - )); - db_update('block_custom') - ->fields(array('format' => NULL)) - ->condition('body', '') - ->condition('format', 0) - ->execute(); - $existing_formats = db_query("SELECT format FROM {filter_format}")->fetchCol(); - $default_format = variable_get('filter_default_format', 1); - db_update('block_custom') - ->fields(array('format' => $default_format)) - ->isNotNull('format') - ->condition('format', $existing_formats, 'NOT IN') - ->execute(); -} - -/** - * Recreates cache_block table. - * - * Converts fields that hold serialized variables from text to blob. - * Removes 'headers' column. - */ -function block_update_7006() { - $schema = system_schema_cache_7054(); - - db_drop_table('cache_block'); - db_create_table('cache_block', $schema); -} - -/** - * Change {block_custom}.format into varchar. - */ -function block_update_7007() { - db_change_field('block_custom', 'format', 'format', array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - 'description' => 'The {filter_format}.format of the block body.', - )); -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Update database to match Drupal 7 schema. - */ -function block_update_7008() { - db_drop_field('block', 'throttle'); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ diff --git a/modules/block/block.js b/modules/block/block.js deleted file mode 100644 index acd3f5a..0000000 --- a/modules/block/block.js +++ /dev/null @@ -1,152 +0,0 @@ -(function ($) { - -/** - * Provide the summary information for the block settings vertical tabs. - */ -Drupal.behaviors.blockSettingsSummary = { - attach: function (context) { - // The drupalSetSummary method required for this behavior is not available - // on the Blocks administration page, so we need to make sure this - // behavior is processed only if drupalSetSummary is defined. - if (typeof jQuery.fn.drupalSetSummary == 'undefined') { - return; - } - - $('fieldset#edit-path', context).drupalSetSummary(function (context) { - if (!$('textarea[name="pages"]', context).val()) { - return Drupal.t('Not restricted'); - } - else { - return Drupal.t('Restricted to certain pages'); - } - }); - - $('fieldset#edit-node-type', context).drupalSetSummary(function (context) { - var vals = []; - $('input[type="checkbox"]:checked', context).each(function () { - vals.push($.trim($(this).next('label').text())); - }); - if (!vals.length) { - vals.push(Drupal.t('Not restricted')); - } - return vals.join(', '); - }); - - $('fieldset#edit-role', context).drupalSetSummary(function (context) { - var vals = []; - $('input[type="checkbox"]:checked', context).each(function () { - vals.push($.trim($(this).next('label').text())); - }); - if (!vals.length) { - vals.push(Drupal.t('Not restricted')); - } - return vals.join(', '); - }); - - $('fieldset#edit-user', context).drupalSetSummary(function (context) { - var $radio = $('input[name="custom"]:checked', context); - if ($radio.val() == 0) { - return Drupal.t('Not customizable'); - } - else { - return $radio.next('label').text(); - } - }); - } -}; - -/** - * Move a block in the blocks table from one region to another via select list. - * - * This behavior is dependent on the tableDrag behavior, since it uses the - * objects initialized in that behavior to update the row. - */ -Drupal.behaviors.blockDrag = { - attach: function (context, settings) { - // tableDrag is required and we should be on the blocks admin page. - if (typeof Drupal.tableDrag == 'undefined' || typeof Drupal.tableDrag.blocks == 'undefined') { - return; - } - - var table = $('table#blocks'); - var tableDrag = Drupal.tableDrag.blocks; // Get the blocks tableDrag object. - - // Add a handler for when a row is swapped, update empty regions. - tableDrag.row.prototype.onSwap = function (swappedRow) { - checkEmptyRegions(table, this); - }; - - // A custom message for the blocks page specifically. - Drupal.theme.tableDragChangedWarning = function () { - return ''; - }; - - // Add a handler so when a row is dropped, update fields dropped into new regions. - tableDrag.onDrop = function () { - dragObject = this; - // Use "region-message" row instead of "region" row because - // "region-{region_name}-message" is less prone to regexp match errors. - var regionRow = $(dragObject.rowObject.element).prevAll('tr.region-message').get(0); - var regionName = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); - var regionField = $('select.block-region-select', dragObject.rowObject.element); - // Check whether the newly picked region is available for this block. - if ($('option[value=' + regionName + ']', regionField).length == 0) { - // If not, alert the user and keep the block in its old region setting. - alert(Drupal.t('The block cannot be placed in this region.')); - // Simulate that there was a selected element change, so the row is put - // back to from where the user tried to drag it. - regionField.change(); - } - else if ($(dragObject.rowObject.element).prev('tr').is('.region-message')) { - var weightField = $('select.block-weight', dragObject.rowObject.element); - var oldRegionName = weightField[0].className.replace(/([^ ]+[ ]+)*block-weight-([^ ]+)([ ]+[^ ]+)*/, '$2'); - - if (!regionField.is('.block-region-' + regionName)) { - regionField.removeClass('block-region-' + oldRegionName).addClass('block-region-' + regionName); - weightField.removeClass('block-weight-' + oldRegionName).addClass('block-weight-' + regionName); - regionField.val(regionName); - } - } - }; - - // Add the behavior to each region select list. - $('select.block-region-select', context).once('block-region-select', function () { - $(this).change(function (event) { - // Make our new row and select field. - var row = $(this).closest('tr'); - var select = $(this); - tableDrag.rowObject = new tableDrag.row(row); - - // Find the correct region and insert the row as the last in the region. - table.find('.region-' + select[0].value + '-message').nextUntil('.region-message').last().before(row); - - // Modify empty regions with added or removed fields. - checkEmptyRegions(table, row); - // Remove focus from selectbox. - select.get(0).blur(); - }); - }); - - var checkEmptyRegions = function (table, rowObject) { - $('tr.region-message', table).each(function () { - // If the dragged row is in this region, but above the message row, swap it down one space. - if ($(this).prev('tr').get(0) == rowObject.element) { - // Prevent a recursion problem when using the keyboard to move rows up. - if ((rowObject.method != 'keyboard' || rowObject.direction == 'down')) { - rowObject.swap('after', this); - } - } - // This region has become empty. - if ($(this).next('tr').is(':not(.draggable)') || $(this).next('tr').length == 0) { - $(this).removeClass('region-populated').addClass('region-empty'); - } - // This region has become populated. - else if ($(this).is('.region-empty')) { - $(this).removeClass('region-empty').addClass('region-populated'); - } - }); - }; - } -}; - -})(jQuery); diff --git a/modules/block/block.tpl.php b/modules/block/block.tpl.php deleted file mode 100644 index f0bfa5c..0000000 --- a/modules/block/block.tpl.php +++ /dev/null @@ -1,58 +0,0 @@ -subject: Block title. - * - $content: Block content. - * - $block->module: Module that generated the block. - * - $block->delta: An ID for the block, unique within each module. - * - $block->region: The block region embedding the current block. - * - $classes: String of classes that can be used to style contextually through - * CSS. It can be manipulated through the variable $classes_array from - * preprocess functions. The default values can be one or more of the - * following: - * - block: The current template type, i.e., "theming hook". - * - block-[module]: The module generating the block. For example, the user - * module is responsible for handling the default user navigation block. In - * that case the class would be 'block-user'. - * - $title_prefix (array): An array containing additional output populated by - * modules, intended to be displayed in front of the main title tag that - * appears in the template. - * - $title_suffix (array): An array containing additional output populated by - * modules, intended to be displayed after the main title tag that appears in - * the template. - * - * Helper variables: - * - $classes_array: Array of html class attribute values. It is flattened - * into a string within the variable $classes. - * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region. - * - $zebra: Same output as $block_zebra but independent of any block region. - * - $block_id: Counter dependent on each block region. - * - $id: Same output as $block_id but independent of any block region. - * - $is_front: Flags true when presented in the front page. - * - $logged_in: Flags true when the current user is a logged-in member. - * - $is_admin: Flags true when the current user is an administrator. - * - $block_html_id: A valid HTML ID and guaranteed unique. - * - * @see template_preprocess() - * @see template_preprocess_block() - * @see template_process() - * - * @ingroup themeable - */ -?> - > - - -subject): ?> -diff --git a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info deleted file mode 100644 index 879f251..0000000 --- a/modules/block/tests/block_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = Block test -description = Provides test blocks. -package = Testing -version = VERSION -core = 7.x -hidden = TRUE diff --git a/modules/block/tests/themes/block_test_theme/block_test_theme.info b/modules/block/tests/themes/block_test_theme/block_test_theme.info deleted file mode 100644 index 06b6e99..0000000 --- a/modules/block/tests/themes/block_test_theme/block_test_theme.info +++ /dev/null @@ -1,14 +0,0 @@ -name = Block test theme -description = Theme for testing the block system -core = 7.x -hidden = TRUE - -regions[sidebar_first] = Left sidebar -regions_hidden[] = sidebar_first -regions[sidebar_second] = Right sidebar -regions_hidden[] = sidebar_second -regions[content] = Content -regions[header] = Header -regions[footer] = Footer -regions[highlighted] = Highlighted -regions[help] = Help diff --git a/modules/block/tests/themes/block_test_theme/page.tpl.php b/modules/block/tests/themes/block_test_theme/page.tpl.php deleted file mode 100644 index ba72882..0000000 --- a/modules/block/tests/themes/block_test_theme/page.tpl.php +++ /dev/null @@ -1,78 +0,0 @@ - - -> - --diff --git a/modules/blog/blog.info b/modules/blog/blog.info deleted file mode 100644 index 801abfb..0000000 --- a/modules/blog/blog.info +++ /dev/null @@ -1,6 +0,0 @@ -name = Blog -description = Enables multi-user blogs. -package = Core -version = VERSION -core = 7.x -files[] = blog.test diff --git a/modules/blog/blog.install b/modules/blog/blog.install deleted file mode 100644 index fffb14b..0000000 --- a/modules/blog/blog.install +++ /dev/null @@ -1,23 +0,0 @@ - array( - 'name' => t('Blog entry'), - 'base' => 'blog', - 'description' => t('Use for multi-user blogs. Every user gets a personal blog.'), - ) - ); -} - -/** - * Implements hook_user_view(). - */ -function blog_user_view($account) { - if (user_access('create blog content', $account)) { - $account->content['summary']['blog'] = array( - '#type' => 'user_profile_item', - '#title' => t('Blog'), - // l() escapes the attributes, so we should not escape !username here. - '#markup' => l(t('View recent blog entries'), "blog/$account->uid", array('attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => format_username($account)))))), - '#attributes' => array('class' => array('blog')), - ); - } -} - -/** - * Implements hook_help(). - */ -function blog_help($path, $arg) { - switch ($path) { - case 'admin/help#blog': - $output = '- -- - - - - - - - - - - - - - - -- - - -- - - - - - - - - -
' . t('About') . '
'; - $output .= '' . t("The Blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries. By default, the blog entries are displayed by creation time in descending order, with comments enabled, and are promoted to the site's front page. For more information, see the online handbook entry for Blog module.", array('@blog' => 'http://drupal.org/documentation/modules/blog/')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
<?php print $title; ?> - -- - - - - - - - - - '; ?> - - - - - diff --git a/modules/book/book-navigation.tpl.php b/modules/book/book-navigation.tpl.php deleted file mode 100644 index 7a6b34c..0000000 --- a/modules/book/book-navigation.tpl.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - diff --git a/modules/book/book-node-export-html.tpl.php b/modules/book/book-node-export-html.tpl.php deleted file mode 100644 index 0c2c67c..0000000 --- a/modules/book/book-node-export-html.tpl.php +++ /dev/null @@ -1,25 +0,0 @@ - -- - - -diff --git a/modules/book/book-rtl.css b/modules/book/book-rtl.css deleted file mode 100644 index 40dff0e..0000000 --- a/modules/book/book-rtl.css +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @file - * Right-to-Left styling for the Book module. - */ - -.book-navigation .menu { - padding: 1em 3em 0 0; -} - -.book-navigation .page-previous { - float: right; -} -.book-navigation .page-up { - float: right; -} diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc deleted file mode 100644 index cc3f08f..0000000 --- a/modules/book/book.admin.inc +++ /dev/null @@ -1,289 +0,0 @@ - $headers, 'rows' => $rows, 'empty' => t('No books available.'))); -} - -/** - * Form constructor for the book settings form. - * - * @see book_admin_settings_validate() - * - * @ingroup forms - */ -function book_admin_settings() { - $types = node_type_get_names(); - $form['book_allowed_types'] = array( - '#type' => 'checkboxes', - '#title' => t('Content types allowed in book outlines'), - '#default_value' => variable_get('book_allowed_types', array('book')), - '#options' => $types, - '#description' => t('Users with the %outline-perm permission can add all content types.', array('%outline-perm' => t('Administer book outlines'))), - '#required' => TRUE, - ); - $form['book_child_type'] = array( - '#type' => 'radios', - '#title' => t('Content type for child pages'), - '#default_value' => variable_get('book_child_type', 'book'), - '#options' => $types, - '#required' => TRUE, - ); - $form['array_filter'] = array('#type' => 'value', '#value' => TRUE); - $form['#validate'][] = 'book_admin_settings_validate'; - - return system_settings_form($form); -} - -/** - * Form validation handler for book_admin_settings(). - * - * @see book_admin_settings_submit() - */ -function book_admin_settings_validate($form, &$form_state) { - $child_type = $form_state['values']['book_child_type']; - if (empty($form_state['values']['book_allowed_types'][$child_type])) { - form_set_error('book_child_type', t('The content type for the %add-child link must be one of those selected as an allowed book outline type.', array('%add-child' => t('Add child page')))); - } -} - -/** - * Form constructor for administering a single book's hierarchy. - * - * @see book_admin_edit_submit() - * - * @param $node - * The node of the top-level page in the book. - * - * @see book_admin_edit_validate() - * @see book_admin_edit_submit() - * @ingroup forms - */ -function book_admin_edit($form, $form_state, $node) { - drupal_set_title($node->title); - $form['#node'] = $node; - _book_admin_table($node, $form); - $form['save'] = array( - '#type' => 'submit', - '#value' => t('Save book pages'), - ); - - return $form; -} - -/** - * Form validation handler for book_admin_edit(). - * - * Checks that the book has not been changed while using the form. - * - * @see book_admin_edit_submit() - */ -function book_admin_edit_validate($form, &$form_state) { - if ($form_state['values']['tree_hash'] != $form_state['values']['tree_current_hash']) { - form_set_error('', t('This book has been modified by another user, the changes could not be saved.')); - } -} - -/** - * Form submission handler for book_admin_edit(). - * - * This function takes care to save parent menu items before their children. - * Saving menu items in the incorrect order can break the menu tree. - * - * @see book_admin_edit_validate() - * @see menu_overview_form_submit() - */ -function book_admin_edit_submit($form, &$form_state) { - // Save elements in the same order as defined in post rather than the form. - // This ensures parents are updated before their children, preventing orphans. - $order = array_flip(array_keys($form_state['input']['table'])); - $form['table'] = array_merge($order, $form['table']); - - foreach (element_children($form['table']) as $key) { - if ($form['table'][$key]['#item']) { - $row = $form['table'][$key]; - $values = $form_state['values']['table'][$key]; - - // Update menu item if moved. - if ($row['plid']['#default_value'] != $values['plid'] || $row['weight']['#default_value'] != $values['weight']) { - $row['#item']['plid'] = $values['plid']; - $row['#item']['weight'] = $values['weight']; - menu_link_save($row['#item']); - } - - // Update the title if changed. - if ($row['title']['#default_value'] != $values['title']) { - $node = node_load($values['nid']); - $langcode = LANGUAGE_NONE; - $node->title = $values['title']; - $node->book['link_title'] = $values['title']; - $node->revision = 1; - $node->log = t('Title changed from %original to %current.', array('%original' => $node->title, '%current' => $values['title'])); - - node_save($node); - watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/' . $node->nid)); - } - } - } - - drupal_set_message(t('Updated book %title.', array('%title' => $form['#node']->title))); -} - -/** - * Builds the table portion of the form for the book administration page. - * - * @param $node - * The node of the top-level page in the book. - * @param $form - * The form that is being modified, passed by reference. - * - * @see book_admin_edit() - */ -function _book_admin_table($node, &$form) { - $form['table'] = array( - '#theme' => 'book_admin_table', - '#tree' => TRUE, - ); - - $tree = book_menu_subtree_data($node->book); - $tree = array_shift($tree); // Do not include the book item itself. - if ($tree['below']) { - $hash = drupal_hash_base64(serialize($tree['below'])); - // Store the hash value as a hidden form element so that we can detect - // if another user changed the book hierarchy. - $form['tree_hash'] = array( - '#type' => 'hidden', - '#default_value' => $hash, - ); - $form['tree_current_hash'] = array( - '#type' => 'value', - '#value' => $hash, - ); - _book_admin_table_tree($tree['below'], $form['table']); - } - -} - -/** - * Helps build the main table in the book administration page form. - * - * @param $tree - * A subtree of the book menu hierarchy. - * @param $form - * The form that is being modified, passed by reference. - * - * @return - * The modified form array. - * - * @see book_admin_edit() - */ -function _book_admin_table_tree($tree, &$form) { - // The delta must be big enough to give each node a distinct value. - $count = count($tree); - $delta = ($count < 30) ? 15 : intval($count / 2) + 1; - - foreach ($tree as $data) { - $form['book-admin-' . $data['link']['nid']] = array( - '#item' => $data['link'], - 'nid' => array('#type' => 'value', '#value' => $data['link']['nid']), - 'depth' => array('#type' => 'value', '#value' => $data['link']['depth']), - 'href' => array('#type' => 'value', '#value' => $data['link']['href']), - 'title' => array( - '#type' => 'textfield', - '#default_value' => $data['link']['link_title'], - '#maxlength' => 255, - '#size' => 40, - ), - 'weight' => array( - '#type' => 'weight', - '#default_value' => $data['link']['weight'], - '#delta' => max($delta, abs($data['link']['weight'])), - '#title' => t('Weight for @title', array('@title' => $data['link']['title'])), - '#title_display' => 'invisible', - ), - 'plid' => array( - '#type' => 'hidden', - '#default_value' => $data['link']['plid'], - ), - 'mlid' => array( - '#type' => 'hidden', - '#default_value' => $data['link']['mlid'], - ), - ); - if ($data['below']) { - _book_admin_table_tree($data['below'], $form); - } - } - - return $form; -} - -/** - * Returns HTML for a book administration form. - * - * @param $variables - * An associative array containing: - * - form: A render element representing the form. - * - * @see book_admin_table() - * @ingroup themeable - */ -function theme_book_admin_table($variables) { - $form = $variables['form']; - - drupal_add_tabledrag('book-outline', 'match', 'parent', 'book-plid', 'book-plid', 'book-mlid', TRUE, MENU_MAX_DEPTH - 2); - drupal_add_tabledrag('book-outline', 'order', 'sibling', 'book-weight'); - - $header = array(t('Title'), t('Weight'), t('Parent'), array('data' => t('Operations'), 'colspan' => '3')); - - $rows = array(); - $destination = drupal_get_destination(); - $access = user_access('administer nodes'); - foreach (element_children($form) as $key) { - $nid = $form[$key]['nid']['#value']; - $href = $form[$key]['href']['#value']; - - // Add special classes to be used with tabledrag.js. - $form[$key]['plid']['#attributes']['class'] = array('book-plid'); - $form[$key]['mlid']['#attributes']['class'] = array('book-mlid'); - $form[$key]['weight']['#attributes']['class'] = array('book-weight'); - - $data = array( - theme('indentation', array('size' => $form[$key]['depth']['#value'] - 2)) . drupal_render($form[$key]['title']), - drupal_render($form[$key]['weight']), - drupal_render($form[$key]['plid']) . drupal_render($form[$key]['mlid']), - l(t('view'), $href), - $access ? l(t('edit'), 'node/' . $nid . '/edit', array('query' => $destination)) : ' ', - $access ? l(t('delete'), 'node/' . $nid . '/delete', array('query' => $destination) ) : ' ', - ); - $row = array('data' => $data); - if (isset($form[$key]['#attributes'])) { - $row = array_merge($row, $form[$key]['#attributes']); - } - $row['class'][] = 'draggable'; - $rows[] = $row; - } - - return theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'book-outline'), 'empty' => t('No book content available.'))); -} diff --git a/modules/book/book.css b/modules/book/book.css deleted file mode 100644 index 00e379e..0000000 --- a/modules/book/book.css +++ /dev/null @@ -1,58 +0,0 @@ - /** - * @file - * Styling for the Book module. - */ - -.book-navigation .menu { - border-top: 1px solid #888; - padding: 1em 0 0 3em; /* LTR */ -} -.book-navigation .page-links { - border-top: 1px solid #888; - border-bottom: 1px solid #888; - text-align: center; - padding: 0.5em; -} -.book-navigation .page-previous { - text-align: left; - width: 42%; - display: block; - float: left; /* LTR */ -} -.book-navigation .page-up { - margin: 0 5%; - width: 4%; - display: block; - float: left; /* LTR */ -} -.book-navigation .page-next { - text-align: right; - width: 42%; - display: block; - float: right; -} -#book-outline { - min-width: 56em; -} -.book-outline-form .form-item { - margin-top: 0; - margin-bottom: 0; -} -html.js #edit-book-pick-book { - display: none; -} -.form-item-book-bid .description { - clear: both; -} -#book-admin-edit select { - margin-right: 24px; -} -#book-admin-edit select.progress-disabled { - margin-right: 0; -} -#book-admin-edit tr.ajax-new-content { - background-color: #ffd; -} -#book-admin-edit .form-item { - float: left; -} diff --git a/modules/book/book.info b/modules/book/book.info deleted file mode 100644 index 2c7311f..0000000 --- a/modules/book/book.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Book -description = Allows users to create and organize related content in an outline. -package = Core -version = VERSION -core = 7.x -files[] = book.test -configure = admin/content/book/settings -stylesheets[all][] = book.css diff --git a/modules/book/book.install b/modules/book/book.install deleted file mode 100644 index 899ee81..0000000 --- a/modules/book/book.install +++ /dev/null @@ -1,95 +0,0 @@ -condition('module', 'book') - ->execute(); - menu_cache_clear_all(); -} - -/** - * Creates the book content type. - */ -function _book_install_type_create() { - // Create an additional node type. - $book_node_type = array( - 'type' => 'book', - 'name' => t('Book page'), - 'base' => 'node_content', - 'description' => t('Books have a built-in hierarchical navigation. Use for handbooks or tutorials.'), - 'custom' => 1, - 'modified' => 1, - 'locked' => 0, - ); - - $book_node_type = node_type_set_defaults($book_node_type); - node_type_save($book_node_type); - node_add_body_field($book_node_type); - // Default to not promoted. - variable_set('node_options_book', array('status')); - // Use this default type for adding content to books. - variable_set('book_allowed_types', array('book')); - variable_set('book_child_type', 'book'); -} - -/** - * Implements hook_schema(). - */ -function book_schema() { - $schema['book'] = array( - 'description' => 'Stores book outline information. Uniquely connects each node in the outline to a link in {menu_links}', - 'fields' => array( - 'mlid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => "The book page's {menu_links}.mlid.", - ), - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => "The book page's {node}.nid.", - ), - 'bid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => "The book ID is the {book}.nid of the top-level page.", - ), - ), - 'primary key' => array('mlid'), - 'unique keys' => array( - 'nid' => array('nid'), - ), - 'indexes' => array( - 'bid' => array('bid'), - ), - ); - - return $schema; -} diff --git a/modules/book/book.js b/modules/book/book.js deleted file mode 100644 index 64f4aee..0000000 --- a/modules/book/book.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @file - * Javascript behaviors for the Book module. - */ - -(function ($) { - -Drupal.behaviors.bookFieldsetSummaries = { - attach: function (context) { - $('fieldset.book-outline-form', context).drupalSetSummary(function (context) { - var $select = $('.form-item-book-bid select'); - var val = $select.val(); - - if (val === '0') { - return Drupal.t('Not in book'); - } - else if (val === 'new') { - return Drupal.t('New book'); - } - else { - return Drupal.checkPlain($select.find(':selected').text()); - } - }); - } -}; - -})(jQuery); diff --git a/modules/book/book.module b/modules/book/book.module deleted file mode 100644 index 7afed9a..0000000 --- a/modules/book/book.module +++ /dev/null @@ -1,1437 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Book module is used for creating structured, multi-page content, such as site resource guides, manuals, and wikis. It allows you to create content that has chapters, sections, subsections, or any similarly-tiered structure. For more information, see the online handbook entry for Book module.', array('@book' => 'http://drupal.org/documentation/modules/book/')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
' . t('The book module offers a means to organize a collection of related content pages, collectively known as a book. When viewed, this content automatically displays links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') . '
'; - case 'node/%/outline': - return '' . t('The outline feature allows you to include pages in the Book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array('@book' => url('book'), '@book-admin' => url('admin/content/book'))) . '
'; - } -} - -/** - * Implements hook_theme(). - */ -function book_theme() { - return array( - 'book_navigation' => array( - 'variables' => array('book_link' => NULL), - 'template' => 'book-navigation', - ), - 'book_export_html' => array( - 'variables' => array('title' => NULL, 'contents' => NULL, 'depth' => NULL), - 'template' => 'book-export-html', - ), - 'book_admin_table' => array( - 'render element' => 'form', - ), - 'book_title_link' => array( - 'variables' => array('link' => NULL), - ), - 'book_all_books_block' => array( - 'render element' => 'book_menus', - 'template' => 'book-all-books-block', - ), - 'book_node_export_html' => array( - 'variables' => array('node' => NULL, 'children' => NULL), - 'template' => 'book-node-export-html', - ), - ); -} - -/** - * Implements hook_permission(). - */ -function book_permission() { - return array( - 'administer book outlines' => array( - 'title' => t('Administer book outlines'), - ), - 'create new books' => array( - 'title' => t('Create new books'), - ), - 'add content to books' => array( - 'title' => t('Add content and child pages to books'), - ), - 'access printer-friendly version' => array( - 'title' => t('View printer-friendly books'), - 'description' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'), - ), - ); -} - -/** - * Adds relevant book links to the node's links. - * - * @param $node - * The book page node to add links to. - * @param $view_mode - * The view mode of the node. - */ -function book_node_view_link($node, $view_mode) { - $links = array(); - - if (isset($node->book['depth'])) { - if ($view_mode == 'full' && node_is_page($node)) { - $child_type = variable_get('book_child_type', 'book'); - if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status == 1 && $node->book['depth'] < MENU_MAX_DEPTH) { - $links['book_add_child'] = array( - 'title' => t('Add child page'), - 'href' => 'node/add/' . str_replace('_', '-', $child_type), - 'query' => array('parent' => $node->book['mlid']), - ); - } - - if (user_access('access printer-friendly version')) { - $links['book_printer'] = array( - 'title' => t('Printer-friendly version'), - 'href' => 'book/export/html/' . $node->nid, - 'attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.')) - ); - } - } - } - - if (!empty($links)) { - $node->content['links']['book'] = array( - '#theme' => 'links__node__book', - '#links' => $links, - '#attributes' => array('class' => array('links', 'inline')), - ); - } -} - -/** - * Implements hook_menu(). - */ -function book_menu() { - $items['admin/content/book'] = array( - 'title' => 'Books', - 'description' => "Manage your site's book outlines.", - 'page callback' => 'book_admin_overview', - 'access arguments' => array('administer book outlines'), - 'type' => MENU_LOCAL_TASK, - 'file' => 'book.admin.inc', - ); - $items['admin/content/book/list'] = array( - 'title' => 'List', - 'type' => MENU_DEFAULT_LOCAL_TASK, - ); - $items['admin/content/book/settings'] = array( - 'title' => 'Settings', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('book_admin_settings'), - 'access arguments' => array('administer site configuration'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 8, - 'file' => 'book.admin.inc', - ); - $items['admin/content/book/%node'] = array( - 'title' => 'Re-order book pages and change titles', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('book_admin_edit', 3), - 'access callback' => '_book_outline_access', - 'access arguments' => array(3), - 'type' => MENU_CALLBACK, - 'file' => 'book.admin.inc', - ); - $items['book'] = array( - 'title' => 'Books', - 'page callback' => 'book_render', - 'access arguments' => array('access content'), - 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'book.pages.inc', - ); - $items['book/export/%/%'] = array( - 'page callback' => 'book_export', - 'page arguments' => array(2, 3), - 'access arguments' => array('access printer-friendly version'), - 'type' => MENU_CALLBACK, - 'file' => 'book.pages.inc', - ); - $items['node/%node/outline'] = array( - 'title' => 'Outline', - 'page callback' => 'book_outline', - 'page arguments' => array(1), - 'access callback' => '_book_outline_access', - 'access arguments' => array(1), - 'type' => MENU_LOCAL_TASK, - 'weight' => 2, - 'file' => 'book.pages.inc', - ); - $items['node/%node/outline/remove'] = array( - 'title' => 'Remove from outline', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('book_remove_form', 1), - 'access callback' => '_book_outline_remove_access', - 'access arguments' => array(1), - 'file' => 'book.pages.inc', - ); - - return $items; -} - -/** - * Access callback: Determines if the outline tab is accessible. - * - * @param $node - * The node whose outline tab is to be viewed. - */ -function _book_outline_access($node) { - return user_access('administer book outlines') && node_access('view', $node); -} - -/** - * Access callback: Determines if the user can remove nodes from the outline. - * - * @param $node - * The node to remove from the outline. - * - * @see book_menu() - */ -function _book_outline_remove_access($node) { - return _book_node_is_removable($node) && _book_outline_access($node); -} - -/** - * Determines if a node can be removed from the book. - * - * A node can be removed from a book if it is actually in a book and it either - * is not a top-level page or is a top-level page with no children. - * - * @param $node - * The node to remove from the outline. - */ -function _book_node_is_removable($node) { - return (!empty($node->book['bid']) && (($node->book['bid'] != $node->nid) || !$node->book['has_children'])); -} - -/** - * Implements hook_admin_paths(). - */ -function book_admin_paths() { - if (variable_get('node_admin_theme')) { - $paths = array( - 'node/*/outline' => TRUE, - 'node/*/outline/remove' => TRUE, - ); - return $paths; - } -} - -/** - * Implements hook_entity_info_alter(). - */ -function book_entity_info_alter(&$info) { - // Add the 'Print' view mode for nodes. - $info['node']['view modes'] += array( - 'print' => array( - 'label' => t('Print'), - 'custom settings' => FALSE, - ), - ); -} - -/** - * Implements hook_block_info(). - */ -function book_block_info() { - $block = array(); - $block['navigation']['info'] = t('Book navigation'); - $block['navigation']['cache'] = DRUPAL_CACHE_PER_PAGE | DRUPAL_CACHE_PER_ROLE; - - return $block; -} - -/** - * Implements hook_block_view(). - * - * Displays the book table of contents in a block when the current page is a - * single-node view of a book node. - */ -function book_block_view($delta = '') { - $block = array(); - $current_bid = 0; - if ($node = menu_get_object()) { - $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid']; - } - - if (variable_get('book_block_mode', 'all pages') == 'all pages') { - $block['subject'] = t('Book navigation'); - $book_menus = array(); - $pseudo_tree = array(0 => array('below' => FALSE)); - foreach (book_get_books() as $book_id => $book) { - if ($book['bid'] == $current_bid) { - // If the current page is a node associated with a book, the menu - // needs to be retrieved. - $book_menus[$book_id] = menu_tree_output(menu_tree_all_data($node->book['menu_name'], $node->book)); - } - else { - // Since we know we will only display a link to the top node, there - // is no reason to run an additional menu tree query for each book. - $book['in_active_trail'] = FALSE; - // Check whether user can access the book link. - $book_node = node_load($book['nid']); - $book['access'] = node_access('view', $book_node); - $pseudo_tree[0]['link'] = $book; - $book_menus[$book_id] = menu_tree_output($pseudo_tree); - } - } - $book_menus['#theme'] = 'book_all_books_block'; - $block['content'] = $book_menus; - } - elseif ($current_bid) { - // Only display this block when the user is browsing a book. - $select = db_select('node', 'n') - ->fields('n', array('title')) - ->condition('n.nid', $node->book['bid']) - ->addTag('node_access'); - $title = $select->execute()->fetchField(); - // Only show the block if the user has view access for the top-level node. - if ($title) { - $tree = menu_tree_all_data($node->book['menu_name'], $node->book); - // There should only be one element at the top level. - $data = array_shift($tree); - $block['subject'] = theme('book_title_link', array('link' => $data['link'])); - $block['content'] = ($data['below']) ? menu_tree_output($data['below']) : ''; - } - } - - return $block; -} - -/** - * Implements hook_block_configure(). - */ -function book_block_configure($delta = '') { - $block = array(); - $options = array( - 'all pages' => t('Show block on all pages'), - 'book pages' => t('Show block only on book pages'), - ); - $form['book_block_mode'] = array( - '#type' => 'radios', - '#title' => t('Book navigation block display'), - '#options' => $options, - '#default_value' => variable_get('book_block_mode', 'all pages'), - '#description' => t("If Show block on all pages is selected, the block will contain the automatically generated menus for all of the site's books. If Show block only on book pages is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed. The Page specific visibility settings or other visibility settings can be used in addition to selectively display this block."), - ); - - return $form; -} - -/** - * Implements hook_block_save(). - */ -function book_block_save($delta = '', $edit = array()) { - $block = array(); - variable_set('book_block_mode', $edit['book_block_mode']); -} - -/** - * Returns HTML for a link to a book title when used as a block title. - * - * @param $variables - * An associative array containing: - * - link: An array containing title, href and options for the link. - * - * @ingroup themeable - */ -function theme_book_title_link($variables) { - $link = $variables['link']; - - $link['options']['attributes']['class'] = array('book-title'); - - return l($link['title'], $link['href'], $link['options']); -} - -/** - * Returns an array of all books. - * - * This list may be used for generating a list of all the books, or for building - * the options for a form select. - * - * @return - * An array of all books. - */ -function book_get_books() { - $all_books = &drupal_static(__FUNCTION__); - - if (!isset($all_books)) { - $all_books = array(); - $nids = db_query("SELECT DISTINCT(bid) FROM {book}")->fetchCol(); - - if ($nids) { - $query = db_select('book', 'b', array('fetch' => PDO::FETCH_ASSOC)); - $query->join('node', 'n', 'b.nid = n.nid'); - $query->join('menu_links', 'ml', 'b.mlid = ml.mlid'); - $query->addField('n', 'type', 'type'); - $query->addField('n', 'title', 'title'); - $query->fields('b'); - $query->fields('ml'); - $query->condition('n.nid', $nids, 'IN'); - $query->condition('n.status', 1); - $query->orderBy('ml.weight'); - $query->orderBy('ml.link_title'); - $query->addTag('node_access'); - $result2 = $query->execute(); - foreach ($result2 as $link) { - $link['href'] = $link['link_path']; - $link['options'] = unserialize($link['options']); - $all_books[$link['bid']] = $link; - } - } - } - - return $all_books; -} - -/** - * Implements hook_form_BASE_FORM_ID_alter() for node_form(). - * - * Adds the book fieldset to the node form. - * - * @see book_pick_book_nojs_submit() - */ -function book_form_node_form_alter(&$form, &$form_state, $form_id) { - $node = $form['#node']; - $access = user_access('administer book outlines'); - if (!$access) { - if (user_access('add content to books') && ((!empty($node->book['mlid']) && !empty($node->nid)) || book_type_is_allowed($node->type))) { - // Already in the book hierarchy, or this node type is allowed. - $access = TRUE; - } - } - - if ($access) { - _book_add_form_elements($form, $form_state, $node); - // Since the "Book" dropdown can't trigger a form submission when - // JavaScript is disabled, add a submit button to do that. book.css hides - // this button when JavaScript is enabled. - $form['book']['pick-book'] = array( - '#type' => 'submit', - '#value' => t('Change book (update list of parents)'), - '#submit' => array('book_pick_book_nojs_submit'), - '#weight' => 20, - ); - } -} - -/** - * Form submission handler for node_form(). - * - * This handler is run when JavaScript is disabled. It triggers the form to - * rebuild so that the "Parent item" options are changed to reflect the newly - * selected book. When JavaScript is enabled, the submit button that triggers - * this handler is hidden, and the "Book" dropdown directly triggers the - * book_form_update() Ajax callback instead. - * - * @see book_form_update() - * @see book_form_node_form_alter() - */ -function book_pick_book_nojs_submit($form, &$form_state) { - $form_state['node']->book = $form_state['values']['book']; - $form_state['rebuild'] = TRUE; -} - -/** - * Builds the parent selection form element for the node form or outline tab. - * - * This function is also called when generating a new set of options during the - * Ajax callback, so an array is returned that can be used to replace an - * existing form element. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - * - * @return - * A parent selection form element. - */ -function _book_parent_select($book_link) { - if (variable_get('menu_override_parent_selector', FALSE)) { - return array(); - } - // Offer a message or a drop-down to choose a different parent page. - $form = array( - '#type' => 'hidden', - '#value' => -1, - '#prefix' => '', - '#suffix' => '', - ); - - if ($book_link['nid'] === $book_link['bid']) { - // This is a book - at the top level. - if ($book_link['original_bid'] === $book_link['bid']) { - $form['#prefix'] .= '' . t('This is the top-level page in this book.') . ''; - } - else { - $form['#prefix'] .= '' . t('This will be the top-level page in this book.') . ''; - } - } - elseif (!$book_link['bid']) { - $form['#prefix'] .= '' . t('No book selected.') . ''; - } - else { - $form = array( - '#type' => 'select', - '#title' => t('Parent item'), - '#default_value' => $book_link['plid'], - '#description' => t('The parent page in the book. The maximum depth for a book and all child pages is !maxdepth. Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)), - '#options' => book_toc($book_link['bid'], $book_link['parent_depth_limit'], array($book_link['mlid'])), - '#attributes' => array('class' => array('book-title-select')), - '#prefix' => '', - '#suffix' => '', - ); - } - - return $form; -} - -/** - * Builds the common elements of the book form for the node and outline forms. - * - * @param $node - * The node whose form is being viewed. - */ -function _book_add_form_elements(&$form, &$form_state, $node) { - // If the form is being processed during the Ajax callback of our book bid - // dropdown, then $form_state will hold the value that was selected. - if (isset($form_state['values']['book'])) { - $node->book = $form_state['values']['book']; - } - - $form['book'] = array( - '#type' => 'fieldset', - '#title' => t('Book outline'), - '#weight' => 10, - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'additional_settings', - '#attributes' => array( - 'class' => array('book-outline-form'), - ), - '#attached' => array( - 'js' => array(drupal_get_path('module', 'book') . '/book.js'), - ), - '#tree' => TRUE, - ); - foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { - $form['book'][$key] = array( - '#type' => 'value', - '#value' => $node->book[$key], - ); - } - - $form['book']['plid'] = _book_parent_select($node->book); - - // @see _book_admin_table_tree(). The weight may be larger than 15. - $form['book']['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight'), - '#default_value' => $node->book['weight'], - '#delta' => max(15, abs($node->book['weight'])), - '#weight' => 5, - '#description' => t('Pages at a given level are ordered first by weight and then by title.'), - ); - $options = array(); - $nid = isset($node->nid) ? $node->nid : 'new'; - - if (isset($node->nid) && ($nid == $node->book['original_bid']) && ($node->book['parent_depth_limit'] == 0)) { - // This is the top level node in a maximum depth book and thus cannot be moved. - $options[$node->nid] = $node->title; - } - else { - foreach (book_get_books() as $book) { - $options[$book['nid']] = $book['title']; - } - } - - if (user_access('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) { - // The node can become a new book, if it is not one already. - $options = array($nid => '<' . t('create a new book') . '>') + $options; - } - if (!$node->book['mlid']) { - // The node is not currently in the hierarchy. - $options = array(0 => '<' . t('none') . '>') + $options; - } - - // Add a drop-down to select the destination book. - $form['book']['bid'] = array( - '#type' => 'select', - '#title' => t('Book'), - '#default_value' => $node->book['bid'], - '#options' => $options, - '#access' => (bool) $options, - '#description' => t('Your page will be a part of the selected book.'), - '#weight' => -5, - '#attributes' => array('class' => array('book-title-select')), - '#ajax' => array( - 'callback' => 'book_form_update', - 'wrapper' => 'edit-book-plid-wrapper', - 'effect' => 'fade', - 'speed' => 'fast', - ), - ); -} - -/** - * Renders a new parent page select element when the book selection changes. - * - * This function is called via Ajax when the selected book is changed on a node - * or book outline form. - * - * @return - * The rendered parent page select element. - */ -function book_form_update($form, $form_state) { - return $form['book']['plid']; -} - -/** - * Handles additions and updates to the book outline. - * - * This common helper function performs all additions and updates to the book - * outline through node addition, node editing, node deletion, or the outline - * tab. - * - * @param $node - * The node that is being saved, added, deleted, or moved. - * - * @return - * TRUE if the menu link was saved; FALSE otherwise. - */ -function _book_update_outline($node) { - if (empty($node->book['bid'])) { - return FALSE; - } - $new = empty($node->book['mlid']); - - $node->book['link_path'] = 'node/' . $node->nid; - $node->book['link_title'] = $node->title; - $node->book['parent_mismatch'] = FALSE; // The normal case. - - if ($node->book['bid'] == $node->nid) { - $node->book['plid'] = 0; - $node->book['menu_name'] = book_menu_name($node->nid); - } - else { - // Check in case the parent is not is this book; the book takes precedence. - if (!empty($node->book['plid'])) { - $parent = db_query("SELECT * FROM {book} WHERE mlid = :mlid", array( - ':mlid' => $node->book['plid'], - ))->fetchAssoc(); - } - if (empty($node->book['plid']) || !$parent || $parent['bid'] != $node->book['bid']) { - $node->book['plid'] = db_query("SELECT mlid FROM {book} WHERE nid = :nid", array( - ':nid' => $node->book['bid'], - ))->fetchField(); - $node->book['parent_mismatch'] = TRUE; // Likely when JS is disabled. - } - } - - if (menu_link_save($node->book)) { - if ($new) { - // Insert new. - db_insert('book') - ->fields(array( - 'nid' => $node->nid, - 'mlid' => $node->book['mlid'], - 'bid' => $node->book['bid'], - )) - ->execute(); - // Reset the cache of stored books. - drupal_static_reset('book_get_books'); - } - else { - if ($node->book['bid'] != db_query("SELECT bid FROM {book} WHERE nid = :nid", array( - ':nid' => $node->nid, - ))->fetchField()) { - // Update the bid for this page and all children. - book_update_bid($node->book); - // Reset the cache of stored books. - drupal_static_reset('book_get_books'); - } - } - - return TRUE; - } - - // Failed to save the menu link. - return FALSE; -} - -/** - * Updates the book ID of a page and its children when it moves to a new book. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - */ -function book_update_bid($book_link) { - $query = db_select('menu_links'); - $query->addField('menu_links', 'mlid'); - for ($i = 1; $i <= MENU_MAX_DEPTH && $book_link["p$i"]; $i++) { - $query->condition("p$i", $book_link["p$i"]); - } - $mlids = $query->execute()->fetchCol(); - - if ($mlids) { - db_update('book') - ->fields(array('bid' => $book_link['bid'])) - ->condition('mlid', $mlids, 'IN') - ->execute(); - } -} - -/** - * Gets the book menu tree for a page and returns it as a linear array. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - * - * @return - * A linear array of menu links in the order that the links are shown in the - * menu, so the previous and next pages are the elements before and after the - * element corresponding to the current node. The children of the current node - * (if any) will come immediately after it in the array, and links will only - * be fetched as deep as one level deeper than $book_link. - */ -function book_get_flat_menu($book_link) { - $flat = &drupal_static(__FUNCTION__, array()); - - if (!isset($flat[$book_link['mlid']])) { - // Call menu_tree_all_data() to take advantage of the menu system's caching. - $tree = menu_tree_all_data($book_link['menu_name'], $book_link, $book_link['depth'] + 1); - $flat[$book_link['mlid']] = array(); - _book_flatten_menu($tree, $flat[$book_link['mlid']]); - } - - return $flat[$book_link['mlid']]; -} - -/** - * Recursively converts a tree of menu links to a flat array. - * - * @param $tree - * A tree of menu links in an array. - * @param $flat - * A flat array of the menu links from $tree, passed by reference. - * - * @see book_get_flat_menu(). - */ -function _book_flatten_menu($tree, &$flat) { - foreach ($tree as $data) { - if (!$data['link']['hidden']) { - $flat[$data['link']['mlid']] = $data['link']; - if ($data['below']) { - _book_flatten_menu($data['below'], $flat); - } - } - } -} - -/** - * Fetches the menu link for the previous page of the book. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - * - * @return - * A fully loaded menu link for the page before the one represented in - * $book_link. - */ -function book_prev($book_link) { - // If the parent is zero, we are at the start of a book. - if ($book_link['plid'] == 0) { - return NULL; - } - $flat = book_get_flat_menu($book_link); - // Assigning the array to $flat resets the array pointer for use with each(). - $curr = NULL; - do { - $prev = $curr; - list($key, $curr) = each($flat); - } while ($key && $key != $book_link['mlid']); - - if ($key == $book_link['mlid']) { - // The previous page in the book may be a child of the previous visible link. - if ($prev['depth'] == $book_link['depth'] && $prev['has_children']) { - // The subtree will have only one link at the top level - get its data. - $tree = book_menu_subtree_data($prev); - $data = array_shift($tree); - // The link of interest is the last child - iterate to find the deepest one. - while ($data['below']) { - $data = end($data['below']); - } - - return $data['link']; - } - else { - return $prev; - } - } -} - -/** - * Fetches the menu link for the next page of the book. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - * - * @return - * A fully loaded menu link for the page after the one represented in - * $book_link. - */ -function book_next($book_link) { - $flat = book_get_flat_menu($book_link); - // Assigning the array to $flat resets the array pointer for use with each(). - do { - list($key, $curr) = each($flat); - } - while ($key && $key != $book_link['mlid']); - - if ($key == $book_link['mlid']) { - return current($flat); - } -} - -/** - * Formats the menu links for the child pages of the current page. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - * - * @return - * HTML for the links to the child pages of the current page. - */ -function book_children($book_link) { - $flat = book_get_flat_menu($book_link); - - $children = array(); - - if ($book_link['has_children']) { - // Walk through the array until we find the current page. - do { - $link = array_shift($flat); - } - while ($link && ($link['mlid'] != $book_link['mlid'])); - // Continue though the array and collect the links whose parent is this page. - while (($link = array_shift($flat)) && $link['plid'] == $book_link['mlid']) { - $data['link'] = $link; - $data['below'] = ''; - $children[] = $data; - } - } - - if ($children) { - $elements = menu_tree_output($children); - return drupal_render($elements); - } - return ''; -} - -/** - * Generates the corresponding menu name from a book ID. - * - * @param $bid - * The book ID for which to make a menu name. - * - * @return - * The menu name. - */ -function book_menu_name($bid) { - return 'book-toc-' . $bid; -} - -/** - * Implements hook_node_load(). - */ -function book_node_load($nodes, $types) { - $result = db_query("SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid IN (:nids)", array(':nids' => array_keys($nodes)), array('fetch' => PDO::FETCH_ASSOC)); - foreach ($result as $record) { - $nodes[$record['nid']]->book = $record; - $nodes[$record['nid']]->book['href'] = $record['link_path']; - $nodes[$record['nid']]->book['title'] = $record['link_title']; - $nodes[$record['nid']]->book['options'] = unserialize($record['options']); - } -} - -/** - * Implements hook_node_view(). - */ -function book_node_view($node, $view_mode) { - if ($view_mode == 'full') { - if (!empty($node->book['bid']) && empty($node->in_preview)) { - $node->content['book_navigation'] = array( - '#markup' => theme('book_navigation', array('book_link' => $node->book)), - '#weight' => 100, - ); - } - } - - if ($view_mode != 'rss') { - book_node_view_link($node, $view_mode); - } -} - -/** - * Implements hook_page_alter(). - * - * Adds the book menu to the list of menus used to build the active trail when - * viewing a book page. - */ -function book_page_alter(&$page) { - if (($node = menu_get_object()) && !empty($node->book['bid'])) { - $active_menus = menu_get_active_menu_names(); - $active_menus[] = $node->book['menu_name']; - menu_set_active_menu_names($active_menus); - } -} - -/** - * Implements hook_node_presave(). - */ -function book_node_presave($node) { - // Always save a revision for non-administrators. - if (!empty($node->book['bid']) && !user_access('administer nodes')) { - $node->revision = 1; - // The database schema requires a log message for every revision. - if (!isset($node->log)) { - $node->log = ''; - } - } - // Make sure a new node gets a new menu link. - if (empty($node->nid)) { - $node->book['mlid'] = NULL; - } -} - -/** - * Implements hook_node_insert(). - */ -function book_node_insert($node) { - if (!empty($node->book['bid'])) { - if ($node->book['bid'] == 'new') { - // New nodes that are their own book. - $node->book['bid'] = $node->nid; - } - $node->book['nid'] = $node->nid; - $node->book['menu_name'] = book_menu_name($node->book['bid']); - _book_update_outline($node); - } -} - -/** - * Implements hook_node_update(). - */ -function book_node_update($node) { - if (!empty($node->book['bid'])) { - if ($node->book['bid'] == 'new') { - // New nodes that are their own book. - $node->book['bid'] = $node->nid; - } - $node->book['nid'] = $node->nid; - $node->book['menu_name'] = book_menu_name($node->book['bid']); - _book_update_outline($node); - } -} - -/** - * Implements hook_node_delete(). - */ -function book_node_delete($node) { - if (!empty($node->book['bid'])) { - if ($node->nid == $node->book['bid']) { - // Handle deletion of a top-level post. - $result = db_query("SELECT b.nid FROM {menu_links} ml INNER JOIN {book} b on b.mlid = ml.mlid WHERE ml.plid = :plid", array( - ':plid' => $node->book['mlid'] - )); - foreach ($result as $child) { - $child_node = node_load($child->nid); - $child_node->book['bid'] = $child_node->nid; - _book_update_outline($child_node); - } - } - menu_link_delete($node->book['mlid']); - db_delete('book') - ->condition('mlid', $node->book['mlid']) - ->execute(); - drupal_static_reset('book_get_books'); - } -} - -/** - * Implements hook_node_prepare(). - */ -function book_node_prepare($node) { - // Prepare defaults for the add/edit form. - if (empty($node->book) && (user_access('add content to books') || user_access('administer book outlines'))) { - $node->book = array(); - - if (empty($node->nid) && isset($_GET['parent']) && is_numeric($_GET['parent'])) { - // Handle "Add child page" links: - $parent = book_link_load($_GET['parent']); - - if ($parent && $parent['access']) { - $node->book['bid'] = $parent['bid']; - $node->book['plid'] = $parent['mlid']; - $node->book['menu_name'] = $parent['menu_name']; - } - } - // Set defaults. - $node->book += _book_link_defaults(!empty($node->nid) ? $node->nid : 'new'); - } - else { - if (isset($node->book['bid']) && !isset($node->book['original_bid'])) { - $node->book['original_bid'] = $node->book['bid']; - } - } - // Find the depth limit for the parent select. - if (isset($node->book['bid']) && !isset($node->book['parent_depth_limit'])) { - $node->book['parent_depth_limit'] = _book_parent_depth_limit($node->book); - } -} - -/** - * Finds the depth limit for items in the parent select. - * - * @param $book_link - * A fully loaded menu link that is part of the book hierarchy. - * - * @return - * The depth limit for items in the parent select. - */ -function _book_parent_depth_limit($book_link) { - return MENU_MAX_DEPTH - 1 - (($book_link['mlid'] && $book_link['has_children']) ? menu_link_children_relative_depth($book_link) : 0); -} - -/** - * Implements hook_form_FORM_ID_alter() for node_delete_confirm(). - * - * Alters the confirm form for a single node deletion. - * - * @see node_delete_confirm() - */ -function book_form_node_delete_confirm_alter(&$form, $form_state) { - $node = node_load($form['nid']['#value']); - - if (isset($node->book) && $node->book['has_children']) { - $form['book_warning'] = array( - '#markup' => '' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) . '
', - '#weight' => -10, - ); - } -} - -/** - * Returns an array with default values for a book page's menu link. - * - * @param $nid - * The ID of the node whose menu link is being created. - * - * @return - * The default values for the menu link. - */ -function _book_link_defaults($nid) { - return array('original_bid' => 0, 'menu_name' => '', 'nid' => $nid, 'bid' => 0, 'router_path' => 'node/%', 'plid' => 0, 'mlid' => 0, 'has_children' => 0, 'weight' => 0, 'module' => 'book', 'options' => array()); -} - -/** - * Processes variables for book-all-books-block.tpl.php. - * - * All non-renderable elements are removed so that the template has full access - * to the structured data but can also simply iterate over all elements and - * render them (as in the default template). - * - * @param $variables - * An associative array containing the following key: - * - book_menus - * - * @see book-all-books-block.tpl.php - */ -function template_preprocess_book_all_books_block(&$variables) { - // Remove all non-renderable elements. - $elements = $variables['book_menus']; - $variables['book_menus'] = array(); - foreach (element_children($elements) as $index) { - $variables['book_menus'][$index] = $elements[$index]; - } -} - -/** - * Processes variables for book-navigation.tpl.php. - * - * @param $variables - * An associative array containing the following key: - * - book_link - * - * @see book-navigation.tpl.php - */ -function template_preprocess_book_navigation(&$variables) { - $book_link = $variables['book_link']; - - // Provide extra variables for themers. Not needed by default. - $variables['book_id'] = $book_link['bid']; - $variables['book_title'] = check_plain($book_link['link_title']); - $variables['book_url'] = 'node/' . $book_link['bid']; - $variables['current_depth'] = $book_link['depth']; - $variables['tree'] = ''; - - if ($book_link['mlid']) { - $variables['tree'] = book_children($book_link); - - if ($prev = book_prev($book_link)) { - $prev_href = url($prev['href']); - drupal_add_html_head_link(array('rel' => 'prev', 'href' => $prev_href)); - $variables['prev_url'] = $prev_href; - $variables['prev_title'] = check_plain($prev['title']); - } - - if ($book_link['plid'] && $parent = book_link_load($book_link['plid'])) { - $parent_href = url($parent['href']); - drupal_add_html_head_link(array('rel' => 'up', 'href' => $parent_href)); - $variables['parent_url'] = $parent_href; - $variables['parent_title'] = check_plain($parent['title']); - } - - if ($next = book_next($book_link)) { - $next_href = url($next['href']); - drupal_add_html_head_link(array('rel' => 'next', 'href' => $next_href)); - $variables['next_url'] = $next_href; - $variables['next_title'] = check_plain($next['title']); - } - } - - $variables['has_links'] = FALSE; - // Link variables to filter for values and set state of the flag variable. - $links = array('prev_url', 'prev_title', 'parent_url', 'parent_title', 'next_url', 'next_title'); - foreach ($links as $link) { - if (isset($variables[$link])) { - // Flag when there is a value. - $variables['has_links'] = TRUE; - } - else { - // Set empty to prevent notices. - $variables[$link] = ''; - } - } -} - -/** - * Recursively processes and formats menu items for book_toc(). - * - * This helper function recursively modifies the table of contents array for - * each item in the menu tree, ignoring items in the exclude array or at a depth - * greater than the limit. Truncates titles over thirty characters and appends - * an indentation string incremented by depth. - * - * @param $tree - * The data structure of the book's menu tree. Includes hidden links. - * @param $indent - * A string appended to each menu item title. Increments by '--' per depth - * level. - * @param $toc - * Reference to the table of contents array. This is modified in place, so the - * function does not have a return value. - * @param $exclude - * (optional) An array of menu link ID values. Any link whose menu link ID is - * in this array will be excluded (along with its children). Defaults to an - * empty array. - * @param $depth_limit - * Any link deeper than this value will be excluded (along with its children). - */ -function _book_toc_recurse($tree, $indent, &$toc, $exclude, $depth_limit) { - foreach ($tree as $data) { - if ($data['link']['depth'] > $depth_limit) { - // Don't iterate through any links on this level. - break; - } - - if (!in_array($data['link']['mlid'], $exclude)) { - $toc[$data['link']['mlid']] = $indent . ' ' . truncate_utf8($data['link']['title'], 30, TRUE, TRUE); - if ($data['below']) { - _book_toc_recurse($data['below'], $indent . '--', $toc, $exclude, $depth_limit); - } - } - } -} - -/** - * Returns an array of book pages in table of contents order. - * - * @param $bid - * The ID of the book whose pages are to be listed. - * @param $depth_limit - * Any link deeper than this value will be excluded (along with its children). - * @param $exclude - * Optional array of menu link ID values. Any link whose menu link ID is in - * this array will be excluded (along with its children). - * - * @return - * An array of (menu link ID, title) pairs for use as options for selecting a - * book page. - */ -function book_toc($bid, $depth_limit, $exclude = array()) { - $tree = menu_tree_all_data(book_menu_name($bid)); - $toc = array(); - _book_toc_recurse($tree, '', $toc, $exclude, $depth_limit); - - return $toc; -} - -/** - * Processes variables for book-export-html.tpl.php. - * - * @param $variables - * An associative array containing the following keys: - * - title - * - contents - * - depth - * - * @see book-export-html.tpl.php - */ -function template_preprocess_book_export_html(&$variables) { - global $base_url, $language; - - $variables['title'] = check_plain($variables['title']); - $variables['base_url'] = $base_url; - $variables['language'] = $language; - $variables['language_rtl'] = ($language->direction == LANGUAGE_RTL); - $variables['head'] = drupal_get_html_head(); - $variables['dir'] = $language->direction ? 'rtl' : 'ltr'; -} - -/** - * Traverses the book tree to build printable or exportable output. - * - * During the traversal, the $visit_func() callback is applied to each node and - * is called recursively for each child of the node (in weight, title order). - * - * @param $tree - * A subtree of the book menu hierarchy, rooted at the current page. - * @param $visit_func - * A function callback to be called upon visiting a node in the tree. - * - * @return - * The output generated in visiting each node. - */ -function book_export_traverse($tree, $visit_func) { - $output = ''; - - foreach ($tree as $data) { - // Note- access checking is already performed when building the tree. - if ($node = node_load($data['link']['nid'], FALSE)) { - $children = ''; - - if ($data['below']) { - $children = book_export_traverse($data['below'], $visit_func); - } - - if (function_exists($visit_func)) { - $output .= call_user_func($visit_func, $node, $children); - } - else { - // Use the default function. - $output .= book_node_export($node, $children); - } - } - } - - return $output; -} - -/** - * Generates printer-friendly HTML for a node. - * - * @param $node - * The node that will be output. - * @param $children - * (optional) All the rendered child nodes within the current node. Defaults - * to an empty string. - * - * @return - * The HTML generated for the given node. - * - * @see book_export_traverse() - */ -function book_node_export($node, $children = '') { - $build = node_view($node, 'print'); - unset($build['#theme']); - // @todo Rendering should happen in the template using render(). - $node->rendered = drupal_render($build); - - return theme('book_node_export_html', array('node' => $node, 'children' => $children)); -} - -/** - * Processes variables for book-node-export-html.tpl.php. - * - * @param $variables - * An associative array containing the following keys: - * - node - * - children - * - * @see book-node-export-html.tpl.php - */ -function template_preprocess_book_node_export_html(&$variables) { - $variables['depth'] = $variables['node']->book['depth']; - $variables['title'] = check_plain($variables['node']->title); - $variables['content'] = $variables['node']->rendered; -} - -/** - * Determine if a given node type is in the list of types allowed for books. - * - * @param $type - * A node type. - * - * @return - * A Boolean TRUE if the node type can be included in books; otherwise, FALSE. - */ -function book_type_is_allowed($type) { - return in_array($type, variable_get('book_allowed_types', array('book'))); -} - -/** - * Implements hook_node_type_update(). - * - * Updates the Book module's persistent variables if the machine-readable name - * of a node type is changed. - */ -function book_node_type_update($type) { - if (!empty($type->old_type) && $type->old_type != $type->type) { - // Update the list of node types that are allowed to be added to books. - $allowed_types = variable_get('book_allowed_types', array('book')); - $key = array_search($type->old_type, $allowed_types); - - if ($key !== FALSE) { - $allowed_types[$type->type] = $allowed_types[$key] ? $type->type : 0; - unset($allowed_types[$key]); - variable_set('book_allowed_types', $allowed_types); - } - - // Update the setting for the "Add child page" link. - if (variable_get('book_child_type', 'book') == $type->old_type) { - variable_set('book_child_type', $type->type); - } - } -} - -/** - * Gets a book menu link by its menu link ID. - * - * Like menu_link_load(), but adds additional data from the {book} table. - * - * Do not call when loading a node, since this function may call node_load(). - * - * @param $mlid - * The menu link ID of the menu item. - * - * @return - * A menu link, with the link translated for rendering and data added from the - * {book} table. FALSE if there is an error. - */ -function book_link_load($mlid) { - if ($item = db_query("SELECT * FROM {menu_links} ml INNER JOIN {book} b ON b.mlid = ml.mlid LEFT JOIN {menu_router} m ON m.path = ml.router_path WHERE ml.mlid = :mlid", array( - ':mlid' => $mlid, - ))->fetchAssoc()) { - _menu_link_translate($item); - return $item; - } - - return FALSE; -} - -/** - * Gets the data representing a subtree of the book hierarchy. - * - * The root of the subtree will be the link passed as a parameter, so the - * returned tree will contain this item and all its descendents in the menu - * tree. - * - * @param $link - * A fully loaded menu link. - * - * @return - * A subtree of menu links in an array, in the order they should be rendered. - */ -function book_menu_subtree_data($link) { - $tree = &drupal_static(__FUNCTION__, array()); - - // Generate a cache ID (cid) specific for this $menu_name and $link. - $cid = 'links:' . $link['menu_name'] . ':subtree-cid:' . $link['mlid']; - - if (!isset($tree[$cid])) { - $cache = cache_get($cid, 'cache_menu'); - - if ($cache && isset($cache->data)) { - // If the cache entry exists, it will just be the cid for the actual data. - // This avoids duplication of large amounts of data. - $cache = cache_get($cache->data, 'cache_menu'); - - if ($cache && isset($cache->data)) { - $data = $cache->data; - } - } - - // If the subtree data was not in the cache, $data will be NULL. - if (!isset($data)) { - $query = db_select('menu_links', 'ml', array('fetch' => PDO::FETCH_ASSOC)); - $query->join('menu_router', 'm', 'm.path = ml.router_path'); - $query->join('book', 'b', 'ml.mlid = b.mlid'); - $query->fields('b'); - $query->fields('m', array('load_functions', 'to_arg_functions', 'access_callback', 'access_arguments', 'page_callback', 'page_arguments', 'delivery_callback', 'title', 'title_callback', 'title_arguments', 'type')); - $query->fields('ml'); - $query->condition('menu_name', $link['menu_name']); - for ($i = 1; $i <= MENU_MAX_DEPTH && $link["p$i"]; ++$i) { - $query->condition("p$i", $link["p$i"]); - } - for ($i = 1; $i <= MENU_MAX_DEPTH; ++$i) { - $query->orderBy("p$i"); - } - $links = array(); - foreach ($query->execute() as $item) { - $links[] = $item; - } - $data['tree'] = menu_tree_data($links, array(), $link['depth']); - $data['node_links'] = array(); - menu_tree_collect_node_links($data['tree'], $data['node_links']); - // Compute the real cid for book subtree data. - $tree_cid = 'links:' . $item['menu_name'] . ':subtree-data:' . hash('sha256', serialize($data)); - // Cache the data, if it is not already in the cache. - - if (!cache_get($tree_cid, 'cache_menu')) { - cache_set($tree_cid, $data, 'cache_menu'); - } - // Cache the cid of the (shared) data using the menu and item-specific cid. - cache_set($cid, $tree_cid, 'cache_menu'); - } - // Check access for the current user to each item in the tree. - menu_tree_check_access($data['tree'], $data['node_links']); - $tree[$cid] = $data['tree']; - } - - return $tree[$cid]; -} diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc deleted file mode 100644 index ac4f357..0000000 --- a/modules/book/book.pages.inc +++ /dev/null @@ -1,247 +0,0 @@ - $book_list)); -} - -/** - * Menu callback; Generates representations of a book page and its children. - * - * The function delegates the generation of output to helper functions. The - * function name is derived by prepending 'book_export_' to the given output - * type. So, e.g., a type of 'html' results in a call to the function - * book_export_html(). - * - * @param $type - * A string encoding the type of output requested. The following types are - * currently supported in book module: - * - html: Printer-friendly HTML. - * Other types may be supported in contributed modules. - * @param $nid - * An integer representing the node id (nid) of the node to export - * - * @return - * A string representing the node and its children in the book hierarchy in a - * format determined by the $type parameter. - * - * @see book_menu() - */ -function book_export($type, $nid) { - // Check that the node exists and that the current user has access to it. - $node = node_load($nid); - if (!$node) { - return MENU_NOT_FOUND; - } - if (!node_access('view', $node)) { - return MENU_ACCESS_DENIED; - } - - $type = drupal_strtolower($type); - - $export_function = 'book_export_' . $type; - - if (function_exists($export_function)) { - print call_user_func($export_function, $nid); - } - else { - drupal_set_message(t('Unknown export format.')); - drupal_not_found(); - } -} - -/** - * Generates HTML for export when invoked by book_export(). - * - * The given node is embedded to its absolute depth in a top level section. For - * example, a child node with depth 2 in the hierarchy is contained in - * (otherwise empty)elements corresponding to depth 0 and depth 1. - * This is intended to support WYSIWYG output - e.g., level 3 sections always - * look like level 3 sections, no matter their depth relative to the node - * selected to be exported as printer-friendly HTML. - * - * @param $nid - * An integer representing the node id (nid) of the node to export. - * - * @return - * A string containing HTML representing the node and its children in - * the book hierarchy. - */ -function book_export_html($nid) { - if (user_access('access printer-friendly version')) { - $node = node_load($nid); - if (isset($node->book)) { - $tree = book_menu_subtree_data($node->book); - $contents = book_export_traverse($tree, 'book_node_export'); - return theme('book_export_html', array('title' => $node->title, 'contents' => $contents, 'depth' => $node->book['depth'])); - } - else { - drupal_not_found(); - } - } - else { - drupal_access_denied(); - } -} - -/** - * Menu callback: Shows the outline form for a single node. - * - * @param $node - * The book node for which to show the outline. - * - * @return string - * A HTML-formatted string with the outline form for a single node. - * - * @see book_menu() - */ -function book_outline($node) { - drupal_set_title($node->title); - return drupal_get_form('book_outline_form', $node); -} - -/** - * Form constructor for the book outline form. - * - * Allows handling of all book outline operations via the outline tab. - * - * @param $node - * The book node for which to show the outline. - * - * @see book_outline_form_submit() - * @see book_remove_button_submit() - * @ingroup forms - */ -function book_outline_form($form, &$form_state, $node) { - if (!isset($node->book)) { - // The node is not part of any book yet - set default options. - $node->book = _book_link_defaults($node->nid); - } - else { - $node->book['original_bid'] = $node->book['bid']; - } - - // Find the depth limit for the parent select. - if (!isset($node->book['parent_depth_limit'])) { - $node->book['parent_depth_limit'] = _book_parent_depth_limit($node->book); - } - $form['#node'] = $node; - $form['#id'] = 'book-outline'; - _book_add_form_elements($form, $form_state, $node); - - $form['book']['#collapsible'] = FALSE; - - $form['update'] = array( - '#type' => 'submit', - '#value' => $node->book['original_bid'] ? t('Update book outline') : t('Add to book outline'), - '#weight' => 15, - ); - - $form['remove'] = array( - '#type' => 'submit', - '#value' => t('Remove from book outline'), - '#access' => _book_node_is_removable($node), - '#weight' => 20, - '#submit' => array('book_remove_button_submit'), - ); - - return $form; -} - -/** - * Form submission handler for book_outline_form(). - * - * Redirects to removal confirmation form. - * - * @see book_outline_form_submit() - */ -function book_remove_button_submit($form, &$form_state) { - $form_state['redirect'] = 'node/' . $form['#node']->nid . '/outline/remove'; -} - -/** - * Form submission handler for book_outline_form(). - * - * @see book_remove_button_submit() - */ -function book_outline_form_submit($form, &$form_state) { - $node = $form['#node']; - $form_state['redirect'] = "node/" . $node->nid; - $book_link = $form_state['values']['book']; - if (!$book_link['bid']) { - drupal_set_message(t('No changes were made')); - - return; - } - - $book_link['menu_name'] = book_menu_name($book_link['bid']); - $node->book = $book_link; - if (_book_update_outline($node)) { - if ($node->book['parent_mismatch']) { - // This will usually only happen when JS is disabled. - drupal_set_message(t('The post has been added to the selected book. You may now position it relative to other pages.')); - $form_state['redirect'] = "node/" . $node->nid . "/outline"; - } - else { - drupal_set_message(t('The book outline has been updated.')); - } - } - else { - drupal_set_message(t('There was an error adding the post to the book.'), 'error'); - } -} - -/** - * Form constructor to confirm removal of a node from a book. - * - * @param $node - * The node to delete. - * - * @see book_remove_form_submit() - * @ingroup forms - */ -function book_remove_form($form, &$form_state, $node) { - $form['#node'] = $node; - $title = array('%title' => $node->title); - - if ($node->book['has_children']) { - $description = t('%title has associated child pages, which will be relocated automatically to maintain their connection to the book. To recreate the hierarchy (as it was before removing this page), %title may be added again using the Outline tab, and each of its former child pages will need to be relocated manually.', $title); - } - else { - $description = t('%title may be added to hierarchy again using the Outline tab.', $title); - } - - return confirm_form($form, t('Are you sure you want to remove %title from the book hierarchy?', $title), 'node/' . $node->nid, $description, t('Remove')); -} - -/** - * Form submission handler for book_remove_form(). - */ -function book_remove_form_submit($form, &$form_state) { - $node = $form['#node']; - if (_book_node_is_removable($node)) { - menu_link_delete($node->book['mlid']); - db_delete('book') - ->condition('nid', $node->nid) - ->execute(); - drupal_set_message(t('The post has been removed from the book.')); - } - $form_state['redirect'] = 'node/' . $node->nid; -} diff --git a/modules/book/book.test b/modules/book/book.test deleted file mode 100644 index 81f4524..0000000 --- a/modules/book/book.test +++ /dev/null @@ -1,398 +0,0 @@ - 'Book functionality', - 'description' => 'Create a book, add pages, and test book interface.', - 'group' => 'Book', - ); - } - - function setUp() { - parent::setUp(array('book', 'node_access_test')); - - // node_access_test requires a node_access_rebuild(). - node_access_rebuild(); - - // Create users. - $this->book_author = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books')); - $this->web_user = $this->drupalCreateUser(array('access printer-friendly version', 'node test view')); - $this->admin_user = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'node test view')); - } - - /** - * Creates a new book with a page hierarchy. - */ - function createBook() { - // Create new book. - $this->drupalLogin($this->book_author); - - $this->book = $this->createBookNode('new'); - $book = $this->book; - - /* - * Add page hierarchy to book. - * Book - * |- Node 0 - * |- Node 1 - * |- Node 2 - * |- Node 3 - * |- Node 4 - */ - $nodes = array(); - $nodes[] = $this->createBookNode($book->nid); // Node 0. - $nodes[] = $this->createBookNode($book->nid, $nodes[0]->book['mlid']); // Node 1. - $nodes[] = $this->createBookNode($book->nid, $nodes[0]->book['mlid']); // Node 2. - $nodes[] = $this->createBookNode($book->nid); // Node 3. - $nodes[] = $this->createBookNode($book->nid); // Node 4. - - $this->drupalLogout(); - - return $nodes; - } - - /** - * Tests book functionality through node interfaces. - */ - function testBook() { - // Create new book. - $nodes = $this->createBook(); - $book = $this->book; - - $this->drupalLogin($this->web_user); - - // Check that book pages display along with the correct outlines and - // previous/next links. - $this->checkBookNode($book, array($nodes[0], $nodes[3], $nodes[4]), FALSE, FALSE, $nodes[0], array()); - $this->checkBookNode($nodes[0], array($nodes[1], $nodes[2]), $book, $book, $nodes[1], array($book)); - $this->checkBookNode($nodes[1], NULL, $nodes[0], $nodes[0], $nodes[2], array($book, $nodes[0])); - $this->checkBookNode($nodes[2], NULL, $nodes[1], $nodes[0], $nodes[3], array($book, $nodes[0])); - $this->checkBookNode($nodes[3], NULL, $nodes[2], $book, $nodes[4], array($book)); - $this->checkBookNode($nodes[4], NULL, $nodes[3], $book, FALSE, array($book)); - - $this->drupalLogout(); - - // Create a second book, and move an existing book page into it. - $this->drupalLogin($this->book_author); - $other_book = $this->createBookNode('new'); - $node = $this->createBookNode($book->nid); - $edit = array('book[bid]' => $other_book->nid); - $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - - $this->drupalLogout(); - $this->drupalLogin($this->web_user); - - // Check that the nodes in the second book are displayed correctly. - // First we must set $this->book to the second book, so that the - // correct regex will be generated for testing the outline. - $this->book = $other_book; - $this->checkBookNode($other_book, array($node), FALSE, FALSE, $node, array()); - $this->checkBookNode($node, NULL, $other_book, $other_book, FALSE, array($other_book)); - } - - /** - * Checks the outline of sub-pages; previous, up, and next. - * - * Also checks the printer friendly version of the outline. - * - * @param $node - * Node to check. - * @param $nodes - * Nodes that should be in outline. - * @param $previous - * (optional) Previous link node. Defaults to FALSE. - * @param $up - * (optional) Up link node. Defaults to FALSE. - * @param $next - * (optional) Next link node. Defaults to FALSE. - * @param $breadcrumb - * The nodes that should be displayed in the breadcrumb. - */ - function checkBookNode($node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) { - // $number does not use drupal_static as it should not be reset - // since it uniquely identifies each call to checkBookNode(). - static $number = 0; - $this->drupalGet('node/' . $node->nid); - - // Check outline structure. - if ($nodes !== NULL) { - $this->assertPattern($this->generateOutlinePattern($nodes), format_string('Node %number outline confirmed.', array('%number' => $number))); - } - else { - $this->pass(format_string('Node %number does not have outline.', array('%number' => $number))); - } - - // Check previous, up, and next links. - if ($previous) { - $this->assertRaw(l('‹ ' . $previous->title, 'node/' . $previous->nid, array('attributes' => array('class' => array('page-previous'), 'title' => t('Go to previous page')))), 'Previous page link found.'); - } - - if ($up) { - $this->assertRaw(l('up', 'node/' . $up->nid, array('attributes' => array('class' => array('page-up'), 'title' => t('Go to parent page')))), 'Up page link found.'); - } - - if ($next) { - $this->assertRaw(l($next->title . ' ›', 'node/' . $next->nid, array('attributes' => array('class' => array('page-next'), 'title' => t('Go to next page')))), 'Next page link found.'); - } - - // Compute the expected breadcrumb. - $expected_breadcrumb = array(); - $expected_breadcrumb[] = url(''); - foreach ($breadcrumb as $a_node) { - $expected_breadcrumb[] = url('node/' . $a_node->nid); - } - - // Fetch links in the current breadcrumb. - $links = $this->xpath('//div[@class="breadcrumb"]/a'); - $got_breadcrumb = array(); - foreach ($links as $link) { - $got_breadcrumb[] = (string) $link['href']; - } - - // Compare expected and got breadcrumbs. - $this->assertIdentical($expected_breadcrumb, $got_breadcrumb, 'The breadcrumb is correctly displayed on the page.'); - - // Check printer friendly version. - $this->drupalGet('book/export/html/' . $node->nid); - $this->assertText($node->title, 'Printer friendly title found.'); - $this->assertRaw(check_markup($node->body[LANGUAGE_NONE][0]['value'], $node->body[LANGUAGE_NONE][0]['format']), 'Printer friendly body found.'); - - $number++; - } - - /** - * Creates a regular expression to check for the sub-nodes in the outline. - * - * @param array $nodes - * An array of nodes to check in outline. - * - * @return - * A regular expression that locates sub-nodes of the outline. - */ - function generateOutlinePattern($nodes) { - $outline = ''; - foreach ($nodes as $node) { - $outline .= '(node\/' . $node->nid . ')(.*?)(' . $node->title . ')(.*?)'; - } - - return '//s'; - } - - /** - * Creates a book node. - * - * @param $book_nid - * A book node ID or set to 'new' to create a new book. - * @param $parent - * (optional) Parent book reference ID. Defaults to NULL. - */ - function createBookNode($book_nid, $parent = NULL) { - // $number does not use drupal_static as it should not be reset - // since it uniquely identifies each call to createBookNode(). - static $number = 0; // Used to ensure that when sorted nodes stay in same order. - - $edit = array(); - $langcode = LANGUAGE_NONE; - $edit["title"] = $number . ' - SimpleTest test node ' . $this->randomName(10); - $edit["body[$langcode][0][value]"] = 'SimpleTest test body ' . $this->randomName(32) . ' ' . $this->randomName(32); - $edit['book[bid]'] = $book_nid; - - if ($parent !== NULL) { - $this->drupalPost('node/add/book', $edit, t('Change book (update list of parents)')); - - $edit['book[plid]'] = $parent; - $this->drupalPost(NULL, $edit, t('Save')); - } - else { - $this->drupalPost('node/add/book', $edit, t('Save')); - } - - // Check to make sure the book node was created. - $node = $this->drupalGetNodeByTitle($edit['title']); - $this->assertNotNull(($node === FALSE ? NULL : $node), 'Book node found in database.'); - $number++; - - return $node; - } - - /** - * Tests book export ("printer-friendly version") functionality. - */ - function testBookExport() { - // Create a book. - $nodes = $this->createBook(); - - // Login as web user and view printer-friendly version. - $this->drupalLogin($this->web_user); - $this->drupalGet('node/' . $this->book->nid); - $this->clickLink(t('Printer-friendly version')); - - // Make sure each part of the book is there. - foreach ($nodes as $node) { - $this->assertText($node->title, 'Node title found in printer friendly version.'); - $this->assertRaw(check_markup($node->body[LANGUAGE_NONE][0]['value'], $node->body[LANGUAGE_NONE][0]['format']), 'Node body found in printer friendly version.'); - } - - // Make sure we can't export an unsupported format. - $this->drupalGet('book/export/foobar/' . $this->book->nid); - $this->assertResponse('404', 'Unsupported export format returned "not found".'); - - // Make sure we get a 404 on a not existing book node. - $this->drupalGet('book/export/html/123'); - $this->assertResponse('404', 'Not existing book node returned "not found".'); - - // Make sure an anonymous user cannot view printer-friendly version. - $this->drupalLogout(); - - // Load the book and verify there is no printer-friendly version link. - $this->drupalGet('node/' . $this->book->nid); - $this->assertNoLink(t('Printer-friendly version'), 'Anonymous user is not shown link to printer-friendly version.'); - - // Try getting the URL directly, and verify it fails. - $this->drupalGet('book/export/html/' . $this->book->nid); - $this->assertResponse('403', 'Anonymous user properly forbidden.'); - - // Now grant anonymous users permission to view the printer-friendly - // version and verify that node access restrictions still prevent them from - // seeing it. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access printer-friendly version')); - $this->drupalGet('book/export/html/' . $this->book->nid); - $this->assertResponse('403', 'Anonymous user properly forbidden from seeing the printer-friendly version when denied by node access.'); - } - - /** - * Tests the functionality of the book navigation block. - */ - function testBookNavigationBlock() { - $this->drupalLogin($this->admin_user); - - // Set block title to confirm that the interface is available. - $block_title = $this->randomName(16); - $this->drupalPost('admin/structure/block/manage/book/navigation/configure', array('title' => $block_title), t('Save block')); - $this->assertText(t('The block configuration has been saved.'), 'Block configuration set.'); - - // Set the block to a region to confirm block is available. - $edit = array(); - $edit['blocks[book_navigation][region]'] = 'footer'; - $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); - $this->assertText(t('The block settings have been updated.'), 'Block successfully move to footer region.'); - - // Give anonymous users the permission 'node test view'. - $edit = array(); - $edit[DRUPAL_ANONYMOUS_RID . '[node test view]'] = TRUE; - $this->drupalPost('admin/people/permissions/' . DRUPAL_ANONYMOUS_RID, $edit, t('Save permissions')); - $this->assertText(t('The changes have been saved.'), "Permission 'node test view' successfully assigned to anonymous users."); - - // Test correct display of the block. - $nodes = $this->createBook(); - $this->drupalGet(''); - $this->assertText($block_title, 'Book navigation block is displayed.'); - $this->assertText($this->book->title, format_string('Link to book root (@title) is displayed.', array('@title' => $nodes[0]->title))); - $this->assertNoText($nodes[0]->title, 'No links to individual book pages are displayed.'); - } - - /** - * Tests the book navigation block when an access module is enabled. - */ - function testNavigationBlockOnAccessModuleEnabled() { - $this->drupalLogin($this->admin_user); - $edit = array(); - - // Set the block title. - $block_title = $this->randomName(16); - $edit['title'] = $block_title; - - // Set block display to 'Show block only on book pages'. - $edit['book_block_mode'] = 'book pages'; - $this->drupalPost('admin/structure/block/manage/book/navigation/configure', $edit, t('Save block')); - $this->assertText(t('The block configuration has been saved.'), 'Block configuration set.'); - - // Set the block to a region to confirm block is available. - $edit = array(); - $edit['blocks[book_navigation][region]'] = 'footer'; - $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); - $this->assertText(t('The block settings have been updated.'), 'Block successfully move to footer region.'); - - // Give anonymous users the permission 'node test view'. - $edit = array(); - $edit[DRUPAL_ANONYMOUS_RID . '[node test view]'] = TRUE; - $this->drupalPost('admin/people/permissions/' . DRUPAL_ANONYMOUS_RID, $edit, t('Save permissions')); - $this->assertText(t('The changes have been saved.'), "Permission 'node test view' successfully assigned to anonymous users."); - - // Create a book. - $this->createBook(); - - // Test correct display of the block to registered users. - $this->drupalLogin($this->web_user); - $this->drupalGet('node/' . $this->book->nid); - $this->assertText($block_title, 'Book navigation block is displayed to registered users.'); - $this->drupalLogout(); - - // Test correct display of the block to anonymous users. - $this->drupalGet('node/' . $this->book->nid); - $this->assertText($block_title, 'Book navigation block is displayed to anonymous users.'); - } - - /** - * Tests the access for deleting top-level book nodes. - */ - function testBookDelete() { - $nodes = $this->createBook(); - $this->drupalLogin($this->admin_user); - $edit = array(); - - // Test access to delete top-level and child book nodes. - $this->drupalGet('node/' . $this->book->nid . '/outline/remove'); - $this->assertResponse('403', 'Deleting top-level book node properly forbidden.'); - $this->drupalPost('node/' . $nodes[4]->nid . '/outline/remove', $edit, t('Remove')); - $node4 = node_load($nodes[4]->nid, NULL, TRUE); - $this->assertTrue(empty($node4->book), 'Deleting child book node properly allowed.'); - - // Delete all child book nodes and retest top-level node deletion. - foreach ($nodes as $node) { - $nids[] = $node->nid; - } - node_delete_multiple($nids); - $this->drupalPost('node/' . $this->book->nid . '/outline/remove', $edit, t('Remove')); - $node = node_load($this->book->nid, NULL, TRUE); - $this->assertTrue(empty($node->book), 'Deleting childless top-level book node properly allowed.'); - } -} diff --git a/modules/color/color-rtl.css b/modules/color/color-rtl.css deleted file mode 100644 index 07b754e..0000000 --- a/modules/color/color-rtl.css +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file - * Right-to-left specific stylesheet for the Color module. - */ - -#placeholder { - left: 0; - right: auto; -} - -/* Palette */ -.color-form .form-item { - padding-left: 0; - padding-right: 1em; -} -.color-form label { - float: right; - clear: right; -} -.color-form .form-text, -.color-form .form-select { - float: right; -} -.color-form .form-text { - margin-right: 0; - margin-left: 5px; -} -#palette .hook { - float: right; -} -#palette .down, -#palette .up, -#palette .both { - background: url(images/hook-rtl.png) no-repeat 0 0; -} -#palette .up { - background-position: 0 -27px; -} -#palette .both { - background-position: 0 -54px; -} -#palette .lock { - float: right; - right: -10px; -} -html.js #preview { - float: right; -} diff --git a/modules/color/color.css b/modules/color/color.css deleted file mode 100644 index 981cff8..0000000 --- a/modules/color/color.css +++ /dev/null @@ -1,85 +0,0 @@ -/** - * @file - * Stylesheet for the administration pages of the Color module. - */ - -/* Farbtastic placement */ -.color-form { - max-width: 50em; - position: relative; -} -#placeholder { - position: absolute; - top: 0; - right: 0; /* LTR */ -} - -/* Palette */ -.color-form .form-item { - height: 2em; - line-height: 2em; - padding-left: 1em; /* LTR */ - margin: 0.5em 0; -} -.color-form label { - float: left; /* LTR */ - clear: left; /* LTR */ - width: 10em; -} -.color-form .form-text, -.color-form .form-select { - float: left; /* LTR */ -} -.color-form .form-text { - text-align: center; - margin-right: 5px; /* LTR */ - cursor: pointer; -} - -#palette .hook { - float: left; /* LTR */ - margin-top: 3px; - width: 16px; - height: 16px; -} -#palette .down, -#palette .up, -#palette .both { - background: url(images/hook.png) no-repeat 100% 0; /* LTR */ -} -#palette .up { - background-position: 100% -27px; /* LTR */ -} -#palette .both { - background-position: 100% -54px; /* LTR */ -} - -#palette .lock { - float: left; /* LTR */ - position: relative; - top: -1.4em; - left: -10px; /* LTR */ - width: 20px; - height: 25px; - background: url(images/lock.png) no-repeat 50% 2px; - cursor: pointer; -} -#palette .unlocked { - background-position: 50% -22px; -} -#palette .form-item { - width: 20em; -} -#palette .item-selected { - background: #eee; -} - -/* Preview */ -#preview { - display: none; -} -html.js #preview { - display: block; - position: relative; - float: left; /* LTR */ -} diff --git a/modules/color/color.info b/modules/color/color.info deleted file mode 100644 index b1b862d..0000000 --- a/modules/color/color.info +++ /dev/null @@ -1,6 +0,0 @@ -name = Color -description = Allows administrators to change the color scheme of compatible themes. -package = Core -version = VERSION -core = 7.x -files[] = color.test diff --git a/modules/color/color.install b/modules/color/color.install deleted file mode 100644 index 3a9aea3..0000000 --- a/modules/color/color.install +++ /dev/null @@ -1,66 +0,0 @@ - $info['GD Version'], - ); - - // Check for PNG support. - if (function_exists('imagecreatefrompng')) { - $requirements['color_gd']['severity'] = REQUIREMENT_OK; - } - else { - $requirements['color_gd']['severity'] = REQUIREMENT_WARNING; - $requirements['color_gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')); - } - } - else { - $requirements['color_gd'] = array( - 'value' => t('Not installed'), - 'severity' => REQUIREMENT_ERROR, - 'description' => t('The GD library for PHP is missing or outdated. Check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/book.image.php')), - ); - } - $requirements['color_gd']['title'] = t('GD library PNG support'); - } - - return $requirements; -} - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Warn site administrator if unsafe CSS color codes are found in the database. - */ -function color_update_7001() { - $theme_palettes = db_query("SELECT name FROM {variable} WHERE name LIKE 'color_%_palette'")->fetchCol(); - foreach ($theme_palettes as $name) { - $palette = variable_get($name, array()); - foreach ($palette as $key => $color) { - if (!preg_match('/^#([a-f0-9]{3}){1,2}$/iD', $color)) { - drupal_set_message('Some of the custom CSS color codes specified via the color module are invalid. Please examine the themes which are making use of the color module at the Appearance settings page to verify their CSS color values.', 'warning'); - } - } - } -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ diff --git a/modules/color/color.js b/modules/color/color.js deleted file mode 100644 index d7e0664..0000000 --- a/modules/color/color.js +++ /dev/null @@ -1,250 +0,0 @@ -/** - * @file - * Attaches the behaviors for the Color module. - */ - -(function ($) { - -Drupal.behaviors.color = { - attach: function (context, settings) { - var i, j, colors, field_name; - // This behavior attaches by ID, so is only valid once on a page. - var form = $('#system-theme-settings .color-form', context).once('color'); - if (form.length == 0) { - return; - } - var inputs = []; - var hooks = []; - var locks = []; - var focused = null; - - // Add Farbtastic. - $(form).prepend('').addClass('color-processed'); - var farb = $.farbtastic('#placeholder'); - - // Decode reference colors to HSL. - var reference = settings.color.reference; - for (i in reference) { - reference[i] = farb.RGBToHSL(farb.unpack(reference[i])); - } - - // Build a preview. - var height = []; - var width = []; - // Loop through all defined gradients. - for (i in settings.gradients) { - // Add element to display the gradient. - $('#preview').once('color').append(''); - var gradient = $('#preview #gradient-' + i); - // Add height of current gradient to the list (divided by 10). - height.push(parseInt(gradient.css('height'), 10) / 10); - // Add width of current gradient to the list (divided by 10). - width.push(parseInt(gradient.css('width'), 10) / 10); - // Add rows (or columns for horizontal gradients). - // Each gradient line should have a height (or width for horizontal - // gradients) of 10px (because we divided the height/width by 10 above). - for (j = 0; j < (settings.gradients[i]['direction'] == 'vertical' ? height[i] : width[i]); ++j) { - gradient.append(''); - } - } - - // Fix preview background in IE6. - if (navigator.appVersion.match(/MSIE [0-6]\./)) { - var e = $('#preview #img')[0]; - var image = e.currentStyle.backgroundImage; - e.style.backgroundImage = 'none'; - e.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image.substring(5, image.length - 2) + "')"; - } - - // Set up colorScheme selector. - $('#edit-scheme', form).change(function () { - var schemes = settings.color.schemes, colorScheme = this.options[this.selectedIndex].value; - if (colorScheme != '' && schemes[colorScheme]) { - // Get colors of active scheme. - colors = schemes[colorScheme]; - for (field_name in colors) { - callback($('#edit-palette-' + field_name), colors[field_name], false, true); - } - preview(); - } - }); - - /** - * Renders the preview. - */ - function preview() { - Drupal.color.callback(context, settings, form, farb, height, width); - } - - /** - * Shifts a given color, using a reference pair (ref in HSL). - * - * This algorithm ensures relative ordering on the saturation and luminance - * axes is preserved, and performs a simple hue shift. - * - * It is also symmetrical. If: shift_color(c, a, b) == d, then - * shift_color(d, b, a) == c. - */ - function shift_color(given, ref1, ref2) { - // Convert to HSL. - given = farb.RGBToHSL(farb.unpack(given)); - - // Hue: apply delta. - given[0] += ref2[0] - ref1[0]; - - // Saturation: interpolate. - if (ref1[1] == 0 || ref2[1] == 0) { - given[1] = ref2[1]; - } - else { - var d = ref1[1] / ref2[1]; - if (d > 1) { - given[1] /= d; - } - else { - given[1] = 1 - (1 - given[1]) * d; - } - } - - // Luminance: interpolate. - if (ref1[2] == 0 || ref2[2] == 0) { - given[2] = ref2[2]; - } - else { - var d = ref1[2] / ref2[2]; - if (d > 1) { - given[2] /= d; - } - else { - given[2] = 1 - (1 - given[2]) * d; - } - } - - return farb.pack(farb.HSLToRGB(given)); - } - - /** - * Callback for Farbtastic when a new color is chosen. - */ - function callback(input, color, propagate, colorScheme) { - var matched; - // Set background/foreground colors. - $(input).css({ - backgroundColor: color, - 'color': farb.RGBToHSL(farb.unpack(color))[2] > 0.5 ? '#000' : '#fff' - }); - - // Change input value. - if ($(input).val() && $(input).val() != color) { - $(input).val(color); - - // Update locked values. - if (propagate) { - i = input.i; - for (j = i + 1; ; ++j) { - if (!locks[j - 1] || $(locks[j - 1]).is('.unlocked')) break; - matched = shift_color(color, reference[input.key], reference[inputs[j].key]); - callback(inputs[j], matched, false); - } - for (j = i - 1; ; --j) { - if (!locks[j] || $(locks[j]).is('.unlocked')) break; - matched = shift_color(color, reference[input.key], reference[inputs[j].key]); - callback(inputs[j], matched, false); - } - - // Update preview. - preview(); - } - - // Reset colorScheme selector. - if (!colorScheme) { - resetScheme(); - } - } - } - - /** - * Resets the color scheme selector. - */ - function resetScheme() { - $('#edit-scheme', form).each(function () { - this.selectedIndex = this.options.length - 1; - }); - } - - /** - * Focuses Farbtastic on a particular field. - */ - function focus() { - var input = this; - // Remove old bindings. - focused && $(focused).unbind('keyup', farb.updateValue) - .unbind('keyup', preview).unbind('keyup', resetScheme) - .parent().removeClass('item-selected'); - - // Add new bindings. - focused = this; - farb.linkTo(function (color) { callback(input, color, true, false); }); - farb.setColor(this.value); - $(focused).keyup(farb.updateValue).keyup(preview).keyup(resetScheme) - .parent().addClass('item-selected'); - } - - // Initialize color fields. - $('#palette input.form-text', form) - .each(function () { - // Extract palette field name - this.key = this.id.substring(13); - - // Link to color picker temporarily to initialize. - farb.linkTo(function () {}).setColor('#000').linkTo(this); - - // Add lock. - var i = inputs.length; - if (inputs.length) { - var lock = $('').toggle( - function () { - $(this).addClass('unlocked'); - $(hooks[i - 1]).attr('class', - locks[i - 2] && $(locks[i - 2]).is(':not(.unlocked)') ? 'hook up' : 'hook' - ); - $(hooks[i]).attr('class', - locks[i] && $(locks[i]).is(':not(.unlocked)') ? 'hook down' : 'hook' - ); - }, - function () { - $(this).removeClass('unlocked'); - $(hooks[i - 1]).attr('class', - locks[i - 2] && $(locks[i - 2]).is(':not(.unlocked)') ? 'hook both' : 'hook down' - ); - $(hooks[i]).attr('class', - locks[i] && $(locks[i]).is(':not(.unlocked)') ? 'hook both' : 'hook up' - ); - } - ); - $(this).after(lock); - locks.push(lock); - }; - - // Add hook. - var hook = $(''); - $(this).after(hook); - hooks.push(hook); - - $(this).parent().find('.lock').click(); - this.i = i; - inputs.push(this); - }) - .focus(focus); - - $('#palette label', form); - - // Focus first color. - focus.call(inputs[0]); - - // Render preview. - preview(); - } -}; - -})(jQuery); diff --git a/modules/color/color.test b/modules/color/color.test deleted file mode 100644 index 0904325..0000000 --- a/modules/color/color.test +++ /dev/null @@ -1,133 +0,0 @@ - 'Color functionality', - 'description' => 'Modify the Bartik and Garland theme colors and make sure the changes are reflected on the frontend', - 'group' => 'Color', - ); - } - - function setUp() { - parent::setUp('color'); - - // Create users. - $this->big_user = $this->drupalCreateUser(array('administer themes')); - - // This tests the color module in both Bartik and Garland. - $this->themes = array( - 'bartik' => array( - 'palette_input' => 'palette[bg]', - 'scheme' => 'slate', - 'scheme_color' => '#3b3b3b', - ), - 'garland' => array( - 'palette_input' => 'palette[link]', - 'scheme' => 'greenbeam', - 'scheme_color' => '#0c7a00', - ), - ); - theme_enable(array_keys($this->themes)); - - // Array filled with valid and not valid color values - $this->colorTests = array( - '#000' => TRUE, - '#123456' => TRUE, - '#abcdef' => TRUE, - '#0' => FALSE, - '#00' => FALSE, - '#0000' => FALSE, - '#00000' => FALSE, - '123456' => FALSE, - '#00000g' => FALSE, - ); - } - - /** - * Tests the Color module functionality. - */ - function testColor() { - foreach ($this->themes as $theme => $test_values) { - $this->_testColor($theme, $test_values); - } - } - - /** - * Tests the Color module functionality using the given theme. - */ - function _testColor($theme, $test_values) { - variable_set('theme_default', $theme); - $settings_path = 'admin/appearance/settings/' . $theme; - - $this->drupalLogin($this->big_user); - $this->drupalGet($settings_path); - $this->assertResponse(200); - $edit['scheme'] = ''; - $edit[$test_values['palette_input']] = '#123456'; - $this->drupalPost($settings_path, $edit, t('Save configuration')); - - $this->drupalGet(' '); - $stylesheets = variable_get('color_' . $theme . '_stylesheets', array()); - $this->assertPattern('|' . file_create_url($stylesheets[0]) . '|', 'Make sure the color stylesheet is included in the content. (' . $theme . ')'); - - $stylesheet_content = join("\n", file($stylesheets[0])); - $this->assertTrue(strpos($stylesheet_content, 'color: #123456') !== FALSE, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')'); - - $this->drupalGet($settings_path); - $this->assertResponse(200); - $edit['scheme'] = $test_values['scheme']; - $this->drupalPost($settings_path, $edit, t('Save configuration')); - - $this->drupalGet(' '); - $stylesheets = variable_get('color_' . $theme . '_stylesheets', array()); - $stylesheet_content = join("\n", file($stylesheets[0])); - $this->assertTrue(strpos($stylesheet_content, 'color: ' . $test_values['scheme_color']) !== FALSE, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')'); - - // Test with aggregated CSS turned on. - variable_set('preprocess_css', 1); - $this->drupalGet(' '); - $stylesheets = variable_get('drupal_css_cache_files', array()); - $stylesheet_content = ''; - foreach ($stylesheets as $key => $uri) { - $stylesheet_content .= join("\n", file(drupal_realpath($uri))); - } - $this->assertTrue(strpos($stylesheet_content, 'public://') === FALSE, 'Make sure the color paths have been translated to local paths. (' . $theme . ')'); - variable_set('preprocess_css', 0); - } - - /** - * Tests whether the provided color is valid. - */ - function testValidColor() { - variable_set('theme_default', 'bartik'); - $settings_path = 'admin/appearance/settings/bartik'; - - $this->drupalLogin($this->big_user); - $edit['scheme'] = ''; - - foreach ($this->colorTests as $color => $is_valid) { - $edit['palette[bg]'] = $color; - $this->drupalPost($settings_path, $edit, t('Save configuration')); - - if($is_valid) { - $this->assertText('The configuration options have been saved.'); - } - else { - $this->assertText('Main background must be a valid hexadecimal CSS color value.'); - } - } - } -} diff --git a/modules/color/images/hook-rtl.png b/modules/color/images/hook-rtl.png deleted file mode 100644 index a26b211..0000000 Binary files a/modules/color/images/hook-rtl.png and /dev/null differ diff --git a/modules/color/images/hook.png b/modules/color/images/hook.png deleted file mode 100644 index dc18973..0000000 Binary files a/modules/color/images/hook.png and /dev/null differ diff --git a/modules/color/images/lock.png b/modules/color/images/lock.png deleted file mode 100644 index 9e1e00e..0000000 Binary files a/modules/color/images/lock.png and /dev/null differ diff --git a/modules/color/preview.html b/modules/color/preview.html deleted file mode 100644 index e25b7ad..0000000 --- a/modules/color/preview.html +++ /dev/null @@ -1,7 +0,0 @@ - -\ No newline at end of file diff --git a/modules/color/preview.js b/modules/color/preview.js deleted file mode 100644 index 67eef0b..0000000 --- a/modules/color/preview.js +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file - * Attaches preview-related behavior for the Color module. - */ - -(function ($) { - Drupal.color = { - callback: function(context, settings, form, farb, height, width) { - // Solid background. - $('#preview', form).css('backgroundColor', $('#palette input[name="palette[base]"]', form).val()); - - // Text preview - $('#text', form).css('color', $('#palette input[name="palette[text]"]', form).val()); - $('#text a, #text h2', form).css('color', $('#palette input[name="palette[link]"]', form).val()); - - // Set up gradients if there are some. - var color_start, color_end; - for (i in settings.gradients) { - color_start = farb.unpack($('#palette input[name="palette[' + settings.gradients[i]['colors'][0] + ']"]', form).val()); - color_end = farb.unpack($('#palette input[name="palette[' + settings.gradients[i]['colors'][1] + ']"]', form).val()); - if (color_start && color_end) { - var delta = []; - for (j in color_start) { - delta[j] = (color_end[j] - color_start[j]) / (settings.gradients[i]['vertical'] ? height[i] : width[i]); - } - var accum = color_start; - // Render gradient lines. - $('#gradient-' + i + ' > div', form).each(function () { - for (j in accum) { - accum[j] += delta[j]; - } - this.style.backgroundColor = farb.pack(accum); - }); - } - } - } - }; -})(jQuery); diff --git a/modules/comment/comment-node-form.js b/modules/comment/comment-node-form.js deleted file mode 100644 index 76db240..0000000 --- a/modules/comment/comment-node-form.js +++ /dev/null @@ -1,32 +0,0 @@ - -(function ($) { - -Drupal.behaviors.commentFieldsetSummaries = { - attach: function (context) { - $('fieldset.comment-node-settings-form', context).drupalSetSummary(function (context) { - return Drupal.checkPlain($('.form-item-comment input:checked', context).next('label').text()); - }); - - // Provide the summary for the node type form. - $('fieldset.comment-node-type-settings-form', context).drupalSetSummary(function(context) { - var vals = []; - - // Default comment setting. - vals.push($(".form-item-comment select option:selected", context).text()); - - // Threading. - var threading = $(".form-item-comment-default-mode input:checked", context).next('label').text(); - if (threading) { - vals.push(threading); - } - - // Comments per page. - var number = $(".form-item-comment-default-per-page select option:selected", context).val(); - vals.push(Drupal.t('@number comments per page', {'@number': number})); - - return Drupal.checkPlain(vals.join(', ')); - }); - } -}; - -})(jQuery); diff --git a/modules/comment/comment-rtl.css b/modules/comment/comment-rtl.css deleted file mode 100644 index 39c3929..0000000 --- a/modules/comment/comment-rtl.css +++ /dev/null @@ -1,5 +0,0 @@ - -.indented { - margin-left: 0; - margin-right: 25px; -} diff --git a/modules/comment/comment-wrapper.tpl.php b/modules/comment/comment-wrapper.tpl.php deleted file mode 100644 index c691459..0000000 --- a/modules/comment/comment-wrapper.tpl.php +++ /dev/null @@ -1,52 +0,0 @@ - --- -Lorem ipsum dolor
-Sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-> - type != 'forum'): ?> - - - - - - - - - - - -diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc deleted file mode 100644 index 43b53e2..0000000 --- a/modules/comment/comment.admin.inc +++ /dev/null @@ -1,284 +0,0 @@ - 'fieldset', - '#title' => t('Update options'), - '#attributes' => array('class' => array('container-inline')), - ); - - if ($arg == 'approval') { - $options['publish'] = t('Publish the selected comments'); - } - else { - $options['unpublish'] = t('Unpublish the selected comments'); - } - $options['delete'] = t('Delete the selected comments'); - - $form['options']['operation'] = array( - '#type' => 'select', - '#title' => t('Operation'), - '#title_display' => 'invisible', - '#options' => $options, - '#default_value' => 'publish', - ); - $form['options']['submit'] = array( - '#type' => 'submit', - '#value' => t('Update'), - ); - - // Load the comments that need to be displayed. - $status = ($arg == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED; - $header = array( - 'subject' => array('data' => t('Subject'), 'field' => 'subject'), - 'author' => array('data' => t('Author'), 'field' => 'name'), - 'posted_in' => array('data' => t('Posted in'), 'field' => 'node_title'), - 'changed' => array('data' => t('Updated'), 'field' => 'c.changed', 'sort' => 'desc'), - 'operations' => array('data' => t('Operations')), - ); - - $query = db_select('comment', 'c')->extend('PagerDefault')->extend('TableSort'); - $query->join('node', 'n', 'n.nid = c.nid'); - $query->addField('n', 'title', 'node_title'); - $query->addTag('node_access'); - $result = $query - ->fields('c', array('cid', 'subject', 'name', 'changed')) - ->condition('c.status', $status) - ->limit(50) - ->orderByHeader($header) - ->execute(); - - $cids = array(); - - // We collect a sorted list of node_titles during the query to attach to the - // comments later. - foreach ($result as $row) { - $cids[] = $row->cid; - $node_titles[] = $row->node_title; - } - $comments = comment_load_multiple($cids); - - // Build a table listing the appropriate comments. - $options = array(); - $destination = drupal_get_destination(); - - foreach ($comments as $comment) { - // Remove the first node title from the node_titles array and attach to - // the comment. - $comment->node_title = array_shift($node_titles); - $comment_body = field_get_items('comment', $comment, 'comment_body'); - $options[$comment->cid] = array( - 'subject' => array( - 'data' => array( - '#type' => 'link', - '#title' => $comment->subject, - '#href' => 'comment/' . $comment->cid, - '#options' => array('attributes' => array('title' => truncate_utf8($comment_body[0]['value'], 128)), 'fragment' => 'comment-' . $comment->cid), - ), - ), - 'author' => theme('username', array('account' => $comment)), - 'posted_in' => array( - 'data' => array( - '#type' => 'link', - '#title' => $comment->node_title, - '#href' => 'node/' . $comment->nid, - ), - ), - 'changed' => format_date($comment->changed, 'short'), - 'operations' => array( - 'data' => array( - '#type' => 'link', - '#title' => t('edit'), - '#href' => 'comment/' . $comment->cid . '/edit', - '#options' => array('query' => $destination), - ), - ), - ); - } - - $form['comments'] = array( - '#type' => 'tableselect', - '#header' => $header, - '#options' => $options, - '#empty' => t('No comments available.'), - ); - - $form['pager'] = array('#theme' => 'pager'); - - return $form; -} - -/** - * Validate comment_admin_overview form submissions. - */ -function comment_admin_overview_validate($form, &$form_state) { - $form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0)); - // We can't execute any 'Update options' if no comments were selected. - if (count($form_state['values']['comments']) == 0) { - form_set_error('', t('Select one or more comments to perform the update on.')); - } -} - -/** - * Process comment_admin_overview form submissions. - * - * Execute the chosen 'Update option' on the selected comments, such as - * publishing, unpublishing or deleting. - */ -function comment_admin_overview_submit($form, &$form_state) { - $operation = $form_state['values']['operation']; - $cids = $form_state['values']['comments']; - - if ($operation == 'delete') { - comment_delete_multiple($cids); - } - else { - foreach ($cids as $cid => $value) { - $comment = comment_load($value); - - if ($operation == 'unpublish') { - $comment->status = COMMENT_NOT_PUBLISHED; - } - elseif ($operation == 'publish') { - $comment->status = COMMENT_PUBLISHED; - } - comment_save($comment); - } - } - drupal_set_message(t('The update has been performed.')); - $form_state['redirect'] = 'admin/content/comment'; - cache_clear_all(); -} - -/** - * List the selected comments and verify that the admin wants to delete them. - * - * @param $form_state - * An associative array containing the current state of the form. - * @return - * TRUE if the comments should be deleted, FALSE otherwise. - * @ingroup forms - * @see comment_multiple_delete_confirm_submit() - */ -function comment_multiple_delete_confirm($form, &$form_state) { - $edit = $form_state['input']; - - $form['comments'] = array( - '#prefix' => '- ',
- '#suffix' => '
> - - - - - - - -diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc deleted file mode 100644 index 4648fd3..0000000 --- a/modules/contact/contact.admin.inc +++ /dev/null @@ -1,228 +0,0 @@ - t('Operations'), 'colspan' => 2), - ); - $rows = array(); - - // Get all the contact categories from the database. - $categories = db_select('contact', 'c') - ->addTag('translatable') - ->fields('c', array('cid', 'category', 'recipients', 'selected')) - ->orderBy('weight') - ->orderBy('category') - ->execute() - ->fetchAll(); - - // Loop through the categories and add them to the table. - foreach ($categories as $category) { - $rows[] = array( - check_plain($category->category), - check_plain($category->recipients), - ($category->selected ? t('Yes') : t('No')), - l(t('Edit'), 'admin/structure/contact/edit/' . $category->cid), - l(t('Delete'), 'admin/structure/contact/delete/' . $category->cid), - ); - } - - if (!$rows) { - $rows[] = array(array( - 'data' => t('No categories available.'), - 'colspan' => 5, - )); - } - - $build['category_table'] = array( - '#theme' => 'table', - '#header' => $header, - '#rows' => $rows, - ); - return $build; -} - -/** - * Form constructor for the category edit form. - * - * @param $category - * An array describing the category to be edited. May be empty for new - * categories. Recognized array keys are: - * - category: The name of the category. - * - recipients: A comma-separated list of recipients. - * - reply: (optional) The body of the auto-reply message. - * - weight: The weight of the category. - * - selected: Boolean indicating whether the category should be selected by - * default. - * - cid: The category ID for which the form is to be displayed. - * - * @see contact_category_edit_form_validate() - * @see contact_category_edit_form_submit() - * @ingroup forms - */ -function contact_category_edit_form($form, &$form_state, array $category = array()) { - // If this is a new category, add the default values. - $category += array( - 'category' => '', - 'recipients' => '', - 'reply' => '', - 'weight' => 0, - 'selected' => 0, - 'cid' => NULL, - ); - - $form['category'] = array( - '#type' => 'textfield', - '#title' => t('Category'), - '#maxlength' => 255, - '#default_value' => $category['category'], - '#description' => t("Example: 'website feedback' or 'product information'."), - '#required' => TRUE, - ); - $form['recipients'] = array( - '#type' => 'textarea', - '#title' => t('Recipients'), - '#default_value' => $category['recipients'], - '#description' => t("Example: 'webmaster@example.com' or 'sales@example.com,support@example.com' . To specify multiple recipients, separate each e-mail address with a comma."), - '#required' => TRUE, - ); - $form['reply'] = array( - '#type' => 'textarea', - '#title' => t('Auto-reply'), - '#default_value' => $category['reply'], - '#description' => t('Optional auto-reply. Leave empty if you do not want to send the user an auto-reply message.'), - ); - $form['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight'), - '#default_value' => $category['weight'], - '#description' => t('When listing categories, those with lighter (smaller) weights get listed before categories with heavier (larger) weights. Categories with equal weights are sorted alphabetically.'), - ); - $form['selected'] = array( - '#type' => 'select', - '#title' => t('Selected'), - '#options' => array( - 0 => t('No'), - 1 => t('Yes'), - ), - '#default_value' => $category['selected'], - '#description' => t('Set this to Yes if you would like this category to be selected by default.'), - ); - $form['cid'] = array( - '#type' => 'value', - '#value' => $category['cid'], - ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save'), - ); - - return $form; -} - -/** - * Form validation handler for contact_category_edit_form(). - * - * @see contact_category_edit_form_submit() - */ -function contact_category_edit_form_validate($form, &$form_state) { - // Validate and each e-mail recipient. - $recipients = explode(',', $form_state['values']['recipients']); - - // When creating a new contact form, or renaming the category on an existing - // contact form, make sure that the given category is unique. - $category = $form_state['values']['category']; - $query = db_select('contact', 'c')->condition('c.category', $category, '='); - if (!empty($form_state['values']['cid'])) { - $query->condition('c.cid', $form_state['values']['cid'], '<>'); - } - if ($query->countQuery()->execute()->fetchField()) { - form_set_error('category', t('A contact form with category %category already exists.', array('%category' => $category))); - } - - foreach ($recipients as &$recipient) { - $recipient = trim($recipient); - if (!valid_email_address($recipient)) { - form_set_error('recipients', t('%recipient is an invalid e-mail address.', array('%recipient' => $recipient))); - } - } - $form_state['values']['recipients'] = implode(',', $recipients); -} - -/** - * Form submission handler for contact_category_edit_form(). - * - * @see contact_category_edit_form_validate() - */ -function contact_category_edit_form_submit($form, &$form_state) { - if ($form_state['values']['selected']) { - // Unselect all other contact categories. - db_update('contact') - ->fields(array('selected' => '0')) - ->execute(); - } - - if (empty($form_state['values']['cid'])) { - drupal_write_record('contact', $form_state['values']); - } - else { - drupal_write_record('contact', $form_state['values'], array('cid')); - } - - drupal_set_message(t('Category %category has been saved.', array('%category' => $form_state['values']['category']))); - watchdog('contact', 'Category %category has been saved.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('Edit'), 'admin/structure/contact/edit/' . $form_state['values']['cid'])); - $form_state['redirect'] = 'admin/structure/contact'; -} - -/** - * Form constructor for the contact category deletion form. - * - * @param $contact - * Array describing the contact category to be deleted. See the documentation - * of contact_category_edit_form() for the recognized keys. - * - * @see contact_menu() - * @see contact_category_delete_form_submit() - */ -function contact_category_delete_form($form, &$form_state, array $contact) { - $form['contact'] = array( - '#type' => 'value', - '#value' => $contact, - ); - - return confirm_form( - $form, - t('Are you sure you want to delete %category?', array('%category' => $contact['category'])), - 'admin/structure/contact', - t('This action cannot be undone.'), - t('Delete'), - t('Cancel') - ); -} - -/** - * Form submission handler for contact_category_delete_form(). - */ -function contact_category_delete_form_submit($form, &$form_state) { - $contact = $form['contact']['#value']; - - db_delete('contact') - ->condition('cid', $contact['cid']) - ->execute(); - - drupal_set_message(t('Category %category has been deleted.', array('%category' => $contact['category']))); - watchdog('contact', 'Category %category has been deleted.', array('%category' => $contact['category']), WATCHDOG_NOTICE); - - $form_state['redirect'] = 'admin/structure/contact'; -} diff --git a/modules/contact/contact.info b/modules/contact/contact.info deleted file mode 100644 index 9430045..0000000 --- a/modules/contact/contact.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Contact -description = Enables the use of both personal and site-wide contact forms. -package = Core -version = VERSION -core = 7.x -files[] = contact.test -configure = admin/structure/contact diff --git a/modules/contact/contact.install b/modules/contact/contact.install deleted file mode 100644 index fba5cfd..0000000 --- a/modules/contact/contact.install +++ /dev/null @@ -1,168 +0,0 @@ - 'Contact form category settings.', - 'fields' => array( - 'cid' => array( - 'type' => 'serial', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => 'Primary Key: Unique category ID.', - ), - 'category' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Category name.', - 'translatable' => TRUE, - ), - 'recipients' => array( - 'type' => 'text', - 'not null' => TRUE, - 'size' => 'big', - 'description' => 'Comma-separated list of recipient e-mail addresses.', - ), - 'reply' => array( - 'type' => 'text', - 'not null' => TRUE, - 'size' => 'big', - 'description' => 'Text of the auto-reply message.', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => "The category's weight.", - ), - 'selected' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Flag to indicate whether or not category is selected by default. (1 = Yes, 0 = No)', - ), - ), - 'primary key' => array('cid'), - 'unique keys' => array( - 'category' => array('category'), - ), - 'indexes' => array( - 'list' => array('weight', 'category'), - ), - ); - - return $schema; -} - -/** - * Implements hook_install(). - */ -function contact_install() { - // Insert a default contact category. - db_insert('contact') - ->fields(array( - 'category' => 'Website feedback', - 'recipients' => variable_get('site_mail', ini_get('sendmail_from')), - 'selected' => 1, - 'reply' => '', - )) - ->execute(); -} - -/** - * Implements hook_uninstall(). - */ -function contact_uninstall() { - variable_del('contact_default_status'); - variable_del('contact_threshold_limit'); - variable_del('contact_threshold_window'); -} - -/** - * Implements hook_update_dependencies(). - */ -function contact_update_dependencies() { - // contact_update_7001() relies on the {role_permission} table being updated - // to the new format and filled with data. - $dependencies['contact'][7001] = array( - 'system' => 7007, - ); - - // contact_update_7002() relies on the {role_permission} table having the - // module field, which is created in user_update_7006(). - $dependencies['contact'][7002] = array( - 'user' => 7006, - ); - - return $dependencies; -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Rename the threshold limit variable. - */ -function contact_update_7000() { - variable_set('contact_threshold_limit', variable_get('contact_hourly_threshold', 5)); - variable_del('contact_hourly_threshold'); -} - -/** - * Rename the administer contact forms permission. - */ -function contact_update_7001() { - db_update('role_permission') - ->fields(array('permission' => 'administer contact forms')) - ->condition('permission', 'administer site-wide contact form') - ->execute(); -} - -/** - * Enable the 'access user contact forms' for registered users by default. - */ -function contact_update_7002() { - // Do not use user_role_grant_permission() since it relies on - // hook_permission(), which will not run for contact module if it is - // disabled. - db_merge('role_permission') - ->key(array( - 'rid' => DRUPAL_AUTHENTICATED_RID, - 'permission' => 'access user contact forms', - 'module' => 'contact', - )) - ->execute(); -} - -/** - * Change the weight column to normal int. - */ -function contact_update_7003() { - db_drop_index('contact', 'list'); - db_change_field('contact', 'weight', 'weight', array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => "The category's weight.", - ), array( - 'indexes' => array( - 'list' => array('weight', 'category'), - ), - )); -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ diff --git a/modules/contact/contact.module b/modules/contact/contact.module deleted file mode 100644 index 9a48f23..0000000 --- a/modules/contact/contact.module +++ /dev/null @@ -1,259 +0,0 @@ -' . t('About') . ''; - $output .= '- - -- -> - - -- - -- -- -' . t('The Contact module allows visitors to contact site administrators and other users. Users specify a subject, write their message, and can have a copy of their message sent to their own e-mail address. For more information, see the online handbook entry for Contact module.', array('@contact' => 'http://drupal.org/documentation/modules/contact/')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
' . t('Add one or more categories on this page to set up your site-wide contact form.', array('@form' => url('contact'))) . '
'; - $output .= '' . t('A Contact menu item (disabled by default) is added to the Navigation menu, which you can modify on the Menus administration page.', array('@menu-settings' => url('admin/structure/menu'))) . '
'; - $output .= '' . t('If you would like additional text to appear on the site-wide contact page, use a block. You can create and edit blocks on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; - return $output; - } -} - -/** - * Implements hook_permission(). - */ -function contact_permission() { - return array( - 'administer contact forms' => array( - 'title' => t('Administer contact forms and contact form settings'), - ), - 'access site-wide contact form' => array( - 'title' => t('Use the site-wide contact form'), - ), - 'access user contact forms' => array( - 'title' => t("Use users' personal contact forms"), - ), - ); -} - -/** - * Implements hook_menu(). - */ -function contact_menu() { - $items['admin/structure/contact'] = array( - 'title' => 'Contact form', - 'description' => 'Create a system contact form and set up categories for the form to use.', - 'page callback' => 'contact_category_list', - 'access arguments' => array('administer contact forms'), - 'file' => 'contact.admin.inc', - ); - $items['admin/structure/contact/add'] = array( - 'title' => 'Add category', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('contact_category_edit_form'), - 'access arguments' => array('administer contact forms'), - 'type' => MENU_LOCAL_ACTION, - 'weight' => 1, - 'file' => 'contact.admin.inc', - ); - $items['admin/structure/contact/edit/%contact'] = array( - 'title' => 'Edit contact category', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('contact_category_edit_form', 4), - 'access arguments' => array('administer contact forms'), - 'file' => 'contact.admin.inc', - ); - $items['admin/structure/contact/delete/%contact'] = array( - 'title' => 'Delete contact', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('contact_category_delete_form', 4), - 'access arguments' => array('administer contact forms'), - 'file' => 'contact.admin.inc', - ); - $items['contact'] = array( - 'title' => 'Contact', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('contact_site_form'), - 'access arguments' => array('access site-wide contact form'), - 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'contact.pages.inc', - ); - $items['user/%user/contact'] = array( - 'title' => 'Contact', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('contact_personal_form', 1), - 'type' => MENU_LOCAL_TASK, - 'access callback' => '_contact_personal_tab_access', - 'access arguments' => array(1), - 'weight' => 2, - 'file' => 'contact.pages.inc', - ); - return $items; -} - -/** - * Menu access callback for a user's personal contact form. - * - * @param $account - * The user object of the user whose contact form is being requested. - */ -function _contact_personal_tab_access($account) { - global $user; - - // Anonymous users cannot have contact forms. - if (!$account->uid) { - return FALSE; - } - - // User administrators should always have access to personal contact forms. - if (user_access('administer users')) { - return TRUE; - } - - // Users may not contact themselves. - if ($user->uid == $account->uid) { - return FALSE; - } - - // If the requested user has disabled their contact form, or this preference - // has not yet been saved, do not allow users to contact them. - if (empty($account->data['contact'])) { - return FALSE; - } - - // If requested user has been blocked, do not allow users to contact them. - if (empty($account->status)) { - return FALSE; - } - - return user_access('access user contact forms'); -} - -/** - * Loads a contact category. - * - * @param $cid - * The contact category ID. - * - * @return - * An array with the contact category's data. - */ -function contact_load($cid) { - return db_select('contact', 'c') - ->addTag('translatable') - ->fields('c') - ->condition('cid', $cid) - ->execute() - ->fetchAssoc(); -} - -/** - * Implements hook_mail(). - */ -function contact_mail($key, &$message, $params) { - $language = $message['language']; - $variables = array( - '!site-name' => variable_get('site_name', 'Drupal'), - '!subject' => $params['subject'], - '!category' => isset($params['category']['category']) ? $params['category']['category'] : '', - '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), - '!sender-name' => format_username($params['sender']), - '!sender-url' => $params['sender']->uid ? url('user/' . $params['sender']->uid, array('absolute' => TRUE, 'language' => $language)) : $params['sender']->mail, - ); - - switch ($key) { - case 'page_mail': - case 'page_copy': - $message['subject'] .= t('[!category] !subject', $variables, array('langcode' => $language->language)); - $message['body'][] = t("!sender-name (!sender-url) sent a message using the contact form at !form-url.", $variables, array('langcode' => $language->language)); - $message['body'][] = $params['message']; - break; - - case 'page_autoreply': - $message['subject'] .= t('[!category] !subject', $variables, array('langcode' => $language->language)); - $message['body'][] = $params['category']['reply']; - break; - - case 'user_mail': - case 'user_copy': - $variables += array( - '!recipient-name' => format_username($params['recipient']), - '!recipient-edit-url' => url('user/' . $params['recipient']->uid . '/edit', array('absolute' => TRUE, 'language' => $language)), - ); - $message['subject'] .= t('[!site-name] !subject', $variables, array('langcode' => $language->language)); - $message['body'][] = t('Hello !recipient-name,', $variables, array('langcode' => $language->language)); - $message['body'][] = t("!sender-name (!sender-url) has sent you a message via your contact form (!form-url) at !site-name.", $variables, array('langcode' => $language->language)); - $message['body'][] = t("If you don't want to receive such e-mails, you can change your settings at !recipient-edit-url.", $variables, array('langcode' => $language->language)); - $message['body'][] = t('Message:', array(), array('langcode' => $language->language)); - $message['body'][] = $params['message']; - break; - } -} - -/** - * Implements hook_form_FORM_ID_alter(). - * - * Add the enable personal contact form to an individual user's account page. - * - * @see user_profile_form() - */ -function contact_form_user_profile_form_alter(&$form, &$form_state) { - if ($form['#user_category'] == 'account') { - $account = $form['#user']; - $form['contact'] = array( - '#type' => 'fieldset', - '#title' => t('Contact settings'), - '#weight' => 5, - '#collapsible' => TRUE, - ); - $form['contact']['contact'] = array( - '#type' => 'checkbox', - '#title' => t('Personal contact form'), - '#default_value' => !empty($account->data['contact']) ? $account->data['contact'] : FALSE, - '#description' => t('Allow other users to contact you via a personal contact form which keeps your e-mail address hidden. Note that some privileged users such as site administrators are still able to contact you even if you choose to disable this feature.', array('@url' => url("user/$account->uid/contact"))), - ); - } -} - -/** - * Implements hook_user_presave(). - */ -function contact_user_presave(&$edit, $account, $category) { - $edit['data']['contact'] = isset($edit['contact']) ? $edit['contact'] : variable_get('contact_default_status', 1); -} - -/** - * Implements hook_form_FORM_ID_alter(). - * - * Add the default personal contact setting on the user settings page. - * - * @see user_admin_settings() - */ -function contact_form_user_admin_settings_alter(&$form, &$form_state) { - $form['contact'] = array( - '#type' => 'fieldset', - '#title' => t('Contact settings'), - '#weight' => 0, - ); - $form['contact']['contact_default_status'] = array( - '#type' => 'checkbox', - '#title' => t('Enable the personal contact form by default for new users.'), - '#description' => t('Changing this setting will not affect existing users.'), - '#default_value' => variable_get('contact_default_status', 1), - ); -} diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc deleted file mode 100644 index ba8918b..0000000 --- a/modules/contact/contact.pages.inc +++ /dev/null @@ -1,300 +0,0 @@ - $limit, '@interval' => format_interval($window))), 'error'); - drupal_access_denied(); - drupal_exit(); - } - - // Get an array of the categories and the current default category. - $categories = db_select('contact', 'c') - ->addTag('translatable') - ->fields('c', array('cid', 'category')) - ->orderBy('weight') - ->orderBy('category') - ->execute() - ->fetchAllKeyed(); - $default_category = db_query("SELECT cid FROM {contact} WHERE selected = 1")->fetchField(); - - // If there are no categories, do not display the form. - if (!$categories) { - if (user_access('administer contact forms')) { - drupal_set_message(t('The contact form has not been configured. Add one or more categories to the form.', array('@add' => url('admin/structure/contact/add'))), 'error'); - } - else { - drupal_not_found(); - drupal_exit(); - } - } - - // If there is more than one category available and no default category has - // been selected, prepend a default placeholder value. - if (!$default_category) { - if (count($categories) > 1) { - $categories = array(0 => t('- Please choose -')) + $categories; - } - else { - $default_category = key($categories); - } - } - - if (!$user->uid) { - $form['#attached']['library'][] = array('system', 'jquery.cookie'); - $form['#attributes']['class'][] = 'user-info-from-cookie'; - } - - $form['#attributes']['class'][] = 'contact-form'; - $form['name'] = array( - '#type' => 'textfield', - '#title' => t('Your name'), - '#maxlength' => 255, - '#default_value' => $user->uid ? format_username($user) : '', - '#required' => TRUE, - ); - $form['mail'] = array( - '#type' => 'textfield', - '#title' => t('Your e-mail address'), - '#maxlength' => 255, - '#default_value' => $user->uid ? $user->mail : '', - '#required' => TRUE, - ); - $form['subject'] = array( - '#type' => 'textfield', - '#title' => t('Subject'), - '#maxlength' => 255, - '#required' => TRUE, - ); - $form['cid'] = array( - '#type' => 'select', - '#title' => t('Category'), - '#default_value' => $default_category, - '#options' => $categories, - '#required' => TRUE, - '#access' => count($categories) > 1, - ); - $form['message'] = array( - '#type' => 'textarea', - '#title' => t('Message'), - '#required' => TRUE, - ); - // We do not allow anonymous users to send themselves a copy - // because it can be abused to spam people. - $form['copy'] = array( - '#type' => 'checkbox', - '#title' => t('Send yourself a copy.'), - '#access' => $user->uid, - ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Send message'), - ); - - return $form; -} - -/** - * Form validation handler for contact_site_form(). - * - * @see contact_site_form_submit() - */ -function contact_site_form_validate($form, &$form_state) { - if (!$form_state['values']['cid']) { - form_set_error('cid', t('You must select a valid category.')); - } - if (!valid_email_address($form_state['values']['mail'])) { - form_set_error('mail', t('You must enter a valid e-mail address.')); - } -} - -/** - * Form submission handler for contact_site_form(). - * - * @see contact_site_form_validate() - */ -function contact_site_form_submit($form, &$form_state) { - global $user, $language; - - $values = $form_state['values']; - $values['sender'] = $user; - $values['sender']->name = $values['name']; - $values['sender']->mail = $values['mail']; - $values['category'] = contact_load($values['cid']); - - // Save the anonymous user information to a cookie for reuse. - if (!$user->uid) { - user_cookie_save(array_intersect_key($values, array_flip(array('name', 'mail')))); - } - - // Get the to and from e-mail addresses. - $to = $values['category']['recipients']; - $from = $values['sender']->mail; - - // Send the e-mail to the recipients using the site default language. - drupal_mail('contact', 'page_mail', $to, language_default(), $values, $from); - - // If the user requests it, send a copy using the current language. - if ($values['copy']) { - drupal_mail('contact', 'page_copy', $from, $language, $values, $from); - } - - // Send an auto-reply if necessary using the current language. - if ($values['category']['reply']) { - drupal_mail('contact', 'page_autoreply', $from, $language, $values, $to); - } - - flood_register_event('contact', variable_get('contact_threshold_window', 3600)); - watchdog('mail', '%sender-name (@sender-from) sent an e-mail regarding %category.', array('%sender-name' => $values['name'], '@sender-from' => $from, '%category' => $values['category']['category'])); - - // Jump to home page rather than back to contact page to avoid - // contradictory messages if flood control has been activated. - drupal_set_message(t('Your message has been sent.')); - $form_state['redirect'] = ''; -} - -/** - * Form constructor for the personal contact form. - * - * Path: user/%user/contact - * - * @see contact_menu() - * @see contact_personal_form_validate() - * @see contact_personal_form_submit() - * @ingroup forms - */ -function contact_personal_form($form, &$form_state, $recipient) { - global $user; - - // Check if flood control has been activated for sending e-mails. - $limit = variable_get('contact_threshold_limit', 5); - $window = variable_get('contact_threshold_window', 3600); - if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms') && !user_access('administer users')) { - drupal_set_message(t("You cannot send more than %limit messages in @interval. Try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error'); - drupal_access_denied(); - drupal_exit(); - } - - drupal_set_title(t('Contact @username', array('@username' => format_username($recipient))), PASS_THROUGH); - - if (!$user->uid) { - $form['#attached']['library'][] = array('system', 'jquery.cookie'); - $form['#attributes']['class'][] = 'user-info-from-cookie'; - } - - $form['#attributes']['class'][] = 'contact-form'; - $form['recipient'] = array( - '#type' => 'value', - '#value' => $recipient, - ); - $form['name'] = array( - '#type' => 'textfield', - '#title' => t('Your name'), - '#maxlength' => 255, - '#default_value' => $user->uid ? format_username($user) : '', - '#required' => TRUE, - ); - $form['mail'] = array( - '#type' => 'textfield', - '#title' => t('Your e-mail address'), - '#maxlength' => 255, - '#default_value' => $user->uid ? $user->mail : '', - '#required' => TRUE, - ); - $form['to'] = array( - '#type' => 'item', - '#title' => t('To'), - '#markup' => theme('username', array('account' => $recipient)), - ); - $form['subject'] = array( - '#type' => 'textfield', - '#title' => t('Subject'), - '#maxlength' => 50, - '#required' => TRUE, - ); - $form['message'] = array( - '#type' => 'textarea', - '#title' => t('Message'), - '#rows' => 15, - '#required' => TRUE, - ); - // We do not allow anonymous users to send themselves a copy - // because it can be abused to spam people. - $form['copy'] = array( - '#type' => 'checkbox', - '#title' => t('Send yourself a copy.'), - '#access' => $user->uid, - ); - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Send message'), - ); - return $form; -} - -/** - * Form validation handler for contact_personal_form(). - * - * @see contact_personal_form_submit() - */ -function contact_personal_form_validate($form, &$form_state) { - if (!valid_email_address($form_state['values']['mail'])) { - form_set_error('mail', t('You must enter a valid e-mail address.')); - } -} - -/** - * Form submission handler for contact_personal_form(). - * - * @see contact_personal_form_validate() - */ -function contact_personal_form_submit($form, &$form_state) { - global $user, $language; - - $values = $form_state['values']; - $values['sender'] = $user; - $values['sender']->name = $values['name']; - $values['sender']->mail = $values['mail']; - - // Save the anonymous user information to a cookie for reuse. - if (!$user->uid) { - user_cookie_save(array_intersect_key($values, array_flip(array('name', 'mail')))); - } - - // Get the to and from e-mail addresses. - $to = $values['recipient']->mail; - $from = $values['sender']->mail; - - // Send the e-mail in the requested user language. - drupal_mail('contact', 'user_mail', $to, user_preferred_language($values['recipient']), $values, $from); - - // Send a copy if requested, using current page language. - if ($values['copy']) { - drupal_mail('contact', 'user_copy', $from, $language, $values, $from); - } - - flood_register_event('contact', variable_get('contact_threshold_window', 3600)); - watchdog('mail', '%sender-name (@sender-from) sent %recipient-name an e-mail.', array('%sender-name' => $values['name'], '@sender-from' => $from, '%recipient-name' => $values['recipient']->name)); - - // Jump to the contacted user's profile page. - drupal_set_message(t('Your message has been sent.')); - $form_state['redirect'] = user_access('access user profiles') ? 'user/' . $values['recipient']->uid : ''; -} diff --git a/modules/contact/contact.test b/modules/contact/contact.test deleted file mode 100644 index 6693b57..0000000 --- a/modules/contact/contact.test +++ /dev/null @@ -1,434 +0,0 @@ - 'Site-wide contact form', - 'description' => 'Tests site-wide contact form functionality.', - 'group' => 'Contact', - ); - } - - function setUp() { - parent::setUp('contact'); - } - - /** - * Tests configuration options and the site-wide contact form. - */ - function testSiteWideContact() { - // Create and login administrative user. - $admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer users')); - $this->drupalLogin($admin_user); - - $flood_limit = 3; - variable_set('contact_threshold_limit', $flood_limit); - variable_set('contact_threshold_window', 600); - - // Set settings. - $edit = array(); - $edit['contact_default_status'] = TRUE; - $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.'); - - // Delete old categories to ensure that new categories are used. - $this->deleteCategories(); - - // Ensure that the contact form won't be shown without categories. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form')); - $this->drupalLogout(); - $this->drupalGet('contact'); - $this->assertResponse(404); - $this->drupalLogin($admin_user); - $this->drupalGet('contact'); - $this->assertResponse(200); - $this->assertText(t('The contact form has not been configured.')); - - // Add categories. - // Test invalid recipients. - $invalid_recipients = array('invalid', 'invalid@', 'invalid@site.', '@site.', '@site.com'); - foreach ($invalid_recipients as $invalid_recipient) { - $this->addCategory($this->randomName(16), $invalid_recipient, '', FALSE); - $this->assertRaw(t('%recipient is an invalid e-mail address.', array('%recipient' => $invalid_recipient)), format_string('Caught invalid recipient (@invalid_recipient).', array('@invalid_recipient' => $invalid_recipient))); - } - - // Test validation of empty category and recipients fields. - $this->addCategory($category = '', '', '', TRUE); - $this->assertText(t('Category field is required.'), 'Caught empty category field'); - $this->assertText(t('Recipients field is required.'), 'Caught empty recipients field.'); - - // Create first valid category. - $recipients = array('simpletest@example.com', 'simpletest2@example.com', 'simpletest3@example.com'); - $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0])), '', TRUE); - $this->assertRaw(t('Category %category has been saved.', array('%category' => $category)), 'Category successfully saved.'); - - // Make sure the newly created category is included in the list of categories. - $this->assertNoUniqueText($category, 'New category included in categories list.'); - - // Test update contact form category. - $categories = $this->getCategories(); - $category_id = $this->updateCategory($categories, $category = $this->randomName(16), $recipients_str = implode(',', array($recipients[0], $recipients[1])), $reply = $this->randomName(30), FALSE); - $category_array = db_query("SELECT category, recipients, reply, selected FROM {contact} WHERE cid = :cid", array(':cid' => $category_id))->fetchAssoc(); - $this->assertEqual($category_array['category'], $category); - $this->assertEqual($category_array['recipients'], $recipients_str); - $this->assertEqual($category_array['reply'], $reply); - $this->assertFalse($category_array['selected']); - $this->assertRaw(t('Category %category has been saved.', array('%category' => $category)), 'Category successfully saved.'); - - // Ensure that the contact form is shown without a category selection input. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form')); - $this->drupalLogout(); - $this->drupalGet('contact'); - $this->assertText(t('Your e-mail address'), 'Contact form is shown when there is one category.'); - $this->assertNoText(t('Category'), 'When there is only one category, the category selection element is hidden.'); - $this->drupalLogin($admin_user); - - // Add more categories. - $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0], $recipients[1])), '', FALSE); - $this->assertRaw(t('Category %category has been saved.', array('%category' => $category)), 'Category successfully saved.'); - - $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0], $recipients[1], $recipients[2])), '', FALSE); - $this->assertRaw(t('Category %category has been saved.', array('%category' => $category)), 'Category successfully saved.'); - - // Try adding a category that already exists. - $this->addCategory($category, '', '', FALSE); - $this->assertNoRaw(t('Category %category has been saved.', array('%category' => $category)), 'Category not saved.'); - $this->assertRaw(t('A contact form with category %category already exists.', array('%category' => $category)), 'Duplicate category error found.'); - - // Clear flood table in preparation for flood test and allow other checks to complete. - db_delete('flood')->execute(); - $num_records_after = db_query("SELECT COUNT(*) FROM {flood}")->fetchField(); - $this->assertIdentical($num_records_after, '0', 'Flood table emptied.'); - $this->drupalLogout(); - - // Check to see that anonymous user cannot see contact page without permission. - user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form')); - $this->drupalGet('contact'); - $this->assertResponse(403, 'Access denied to anonymous user without permission.'); - - // Give anonymous user permission and see that page is viewable. - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form')); - $this->drupalGet('contact'); - $this->assertResponse(200, 'Access granted to anonymous user with permission.'); - - // Submit contact form with invalid values. - $this->submitContact('', $recipients[0], $this->randomName(16), $categories[0], $this->randomName(64)); - $this->assertText(t('Your name field is required.'), 'Name required.'); - - $this->submitContact($this->randomName(16), '', $this->randomName(16), $categories[0], $this->randomName(64)); - $this->assertText(t('Your e-mail address field is required.'), 'E-mail required.'); - - $this->submitContact($this->randomName(16), $invalid_recipients[0], $this->randomName(16), $categories[0], $this->randomName(64)); - $this->assertText(t('You must enter a valid e-mail address.'), 'Valid e-mail required.'); - - $this->submitContact($this->randomName(16), $recipients[0], '', $categories[0], $this->randomName(64)); - $this->assertText(t('Subject field is required.'), 'Subject required.'); - - $this->submitContact($this->randomName(16), $recipients[0], $this->randomName(16), $categories[0], ''); - $this->assertText(t('Message field is required.'), 'Message required.'); - - // Test contact form with no default category selected. - db_update('contact') - ->fields(array('selected' => 0)) - ->execute(); - $this->drupalGet('contact'); - $this->assertRaw(t('- Please choose -'), 'Without selected categories the visitor is asked to chose a category.'); - - // Submit contact form with invalid category id (cid 0). - $this->submitContact($this->randomName(16), $recipients[0], $this->randomName(16), 0, ''); - $this->assertText(t('You must select a valid category.'), 'Valid category required.'); - - // Submit contact form with correct values and check flood interval. - for ($i = 0; $i < $flood_limit; $i++) { - $this->submitContact($this->randomName(16), $recipients[0], $this->randomName(16), $categories[0], $this->randomName(64)); - $this->assertText(t('Your message has been sent.'), 'Message sent.'); - } - // Submit contact form one over limit. - $this->drupalGet('contact'); - $this->assertResponse(403, 'Access denied to anonymous user after reaching message treshold.'); - $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => variable_get('contact_threshold_limit', 3), '@interval' => format_interval(600))), 'Message threshold reached.'); - - // Delete created categories. - $this->drupalLogin($admin_user); - $this->deleteCategories(); - } - - /** - * Tests auto-reply on the site-wide contact form. - */ - function testAutoReply() { - // Create and login administrative user. - $admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer permissions', 'administer users')); - $this->drupalLogin($admin_user); - - // Set up three categories, 2 with an auto-reply and one without. - $foo_autoreply = $this->randomName(40); - $bar_autoreply = $this->randomName(40); - $this->addCategory('foo', 'foo@example.com', $foo_autoreply, FALSE); - $this->addCategory('bar', 'bar@example.com', $bar_autoreply, FALSE); - $this->addCategory('no_autoreply', 'bar@example.com', '', FALSE); - - // Test the auto-reply for category 'foo'. - $email = $this->randomName(32) . '@example.com'; - $subject = $this->randomName(64); - $this->submitContact($this->randomName(16), $email, $subject, 2, $this->randomString(128)); - - // We are testing the auto-reply, so there should be one e-mail going to the sender. - $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'foo@example.com')); - $this->assertEqual(count($captured_emails), 1, 'Auto-reply e-mail was sent to the sender for category "foo".', 'Contact'); - $this->assertEqual($captured_emails[0]['body'], drupal_html_to_text($foo_autoreply), 'Auto-reply e-mail body is correct for category "foo".', 'Contact'); - - // Test the auto-reply for category 'bar'. - $email = $this->randomName(32) . '@example.com'; - $this->submitContact($this->randomName(16), $email, $this->randomString(64), 3, $this->randomString(128)); - - // Auto-reply for category 'bar' should result in one auto-reply e-mail to the sender. - $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'bar@example.com')); - $this->assertEqual(count($captured_emails), 1, 'Auto-reply e-mail was sent to the sender for category "bar".', 'Contact'); - $this->assertEqual($captured_emails[0]['body'], drupal_html_to_text($bar_autoreply), 'Auto-reply e-mail body is correct for category "bar".', 'Contact'); - - // Verify that no auto-reply is sent when the auto-reply field is left blank. - $email = $this->randomName(32) . '@example.com'; - $this->submitContact($this->randomName(16), $email, $this->randomString(64), 4, $this->randomString(128)); - $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'no_autoreply@example.com')); - $this->assertEqual(count($captured_emails), 0, 'No auto-reply e-mail was sent to the sender for category "no-autoreply".', 'Contact'); - } - - /** - * Adds a category. - * - * @param string $category - * The category name. - * @param string $recipients - * The list of recipient e-mail addresses. - * @param string $reply - * The auto-reply text that is sent to a user upon completing the contact - * form. - * @param boolean $selected - * Boolean indicating whether the category should be selected by default. - */ - function addCategory($category, $recipients, $reply, $selected) { - $edit = array(); - $edit['category'] = $category; - $edit['recipients'] = $recipients; - $edit['reply'] = $reply; - $edit['selected'] = ($selected ? '1' : '0'); - $this->drupalPost('admin/structure/contact/add', $edit, t('Save')); - } - - /** - * Updates a category. - * - * @param string $category - * The category name. - * @param string $recipients - * The list of recipient e-mail addresses. - * @param string $reply - * The auto-reply text that is sent to a user upon completing the contact - * form. - * @param boolean $selected - * Boolean indicating whether the category should be selected by default. - */ - function updateCategory($categories, $category, $recipients, $reply, $selected) { - $category_id = $categories[array_rand($categories)]; - $edit = array(); - $edit['category'] = $category; - $edit['recipients'] = $recipients; - $edit['reply'] = $reply; - $edit['selected'] = ($selected ? '1' : '0'); - $this->drupalPost('admin/structure/contact/edit/' . $category_id, $edit, t('Save')); - return ($category_id); - } - - /** - * Submits the contact form. - * - * @param string $name - * The name of the sender. - * @param string $mail - * The e-mail address of the sender. - * @param string $subject - * The subject of the message. - * @param integer $cid - * The category ID of the message. - * @param string $message - * The message body. - */ - function submitContact($name, $mail, $subject, $cid, $message) { - $edit = array(); - $edit['name'] = $name; - $edit['mail'] = $mail; - $edit['subject'] = $subject; - $edit['cid'] = $cid; - $edit['message'] = $message; - $this->drupalPost('contact', $edit, t('Send message')); - } - - /** - * Deletes all categories. - */ - function deleteCategories() { - $categories = $this->getCategories(); - foreach ($categories as $category) { - $category_name = db_query("SELECT category FROM {contact} WHERE cid = :cid", array(':cid' => $category))->fetchField(); - $this->drupalPost('admin/structure/contact/delete/' . $category, array(), t('Delete')); - $this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)), 'Category deleted successfully.'); - } - } - - /** - * Gets a list of all category IDs. - * - * @return array - * A list of the category IDs. - */ - function getCategories() { - $categories = db_query('SELECT cid FROM {contact}')->fetchCol(); - return $categories; - } -} - -/** - * Tests the personal contact form. - */ -class ContactPersonalTestCase extends DrupalWebTestCase { - private $admin_user; - private $web_user; - private $contact_user; - - public static function getInfo() { - return array( - 'name' => 'Personal contact form', - 'description' => 'Tests personal contact form functionality.', - 'group' => 'Contact', - ); - } - - function setUp() { - parent::setUp('contact'); - - // Create an admin user. - $this->admin_user = $this->drupalCreateUser(array('administer contact forms', 'administer users')); - - // Create some normal users with their contact forms enabled by default. - variable_set('contact_default_status', TRUE); - $this->web_user = $this->drupalCreateUser(array('access user contact forms')); - $this->contact_user = $this->drupalCreateUser(); - } - - /** - * Tests access to the personal contact form. - */ - function testPersonalContactAccess() { - // Test allowed access to user with contact form enabled. - $this->drupalLogin($this->web_user); - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(200); - - // Test denied access to the user's own contact form. - $this->drupalGet('user/' . $this->web_user->uid . '/contact'); - $this->assertResponse(403); - - // Test always denied access to the anonymous user contact form. - $this->drupalGet('user/0/contact'); - $this->assertResponse(403); - - // Test that anonymous users can access the contact form. - $this->drupalLogout(); - user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms')); - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(200); - - // Revoke the personal contact permission for the anonymous user. - user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms')); - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(403); - - // Disable the personal contact form. - $this->drupalLogin($this->admin_user); - $edit = array('contact_default_status' => FALSE); - $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.'); - $this->drupalLogout(); - - // Re-create our contacted user with personal contact forms disabled by - // default. - $this->contact_user = $this->drupalCreateUser(); - - // Test denied access to a user with contact form disabled. - $this->drupalLogin($this->web_user); - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(403); - - // Test allowed access for admin user to a user with contact form disabled. - $this->drupalLogin($this->admin_user); - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(200); - - // Re-create our contacted user as a blocked user. - $this->contact_user = $this->drupalCreateUser(); - user_save($this->contact_user, array('status' => 0)); - - // Test that blocked users can still be contacted by admin. - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(200); - - // Test that blocked users cannot be contacted by non-admins. - $this->drupalLogin($this->web_user); - $this->drupalGet('user/' . $this->contact_user->uid . '/contact'); - $this->assertResponse(403); - } - - /** - * Tests the personal contact form flood protection. - */ - function testPersonalContactFlood() { - $flood_limit = 3; - variable_set('contact_threshold_limit', $flood_limit); - - // Clear flood table in preparation for flood test and allow other checks to complete. - db_delete('flood')->execute(); - $num_records_flood = db_query("SELECT COUNT(*) FROM {flood}")->fetchField(); - $this->assertIdentical($num_records_flood, '0', 'Flood table emptied.'); - - $this->drupalLogin($this->web_user); - - // Submit contact form with correct values and check flood interval. - for ($i = 0; $i < $flood_limit; $i++) { - $this->submitPersonalContact($this->contact_user); - $this->assertText(t('Your message has been sent.'), 'Message sent.'); - } - - // Submit contact form one over limit. - $this->drupalGet('user/' . $this->contact_user->uid. '/contact'); - $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => $flood_limit, '@interval' => format_interval(variable_get('contact_threshold_window', 3600)))), 'Normal user denied access to flooded contact form.'); - - // Test that the admin user can still access the contact form even though - // the flood limit was reached. - $this->drupalLogin($this->admin_user); - $this->assertNoText('Try again later.', 'Admin user not denied access to flooded contact form.'); - } - - /** - * Fills out a user's personal contact form and submits it. - * - * @param $account - * A user object of the user being contacted. - * @param $message - * An optional array with the form fields being used. - */ - protected function submitPersonalContact($account, array $message = array()) { - $message += array( - 'subject' => $this->randomName(16), - 'message' => $this->randomName(64), - ); - $this->drupalPost('user/' . $account->uid . '/contact', $message, t('Send message')); - } -} diff --git a/modules/contextual/contextual-rtl.css b/modules/contextual/contextual-rtl.css deleted file mode 100644 index aecbee0..0000000 --- a/modules/contextual/contextual-rtl.css +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * Stylesheet specific to right-to-left languages. - */ - -div.contextual-links-wrapper { - left: 5px; - right: auto; -} -div.contextual-links-wrapper ul.contextual-links { - -moz-border-radius: 0 4px 4px 4px; - -webkit-border-top-left-radius: 0; - -webkit-border-top-right-radius: 4px; - border-radius: 0 4px 4px 4px; - left: 0; - right: auto; -} -a.contextual-links-trigger { - text-indent: -90px; -} diff --git a/modules/contextual/contextual.api.php b/modules/contextual/contextual.api.php deleted file mode 100644 index e8f33ee..0000000 --- a/modules/contextual/contextual.api.php +++ /dev/null @@ -1,40 +0,0 @@ -').text(Drupal.t('Configure')).click( - function () { - $links.stop(true, true).slideToggle(100); - $wrapper.toggleClass('contextual-links-active'); - return false; - } - ); - // Attach hover behavior to trigger and ul.contextual-links. - $trigger.add($links).hover( - function () { $region.addClass('contextual-links-region-active'); }, - function () { $region.removeClass('contextual-links-region-active'); } - ); - // Hide the contextual links when user clicks a link or rolls out of the .contextual-links-region. - $region.bind('mouseleave click', Drupal.contextualLinks.mouseleave); - $region.hover( - function() { $trigger.addClass('contextual-links-trigger-active'); }, - function() { $trigger.removeClass('contextual-links-trigger-active'); } - ); - // Prepend the trigger. - $wrapper.prepend($trigger); - }); - } -}; - -/** - * Disables outline for the region contextual links are associated with. - */ -Drupal.contextualLinks.mouseleave = function () { - $(this) - .find('.contextual-links-active').removeClass('contextual-links-active') - .find('ul.contextual-links').hide(); -}; - -})(jQuery); diff --git a/modules/contextual/contextual.module b/modules/contextual/contextual.module deleted file mode 100644 index 0f371a5..0000000 --- a/modules/contextual/contextual.module +++ /dev/null @@ -1,169 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Contextual links module displays links related to regions of pages on your site to users with access contextual links permission. For more information, see the online handbook entry for Contextual links module.', array('@contextual' => 'http://drupal.org/documentation/modules/contextual')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
', - '#suffix' => '', - '#attributes' => array( - 'class' => array('contextual-links'), - ), - '#attached' => array( - 'library' => array( - array('contextual', 'contextual-links'), - ), - ), - ); - return $types; -} - -/** - * Implements hook_preprocess(). - * - * @see contextual_pre_render_links() - */ -function contextual_preprocess(&$variables, $hook) { - // Nothing to do here if the user is not permitted to access contextual links. - if (!user_access('access contextual links')) { - return; - } - - $hooks = theme_get_registry(FALSE); - - // Determine the primary theme function argument. - if (!empty($hooks[$hook]['variables'])) { - $keys = array_keys($hooks[$hook]['variables']); - $key = $keys[0]; - } - elseif (!empty($hooks[$hook]['render element'])) { - $key = $hooks[$hook]['render element']; - } - if (!empty($key) && isset($variables[$key])) { - $element = $variables[$key]; - } - - if (isset($element) && is_array($element) && !empty($element['#contextual_links'])) { - // Initialize the template variable as a renderable array. - $variables['title_suffix']['contextual_links'] = array( - '#type' => 'contextual_links', - '#contextual_links' => $element['#contextual_links'], - '#element' => $element, - ); - // Mark this element as potentially having contextual links attached to it. - $variables['classes_array'][] = 'contextual-links-region'; - } -} - -/** - * Build a renderable array for contextual links. - * - * @param $element - * A renderable array containing a #contextual_links property, which is a - * keyed array. Each key is the name of the implementing module, and each - * value is an array that forms the function arguments for - * menu_contextual_links(). For example: - * @code - * array('#contextual_links' => array( - * 'block' => array('admin/structure/block/manage', array('system', 'navigation')), - * 'menu' => array('admin/structure/menu/manage', array('navigation')), - * )) - * @endcode - * - * @return - * A renderable array representing contextual links. - * - * @see menu_contextual_links() - * @see contextual_element_info() - */ -function contextual_pre_render_links($element) { - // Retrieve contextual menu links. - $items = array(); - foreach ($element['#contextual_links'] as $module => $args) { - $items += menu_contextual_links($module, $args[0], $args[1]); - } - - // Transform contextual links into parameters suitable for theme_link(). - $links = array(); - foreach ($items as $class => $item) { - $class = drupal_html_class($class); - $links[$class] = array( - 'title' => $item['title'], - 'href' => $item['href'], - ); - // @todo theme_links() should *really* use the same parameters as l(). - $item['localized_options'] += array('query' => array()); - $item['localized_options']['query'] += drupal_get_destination(); - $links[$class] += $item['localized_options']; - } - $element['#links'] = $links; - - // Allow modules to alter the renderable contextual links element. - drupal_alter('contextual_links_view', $element, $items); - - // If there are no links, tell drupal_render() to abort rendering. - if (empty($element['#links'])) { - $element['#printed'] = TRUE; - } - - return $element; -} - diff --git a/modules/contextual/contextual.test b/modules/contextual/contextual.test deleted file mode 100644 index 79eedb8..0000000 --- a/modules/contextual/contextual.test +++ /dev/null @@ -1,49 +0,0 @@ - 'Contextual links on node lists', - 'description' => 'Tests if contextual links are showing on the front page depending on permissions.', - 'group' => 'Contextual', - ); - } - - function setUp() { - parent::setUp(array('contextual', 'node')); - $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page')); - $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article')); - $web_user = $this->drupalCreateUser(array('access content', 'access contextual links', 'edit any article content')); - $this->drupalLogin($web_user); - } - - /** - * Tests contextual links on node lists with different permissions. - */ - function testNodeLinks() { - // Create three nodes in the following order: - // - An article, which should be user-editable. - // - A page, which should not be user-editable. - // - A second article, which should also be user-editable. - $node1 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1)); - $node2 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1)); - $node3 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1)); - - // Now, on the front page, all article nodes should have contextual edit - // links. The page node in between should not. - $this->drupalGet('node'); - $this->assertRaw('node/' . $node1->nid . '/edit', 'Edit link for oldest article node showing.'); - $this->assertNoRaw('node/' . $node2->nid . '/edit', 'No edit link for page nodes.'); - $this->assertRaw('node/' . $node3->nid . '/edit', 'Edit link for most recent article node showing.'); - } -} diff --git a/modules/contextual/images/gear-select.png b/modules/contextual/images/gear-select.png deleted file mode 100644 index adf6582..0000000 Binary files a/modules/contextual/images/gear-select.png and /dev/null differ diff --git a/modules/dashboard/dashboard-rtl.css b/modules/dashboard/dashboard-rtl.css deleted file mode 100644 index 8d3d0ed..0000000 --- a/modules/dashboard/dashboard-rtl.css +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file - * Right-to-left specific stylesheet for the Dashboard module. - */ - -#dashboard div.dashboard-region { - float: right; -} -#dashboard #disabled-blocks .block, #dashboard .block-placeholder { - float: right; - margin: 3px 0 3px 3px; - padding: 6px 8px 6px 4px; -} -#dashboard .canvas-content a.button { - margin: 0 10px 0 0; -} -#dashboard .ui-sortable .block h2 { - background-position: right -39px; - padding: 0 19px; -} -#dashboard.customize-inactive #disabled-blocks .block:hover h2 { - background-position: right -39px; -} -#dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { - background-position: right -36px; -} -#dashboard div#dashboard_main { - margin-left: 1%; - margin-right: 0; -} diff --git a/modules/dashboard/dashboard.api.php b/modules/dashboard/dashboard.api.php deleted file mode 100644 index a36a8ea..0000000 --- a/modules/dashboard/dashboard.api.php +++ /dev/null @@ -1,42 +0,0 @@ - "My module's dashboard region"); -} - -/** - * Alter dashboard regions provided by modules. - * - * @param $regions - * An array containing all dashboard regions, in the format provided by - * hook_dashboard_regions(). - */ -function hook_dashboard_regions_alter(&$regions) { - // Remove the sidebar region defined by the core dashboard module. - unset($regions['dashboard_sidebar']); -} - -/** - * @} End of "addtogroup hooks". - */ diff --git a/modules/dashboard/dashboard.css b/modules/dashboard/dashboard.css deleted file mode 100644 index 83e9ee4..0000000 --- a/modules/dashboard/dashboard.css +++ /dev/null @@ -1,134 +0,0 @@ -/** - * @file - * Stylesheet for the Dashboard module. - */ - -#dashboard div.dashboard-region { - float: left; - min-height: 1px; -} - -#dashboard div#dashboard_main { - width: 65%; - margin-right: 1%; /* LTR */ -} - -#dashboard div#dashboard_sidebar { - width: 33%; -} - -#dashboard div.block { - margin-bottom: 20px; -} - -#dashboard .dashboard-region .block { - clear: both; -} - -#dashboard div.block h2 { - float: none; -} - -#dashboard #disabled-blocks .block, -#dashboard .block-placeholder { - background: #e2e1dc; - padding: 6px 4px 6px 8px; /* LTR */ - margin: 3px 3px 3px 0; /* LTR */ - float: left; /* LTR */ - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; -} - -#dashboard .dashboard-add-other-blocks { - margin: 10px 0 0 0; -} - -#dashboard .ui-sortable { - border: 2px dashed #ccc; - padding: 10px; -} - -#dashboard .canvas-content { - padding: 10px; -} - -#dashboard #disabled-blocks .ui-sortable { - padding: 0; - background-color: #777; - border: 0; -} - -#dashboard .canvas-content a.button { - margin: 0 0 0 10px; /* LTR */ - color: #5a5a5a; - text-decoration: none; -} - -#dashboard .region { - margin: 5px; -} - -#dashboard #disabled-blocks .region { - background-color: #E0E0D8; - border: #ccc 1px solid; - padding: 10px; -} - -#dashboard #disabled-blocks { - padding: 5px 0; -} - -#dashboard #disabled-blocks h2 { - display: inline; - font-weight: normal; - white-space: nowrap; -} - -#dashboard #disabled-blocks .block { - background: #444; - color: #fff; -} - -#dashboard.customize-inactive #disabled-blocks .block:hover { - background: #0074BD; -} - -#dashboard #disabled-blocks .block .content, -#dashboard .ui-sortable-helper .content { - display: none; -} - -#dashboard .ui-sortable .block { - cursor: move; - min-height: 1px; -} - -#dashboard .ui-sortable .block h2 { - background: transparent url(../../misc/draggable.png) no-repeat 0px -39px; - padding: 0 17px; -} - -#dashboard.customize-inactive #disabled-blocks .block:hover h2 { - background: #0074BD url(../../misc/draggable.png) no-repeat 0px -39px; - color: #fff; -} - -#dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { - background: #0074BD url(../../misc/draggable.png) no-repeat; - background-position: 3px -36px; - color: #fff; -} - -#dashboard .dashboard-region .block-placeholder { - margin: 0 0 20px 0; - padding: 0; - display: block; - height: 1.6em; - width: 100%; -} - -#dashboard #disabled-blocks .block-placeholder { - width: 30px; - height: 1.6em; -} diff --git a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info deleted file mode 100644 index 41f4c9d..0000000 --- a/modules/dashboard/dashboard.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Dashboard -description = Provides a dashboard page in the administrative interface for organizing administrative tasks and tracking information within your site. -core = 7.x -package = Core -version = VERSION -files[] = dashboard.test -dependencies[] = block -configure = admin/dashboard/customize diff --git a/modules/dashboard/dashboard.install b/modules/dashboard/dashboard.install deleted file mode 100644 index 5021826..0000000 --- a/modules/dashboard/dashboard.install +++ /dev/null @@ -1,78 +0,0 @@ -fields('b', array('module', 'delta', 'region')) - ->condition('b.region', dashboard_regions(), 'IN') - ->execute(); - - foreach ($result as $block) { - $stashed_blocks[] = array( - 'module' => $block->module, - 'delta' => $block->delta, - 'region' => $block->region, - ); - } - variable_set('dashboard_stashed_blocks', $stashed_blocks); - - // Disable the dashboard blocks. - db_update('block') - ->fields(array( - 'status' => 0, - 'region' => BLOCK_REGION_NONE, - )) - ->condition('region', dashboard_regions(), 'IN') - ->execute(); -} - -/** - * Implements hook_enable(). - * - * Restores blocks to the dashboard that were there when the dashboard module - * was disabled. - */ -function dashboard_enable() { - global $theme_key; - if (!$stashed_blocks = variable_get('dashboard_stashed_blocks')) { - return; - } - if (!$admin_theme = variable_get('admin_theme')) { - drupal_theme_initialize(); - $admin_theme = $theme_key; - } - foreach ($stashed_blocks as $block) { - db_update('block') - ->fields(array( - 'status' => 1, - 'region' => $block['region'] - )) - ->condition('module', $block['module']) - ->condition('delta', $block['delta']) - ->condition('theme', $admin_theme) - ->condition('status', 0) - ->execute(); - } - variable_del('dashboard_stashed_blocks'); -} - -/** - * Implements hook_uninstall(). - */ -function dashboard_uninstall() { - variable_del('dashboard_stashed_blocks'); -} diff --git a/modules/dashboard/dashboard.js b/modules/dashboard/dashboard.js deleted file mode 100644 index 62f13a4..0000000 --- a/modules/dashboard/dashboard.js +++ /dev/null @@ -1,223 +0,0 @@ -/** - * @file - * Attaches behaviors for the Dashboard module. - */ - -(function ($) { - -/** - * Implements Drupal.behaviors for the Dashboard module. - */ -Drupal.behaviors.dashboard = { - attach: function (context, settings) { - $('#dashboard', context).once(function () { - $(this).prepend(''); - $('.customize .action-links a', this).click(Drupal.behaviors.dashboard.enterCustomizeMode); - }); - Drupal.behaviors.dashboard.addPlaceholders(); - if (Drupal.settings.dashboard.launchCustomize) { - Drupal.behaviors.dashboard.enterCustomizeMode(); - } - }, - - addPlaceholders: function() { - $('#dashboard .dashboard-region .region').each(function () { - var empty_text = ""; - // If the region is empty - if ($('.block', this).length == 0) { - // Check if we are in customize mode and grab the correct empty text - if ($('#dashboard').hasClass('customize-mode')) { - empty_text = Drupal.settings.dashboard.emptyRegionTextActive; - } else { - empty_text = Drupal.settings.dashboard.emptyRegionTextInactive; - } - // We need a placeholder. - if ($('.placeholder', this).length == 0) { - $(this).append(''); - } - $('.placeholder', this).html(empty_text); - } - else { - $('.placeholder', this).remove(); - } - }); - }, - - /** - * Enters "customize" mode by displaying disabled blocks. - */ - enterCustomizeMode: function () { - $('#dashboard').addClass('customize-mode customize-inactive'); - Drupal.behaviors.dashboard.addPlaceholders(); - // Hide the customize link - $('#dashboard .customize .action-links').hide(); - // Load up the disabled blocks - $('div.customize .canvas').load(Drupal.settings.dashboard.drawer, Drupal.behaviors.dashboard.setupDrawer); - }, - - /** - * Exits "customize" mode by simply forcing a page refresh. - */ - exitCustomizeMode: function () { - $('#dashboard').removeClass('customize-mode customize-inactive'); - Drupal.behaviors.dashboard.addPlaceholders(); - location.href = Drupal.settings.dashboard.dashboard; - }, - - /** - * Sets up the drag-and-drop behavior and the 'close' button. - */ - setupDrawer: function () { - $('div.customize .canvas-content input').click(Drupal.behaviors.dashboard.exitCustomizeMode); - $('div.customize .canvas-content').append('' + Drupal.t('Done') + ''); - - // Initialize drag-and-drop. - var regions = $('#dashboard div.region'); - regions.sortable({ - connectWith: regions, - cursor: 'move', - cursorAt: {top:0}, - dropOnEmpty: true, - items: '> div.block, > div.disabled-block', - placeholder: 'block-placeholder clearfix', - tolerance: 'pointer', - start: Drupal.behaviors.dashboard.start, - over: Drupal.behaviors.dashboard.over, - sort: Drupal.behaviors.dashboard.sort, - update: Drupal.behaviors.dashboard.update - }); - }, - - /** - * Makes the block appear as a disabled block while dragging. - * - * This function is called on the jQuery UI Sortable "start" event. - * - * @param event - * The event that triggered this callback. - * @param ui - * An object containing information about the item that is being dragged. - */ - start: function (event, ui) { - $('#dashboard').removeClass('customize-inactive'); - var item = $(ui.item); - - // If the block is already in disabled state, don't do anything. - if (!item.hasClass('disabled-block')) { - item.css({height: 'auto'}); - } - }, - - /** - * Adapts block's width to the region it is moved into while dragging. - * - * This function is called on the jQuery UI Sortable "over" event. - * - * @param event - * The event that triggered this callback. - * @param ui - * An object containing information about the item that is being dragged. - */ - over: function (event, ui) { - var item = $(ui.item); - - // If the block is in disabled state, remove width. - if ($(this).closest('#disabled-blocks').length) { - item.css('width', ''); - } - else { - item.css('width', $(this).width()); - } - }, - - /** - * Adapts a block's position to stay connected with the mouse pointer. - * - * This function is called on the jQuery UI Sortable "sort" event. - * - * @param event - * The event that triggered this callback. - * @param ui - * An object containing information about the item that is being dragged. - */ - sort: function (event, ui) { - var item = $(ui.item); - - if (event.pageX > ui.offset.left + item.width()) { - item.css('left', event.pageX); - } - }, - - /** - * Sends block order to the server, and expand previously disabled blocks. - * - * This function is called on the jQuery UI Sortable "update" event. - * - * @param event - * The event that triggered this callback. - * @param ui - * An object containing information about the item that was just dropped. - */ - update: function (event, ui) { - $('#dashboard').addClass('customize-inactive'); - var item = $(ui.item); - - // If the user dragged a disabled block, load the block contents. - if (item.hasClass('disabled-block')) { - var module, delta, itemClass; - itemClass = item.attr('class'); - // Determine the block module and delta. - module = itemClass.match(/\bmodule-(\S+)\b/)[1]; - delta = itemClass.match(/\bdelta-(\S+)\b/)[1]; - - // Load the newly enabled block's content. - $.get(Drupal.settings.dashboard.blockContent + '/' + module + '/' + delta, {}, - function (block) { - if (block) { - item.html(block); - } - - if (item.find('div.content').is(':empty')) { - item.find('div.content').html(Drupal.settings.dashboard.emptyBlockText); - } - - Drupal.attachBehaviors(item); - }, - 'html' - ); - // Remove the "disabled-block" class, so we don't reload its content the - // next time it's dragged. - item.removeClass("disabled-block"); - } - - Drupal.behaviors.dashboard.addPlaceholders(); - - // Let the server know what the new block order is. - $.post(Drupal.settings.dashboard.updatePath, { - 'form_token': Drupal.settings.dashboard.formToken, - 'regions': Drupal.behaviors.dashboard.getOrder - } - ); - }, - - /** - * Returns the current order of the blocks in each of the sortable regions. - * - * @return - * The current order of the blocks, in query string format. - */ - getOrder: function () { - var order = []; - $('#dashboard div.region').each(function () { - var region = $(this).parent().attr('id').replace(/-/g, '_'); - var blocks = $(this).sortable('toArray'); - $.each(blocks, function() { - order.push(region + '[]=' + this); - }); - }); - order = order.join('&'); - return order; - } -}; - -})(jQuery); diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module deleted file mode 100644 index 4cf654f..0000000 --- a/modules/dashboard/dashboard.module +++ /dev/null @@ -1,681 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Dashboard module provides a Dashboard page in the administrative interface for organizing administrative tasks and navigation, and tracking information within your site. The Dashboard page contains blocks, which you can add to and arrange using the drag-and-drop interface that appears when you click on the Customize dashboard link. Within this interface, blocks that are not primarily used for site administration do not appear by default, but can be added via the Add other blocks link. For more information, see the online handbook entry for Dashboard module.', array('@handbook' => 'http://drupal.org/documentation/modules/dashboard', '@dashboard' => url('admin/dashboard'))) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
' . t('Rearrange blocks for display on the Dashboard page. Blocks placed in the Dashboard (inactive) region are not displayed when viewing the Dashboard page, but are available within its Customize dashboard interface. Removing a block from active dashboard display makes it available on the main blocks administration page.', array('@dashboard-url' => url('admin/dashboard'), '@blocks-url' => url("admin/structure/block/list/{$GLOBALS['theme_key']}"))) . '
'; - return $output; - } -} - -/** - * Implements hook_menu(). - */ -function dashboard_menu() { - $items['admin/dashboard'] = array( - 'title' => 'Dashboard', - 'description' => 'View and customize your dashboard.', - 'page callback' => 'dashboard_admin', - 'access arguments' => array('access dashboard'), - // Make this appear first, so for example, in admin menus, it shows up on - // the top corner of the window as a convenient "home link". - 'weight' => -15, - ); - $items['admin/dashboard/configure'] = array( - 'title' => 'Configure available dashboard blocks', - 'description' => 'Configure which blocks can be shown on the dashboard.', - 'page callback' => 'dashboard_admin_blocks', - 'access arguments' => array('administer blocks'), - 'type' => MENU_VISIBLE_IN_BREADCRUMB, - ); - $items['admin/dashboard/customize'] = array( - 'title' => 'Customize dashboard', - 'description' => 'Customize your dashboard.', - 'page callback' => 'dashboard_admin', - 'page arguments' => array(TRUE), - 'access arguments' => array('access dashboard'), - 'type' => MENU_VISIBLE_IN_BREADCRUMB, - ); - $items['admin/dashboard/drawer'] = array( - 'page callback' => 'dashboard_show_disabled', - 'access arguments' => array('administer blocks'), - 'type' => MENU_CALLBACK, - ); - $items['admin/dashboard/block-content/%/%'] = array( - 'page callback' => 'dashboard_show_block_content', - 'page arguments' => array(3, 4), - 'access arguments' => array('administer blocks'), - 'type' => MENU_CALLBACK, - ); - $items['admin/dashboard/update'] = array( - 'page callback' => 'dashboard_update', - 'access arguments' => array('administer blocks'), - 'type' => MENU_CALLBACK, - ); - - return $items; -} - -/** - * Implements hook_permission(). - */ -function dashboard_permission() { - return array( - 'access dashboard' => array( - 'title' => t('View the administrative dashboard'), - // Note: We translate the 'Administer blocks' permission string here with - // a separate t() call, to make sure it gets the same translation as when - // it's in block_permission(). - 'description' => t('Customizing the dashboard requires the !permission-name permission.', array( - '!permission-name' => l(t('Administer blocks'), 'admin/people/permissions', array('fragment' => 'module-block')), - )), - ), - ); -} - -/** - * Implements hook_block_info_alter(). - */ -function dashboard_block_info_alter(&$blocks, $theme, $code_blocks) { - $admin_theme = variable_get('admin_theme'); - if (($admin_theme && $theme == $admin_theme) || (!$admin_theme && $theme == variable_get('theme_default', 'bartik'))) { - foreach ($blocks as $module => &$module_blocks) { - foreach ($module_blocks as $delta => &$block) { - // Make administrative blocks that are not already in use elsewhere - // available for the dashboard. - if (empty($block['status']) && (empty($block['region']) || $block['region'] == BLOCK_REGION_NONE) && !empty($code_blocks[$module][$delta]['properties']['administrative'])) { - $block['status'] = 1; - $block['region'] = 'dashboard_inactive'; - } - } - } - } -} - -/** - * Implements hook_block_list_alter(). - * - * Skip rendering dashboard blocks when not on the dashboard page itself. This - * prevents expensive dashboard blocks from causing performance issues on pages - * where they will never be displayed. - */ -function dashboard_block_list_alter(&$blocks) { - if (!dashboard_is_visible()) { - foreach ($blocks as $key => $block) { - if (in_array($block->region, dashboard_regions())) { - unset($blocks[$key]); - } - } - } -} - -/** - * Implements hook_page_build(). - * - * Display dashboard blocks in the main content region. - */ -function dashboard_page_build(&$page) { - global $theme_key; - - if (dashboard_is_visible()) { - $block_info = array(); - - // Create a wrapper for the dashboard itself, then insert each dashboard - // region into it. - $page['content']['dashboard'] = array('#theme_wrappers' => array('dashboard')); - foreach (dashboard_regions() as $region) { - // Do not show dashboard blocks that are disabled. - if ($region == 'dashboard_inactive') { - continue; - } - // Insert regions even when they are empty, so that they will be - // displayed when the dashboard is being configured. - $page['content']['dashboard'][$region] = !empty($page[$region]) ? $page[$region] : array(); - $page['content']['dashboard'][$region]['#dashboard_region'] = $region; - // Allow each dashboard region to be themed differently, or fall back on - // the generic theme wrapper function for dashboard regions. - $page['content']['dashboard'][$region]['#theme_wrappers'][] = array($region, 'dashboard_region'); - unset($page[$region]); - $blocks_found = array(); - foreach ($page['content']['dashboard'][$region] as $item) { - if (isset($item['#theme_wrappers']) && is_array($item['#theme_wrappers']) && in_array('block', $item['#theme_wrappers'])) { - // If this item is a block, ensure it has a subject. - if (empty($item['#block']->subject)) { - // Locally cache info data for the object for all blocks, in case - // we find a block similarly missing title from the same module. - if (!isset($block_info[$item['#block']->module])) { - $block_info[$item['#block']->module] = module_invoke($item['#block']->module, 'block_info'); - } - $item['#block']->subject = $block_info[$item['#block']->module][$item['#block']->delta]['info']; - } - $blocks_found[$item['#block']->module . '_' . $item['#block']->delta] = TRUE; - } - } - - // Find blocks which were not yet displayed on the page (were empty), and - // add placeholder items in their place for rendering. - $block_list = db_select('block') - ->condition('theme', $theme_key) - ->condition('status', 1) - ->condition('region', $region) - ->fields('block') - ->execute(); - foreach ($block_list as $block) { - if (!isset($blocks_found[$block->module . '_' . $block->delta])) { - $block->enabled = $block->page_match = TRUE; - $block->content = array('#markup' => '(empty)'); - if (!isset($block_info[$block->module])) { - $block_info[$block->module] = module_invoke($block->module, 'block_info'); - } - $block->subject = t('@title', array('@title' => $block_info[$block->module][$block->delta]['info'])); - $block_render = array($block->module . '_' . $block->delta => $block); - $build = _block_get_renderable_array($block_render); - $page['content']['dashboard'][$block->region][] = $build; - } - } - } - } -} - -/** - * Implements hook_system_info_alter(). - * - * Add regions to each theme to store the dashboard blocks. - */ -function dashboard_system_info_alter(&$info, $file, $type) { - if ($type == 'theme') { - // Add the dashboard regions (the "inactive" region should always appear - // last in the list, for usability reasons). - $dashboard_regions = dashboard_region_descriptions(); - if (isset($dashboard_regions['dashboard_inactive'])) { - $inactive_region = $dashboard_regions['dashboard_inactive']; - unset($dashboard_regions['dashboard_inactive']); - $dashboard_regions['dashboard_inactive'] = $inactive_region; - } - $info['regions'] += $dashboard_regions; - // Indicate that these regions are intended to be displayed whenever the - // dashboard is displayed in an overlay. This information is provided for - // any module that might need to use it, not just the core Overlay module. - $info['overlay_regions'] = !empty($info['overlay_regions']) ? array_merge($info['overlay_regions'], dashboard_regions()) : dashboard_regions(); - } -} - -/** - * Implements hook_theme(). - */ -function dashboard_theme() { - return array( - 'dashboard' => array( - 'render element' => 'element', - ), - 'dashboard_admin' => array( - 'render element' => 'element', - ), - 'dashboard_region' => array( - 'render element' => 'element', - ), - 'dashboard_disabled_blocks' => array( - 'variables' => array('blocks' => NULL), - ), - 'dashboard_disabled_block' => array( - 'variables' => array('block' => NULL), - ), - 'dashboard_admin_display_form' => array( - // When building the form for configuring dashboard blocks, reuse the - // Block module's template for the main block configuration form. - 'template' => 'block-admin-display-form', - 'path' => drupal_get_path('module', 'block'), - 'file' => 'block.admin.inc', - 'render element' => 'form', - ), - ); -} - -/** - * Implements hook_forms(). - */ -function dashboard_forms() { - // Reroute the dashboard configuration form to the main blocks administration - // form. This allows us to distinguish them by form ID in hook_form_alter(). - $forms['dashboard_admin_display_form'] = array( - 'callback' => 'block_admin_display_form', - ); - - return $forms; -} - -/** - * Page callback: Displays the dashboard. - * - * @param $launch_customize - * Whether to launch in customization mode right away. TRUE or FALSE. - */ -function dashboard_admin($launch_customize = FALSE) { - $js_settings = array( - 'dashboard' => array( - 'drawer' => url('admin/dashboard/drawer'), - 'blockContent' => url('admin/dashboard/block-content'), - 'updatePath' => url('admin/dashboard/update'), - 'formToken' => drupal_get_token('dashboard-update'), - 'launchCustomize' => $launch_customize, - 'dashboard' => url('admin/dashboard'), - 'emptyBlockText' => t('(empty)'), - 'emptyRegionTextInactive' => t('This dashboard region is empty. Click Customize dashboard to add blocks to it.'), - 'emptyRegionTextActive' => t('DRAG HERE'), - ), - ); - $build = array( - '#theme' => 'dashboard_admin', - '#message' => t('To customize the dashboard page, move blocks to the dashboard regions on the Dashboard administration page, or enable JavaScript on this page to use the drag-and-drop interface.', array('@dashboard' => url('admin/dashboard/configure'))), - '#access' => user_access('administer blocks'), - '#attached' => array( - 'js' => array( - drupal_get_path('module', 'dashboard') . '/dashboard.js', - array('data' => $js_settings, 'type' => 'setting'), - ), - 'library' => array(array('system', 'ui.sortable')), - ), - ); - return $build; -} - -/** - * Page callback: Builds the page for administering dashboard blocks. - * - * This page reuses the Block module's administration form but limits editing - * to blocks that are available to appear on the dashboard. - * - * @see block_admin_display() - * @see block_admin_display_form() - * @see dashboard_form_dashboard_admin_display_form_alter() - * @see template_preprocess_dashboard_admin_display_form() - */ -function dashboard_admin_blocks() { - global $theme_key; - drupal_theme_initialize(); - module_load_include('inc', 'block', 'block.admin'); - - // Prepare the blocks for the current theme, and remove those that are - // currently displayed in non-dashboard regions. - // @todo This assumes the current page is being displayed using the same - // theme that the dashboard is displayed in. - $blocks = block_admin_display_prepare_blocks($theme_key); - $dashboard_regions = dashboard_region_descriptions(); - $regions_to_remove = array_diff_key(system_region_list($theme_key, REGIONS_VISIBLE), $dashboard_regions); - foreach ($blocks as $id => $block) { - if (isset($regions_to_remove[$block['region']])) { - unset($blocks[$id]); - } - } - - // Pass in the above blocks and dashboard regions to the form, so that only - // dashboard-related regions will be displayed. - return drupal_get_form('dashboard_admin_display_form', $blocks, $theme_key, $dashboard_regions); -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $form_id) { - // Hide dashboard regions (and any blocks placed within them) from the block - // administration form and from the options list on that form. This - // function is called for both the dashboard block configuration form and the - // standard block configuration form so that both forms can share the same - // constructor. As a result the form_id must be checked. - if ($form_id != 'dashboard_admin_display_form') { - $dashboard_regions = dashboard_region_descriptions(); - $form['block_regions']['#value'] = array_diff_key($form['block_regions']['#value'], $dashboard_regions); - foreach (element_children($form['blocks']) as $i) { - $block = &$form['blocks'][$i]; - if (isset($block['region']['#default_value']) && isset($dashboard_regions[$block['region']['#default_value']]) && $block['region']['#default_value'] != 'dashboard_inactive') { - $block['#access'] = FALSE; - } - elseif (isset($block['region']['#options'])) { - $block['region']['#options'] = array_diff_key($block['region']['#options'], $dashboard_regions); - } - // Show inactive dashboard blocks as disabled on the main block - // administration form, so that they are available to place in other - // regions of the theme. Note that when the form is submitted, any such - // blocks which still remain disabled will immediately be put back in the - // 'dashboard_inactive' region, because dashboard_block_info_alter() is - // called when the blocks are rehashed. Fortunately, this is the exact - // behavior we want. - if ($block['region']['#default_value'] == 'dashboard_inactive') { - // @todo These do not wind up in correct alphabetical order. - $block['region']['#default_value'] = NULL; - } - } - } -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function dashboard_form_dashboard_admin_display_form_alter(&$form, &$form_state) { - // Redirect the 'configure' and 'delete' links on each block back to the - // dashboard blocks administration page. - foreach ($form['blocks'] as &$block) { - if (isset($block['configure']['#href'])) { - $block['configure']['#options']['query']['destination'] = 'admin/dashboard/configure'; - } - if (isset($block['delete']['#href'])) { - $block['delete']['#options']['query']['destination'] = 'admin/dashboard/configure'; - } - } -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function dashboard_form_block_admin_configure_alter(&$form, &$form_state) { - global $theme_key; - drupal_theme_initialize(); - // Hide the dashboard regions from the region select list on the block - // configuration form, for all themes except the current theme (since the - // other themes do not display the dashboard). - // @todo This assumes the current page is being displayed using the same - // theme that the dashboard is displayed in. - $dashboard_regions = dashboard_region_descriptions(); - foreach (element_children($form['regions']) as $region_name) { - $region = &$form['regions'][$region_name]; - if ($region_name != $theme_key && isset($region['#options'])) { - $region['#options'] = array_diff_key($region['#options'], $dashboard_regions); - } - } -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function dashboard_form_block_add_block_form_alter(&$form, &$form_state) { - dashboard_form_block_admin_configure_alter($form, $form_state); -} - -/** - * Preprocesses variables for block-admin-display-form.tpl.php. - */ -function template_preprocess_dashboard_admin_display_form(&$variables) { - template_preprocess_block_admin_display_form($variables); - if (isset($variables['block_regions'][BLOCK_REGION_NONE])) { - $variables['block_regions'][BLOCK_REGION_NONE] = t('Other blocks'); - } -} - -/** - * Determines if the dashboard should be displayed on the current page. - * - * This function checks if the user is currently viewing the dashboard and has - * access to see it. It is used by other functions in the dashboard module to - * decide whether or not the dashboard content should be displayed to the - * current user. - * - * Although the menu system normally handles the above tasks, it only does so - * for the main page content. However, the dashboard is not part of the main - * page content, but rather is displayed in special regions of the page (so it - * can interface with the Block module's method of managing page regions). We - * therefore need to maintain this separate function to check the menu item for - * us. - * - * @return - * TRUE if the dashboard should be visible on the current page, FALSE - * otherwise. - * - * @see dashboard_block_list_alter() - * @see dashboard_page_build() - */ -function dashboard_is_visible() { - static $is_visible; - if (!isset($is_visible)) { - // If the current menu item represents the page on which we want to display - // the dashboard, and if the current user has access to see it, return - // TRUE. - $menu_item = menu_get_item(); - $is_visible = isset($menu_item['page_callback']) && $menu_item['page_callback'] == 'dashboard_admin' && !empty($menu_item['access']); - } - return $is_visible; -} - -/** - * Returns an array of dashboard region descriptions, keyed by region name. - */ -function dashboard_region_descriptions() { - $regions = module_invoke_all('dashboard_regions'); - drupal_alter('dashboard_regions', $regions); - return $regions; -} - -/** - * Returns an array of dashboard region names. - */ -function dashboard_regions() { - $regions = &drupal_static(__FUNCTION__); - if (!isset($regions)) { - $regions = array_keys(dashboard_region_descriptions()); - } - return $regions; -} - -/** - * Implements hook_dashboard_regions(). - */ -function dashboard_dashboard_regions() { - return array( - 'dashboard_main' => 'Dashboard (main)', - 'dashboard_sidebar' => 'Dashboard (sidebar)', - 'dashboard_inactive' => 'Dashboard (inactive)', - ); -} - -/** - * Ajax callback: Shows disabled blocks in the dashboard customization mode. - */ -function dashboard_show_disabled() { - global $theme_key; - - // Blocks are not necessarily initialized at this point. - $blocks = _block_rehash(); - - // Limit the list to blocks that are marked as disabled for the dashboard. - foreach ($blocks as $key => $block) { - if ($block['theme'] != $theme_key || $block['region'] != 'dashboard_inactive') { - unset($blocks[$key]); - } - } - - // Theme the output and end the page request. - print theme('dashboard_disabled_blocks', array('blocks' => $blocks)); - drupal_exit(); -} - -/** - * Ajax callback: Displays the rendered contents of a specific block. - * - * @param $module - * The block's module name. - * @param $delta - * The block's delta. - */ -function dashboard_show_block_content($module, $delta) { - drupal_theme_initialize(); - global $theme_key; - - $blocks = array(); - $block_object = db_query("SELECT * FROM {block} WHERE theme = :theme AND module = :module AND delta = :delta", array( - ":theme" => $theme_key, - ":module" => $module, - ":delta" => $delta, - )) - ->fetchObject(); - $block_object->enabled = $block_object->page_match = TRUE; - $blocks[$module . "_" . $delta] = $block_object; - $block_content = _block_render_blocks($blocks); - $build = _block_get_renderable_array($block_content); - $rendered_block = drupal_render($build); - print $rendered_block; - drupal_exit(); -} - -/** - * Sets the new weight of each region according to the drag-and-drop order. - */ -function dashboard_update() { - drupal_theme_initialize(); - global $theme_key; - // Check the form token to make sure we have a valid request. - if (!empty($_REQUEST['form_token']) && drupal_valid_token($_REQUEST['form_token'], 'dashboard-update')) { - parse_str($_REQUEST['regions'], $regions); - foreach ($regions as $region_name => $blocks) { - if ($region_name == 'disabled_blocks') { - $region_name = 'dashboard_inactive'; - } - foreach ($blocks as $weight => $block_string) { - // Parse the query string to determine the block's module and delta. - preg_match('/block-([^-]+)-(.+)/', $block_string, $matches); - $block = new stdClass(); - $block->module = $matches[1]; - $block->delta = $matches[2]; - - $block->region = $region_name; - $block->weight = $weight; - $block->status = 1; - - db_merge('block') - ->key(array( - 'module' => $block->module, - 'delta' => $block->delta, - 'theme' => $theme_key, - )) - ->fields(array( - 'status' => $block->status, - 'weight' => $block->weight, - 'region' => $block->region, - 'pages' => '', - )) - ->execute(); - } - } - drupal_set_message(t('The configuration options have been saved.'), 'status', FALSE); - } - drupal_exit(); -} - -/** - * Returns HTML for the entire dashboard. - * - * @param $variables - * An associative array containing: - * - element: A render element containing the properties of the dashboard - * region element, #dashboard_region and #children. - * - * @ingroup themeable - */ -function theme_dashboard($variables) { - extract($variables); - drupal_add_css(drupal_get_path('module', 'dashboard') . '/dashboard.css'); - return '' . $element['#children'] . ''; -} - -/** - * Returns HTML for the non-customizable part of the dashboard page. - * - * @param $variables - * An associative array containing: - * - element: A render element containing a #message. - * - * @ingroup themeable - */ -function theme_dashboard_admin($variables) { - // We only return a simple help message, since the actual content of the page - // will be populated via the dashboard regions in dashboard_page_build(). - return '' . $variables['element']['#message'] . ''; -} - -/** - * Returns HTML for a generic dashboard region. - * - * @param $variables - * An associative array containing: - * - element: A render element containing the properties of the dashboard - * region element, #dashboard_region and #children. - * - * @ingroup themeable - */ -function theme_dashboard_region($variables) { - extract($variables); - $output = ''; - $output .= ''; - return $output; -} - -/** - * Returns HTML for disabled blocks, for use in dashboard customization mode. - * - * @param $variables - * An associative array containing: - * - blocks: An array of block objects from _block_rehash(). - * - * @ingroup themeable - */ -function theme_dashboard_disabled_blocks($variables) { - extract($variables); - $output = ''; - $output .= $element['#children']; - // Closing div.region - $output .= ''; - // Closing div.dashboard-region - $output .= ''; - return $output; -} - -/** - * Returns HTML for disabled blocks, for use in dashboard customization mode. - * - * @param $variables - * An associative array containing: - * - block: A block object from _block_rehash(). - * - * @ingroup themeable - */ -function theme_dashboard_disabled_block($variables) { - extract($variables); - $output = ""; - if (isset($block)) { - $output .= '' . t('Drag and drop these blocks to the columns below. Changes are automatically saved. More options are available on the configuration page.', array('@dashboard-url' => url('admin/dashboard/configure'))) . '
'; - $output .= ''; - foreach ($blocks as $block) { - $output .= theme('dashboard_disabled_block', array('block' => $block)); - } - $output .= ''; - $output .= '' . l(t('Add other blocks'), 'admin/dashboard/configure') . '
'; - $output .= '' - . ''; - } - return $output; -} - diff --git a/modules/dashboard/dashboard.test b/modules/dashboard/dashboard.test deleted file mode 100644 index 06344fc..0000000 --- a/modules/dashboard/dashboard.test +++ /dev/null @@ -1,141 +0,0 @@ - 'Dashboard blocks', - 'description' => 'Test blocks as used by the dashboard.', - 'group' => 'Dashboard', - ); - } - - function setUp() { - parent::setUp(); - - // Create and log in an administrative user having access to the dashboard. - $admin_user = $this->drupalCreateUser(array('access dashboard', 'administer blocks', 'access administration pages', 'administer modules')); - $this->drupalLogin($admin_user); - - // Make sure that the dashboard is using the same theme as the rest of the - // site (and in particular, the same theme used on 403 pages). This forces - // the dashboard blocks to be the same for an administrator as for a - // regular user, and therefore lets us test that the dashboard blocks - // themselves are specifically removed for a user who does not have access - // to the dashboard page. - theme_enable(array('stark')); - variable_set('theme_default', 'stark'); - variable_set('admin_theme', 'stark'); - } - - /** - * Tests adding a block to the dashboard and checking access to it. - */ - function testDashboardAccess() { - // Add a new custom block to a dashboard region. - $custom_block = array(); - $custom_block['info'] = $this->randomName(8); - $custom_block['title'] = $this->randomName(8); - $custom_block['body[value]'] = $this->randomName(32); - $custom_block['regions[stark]'] = 'dashboard_main'; - $this->drupalPost('admin/structure/block/add', $custom_block, t('Save block')); - - // Ensure admin access. - $this->drupalGet('admin/dashboard'); - $this->assertResponse(200, 'Admin has access to the dashboard.'); - $this->assertRaw($custom_block['title'], 'Admin has access to a dashboard block.'); - - // Ensure non-admin access is denied. - $normal_user = $this->drupalCreateUser(); - $this->drupalLogin($normal_user); - $this->drupalGet('admin/dashboard'); - $this->assertResponse(403, 'Non-admin has no access to the dashboard.'); - $this->assertNoText($custom_block['title'], 'Non-admin has no access to a dashboard block.'); - } - - /** - * Tests that dashboard regions are displayed or hidden properly. - */ - function testDashboardRegions() { - $dashboard_regions = dashboard_region_descriptions(); - - // Ensure blocks can be placed in dashboard regions. - $this->drupalGet('admin/dashboard/configure'); - foreach ($dashboard_regions as $region => $description) { - $elements = $this->xpath('//option[@value=:region]', array(':region' => $region)); - $this->assertTrue(!empty($elements), format_string('%region is an available choice on the dashboard block configuration page.', array('%region' => $region))); - } - - // Ensure blocks cannot be placed in dashboard regions on the standard - // blocks configuration page. - $this->drupalGet('admin/structure/block'); - foreach ($dashboard_regions as $region => $description) { - $elements = $this->xpath('//option[@value=:region]', array(':region' => $region)); - $this->assertTrue(empty($elements), format_string('%region is not an available choice on the block configuration page.', array('%region' => $region))); - } - } - - /** - * Tests that the dashboard module can be re-enabled, retaining its blocks. - */ - function testDisableEnable() { - // Add a new custom block to a dashboard region. - $custom_block = array(); - $custom_block['info'] = $this->randomName(8); - $custom_block['title'] = $this->randomName(8); - $custom_block['body[value]'] = $this->randomName(32); - $custom_block['regions[stark]'] = 'dashboard_main'; - $this->drupalPost('admin/structure/block/add', $custom_block, t('Save block')); - $this->drupalGet('admin/dashboard'); - $this->assertRaw($custom_block['title'], 'Block appears on the dashboard.'); - - $edit = array(); - $edit['modules[Core][dashboard][enable]'] = FALSE; - $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); - $this->assertNoRaw('assigned to the invalid region', 'Dashboard blocks gracefully disabled.'); - module_list(TRUE); - $this->assertFalse(module_exists('dashboard'), 'Dashboard disabled.'); - - $edit['modules[Core][dashboard][enable]'] = 'dashboard'; - $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); - module_list(TRUE); - $this->assertTrue(module_exists('dashboard'), 'Dashboard enabled.'); - - $this->drupalGet('admin/dashboard'); - $this->assertRaw($custom_block['title'], 'Block still appears on the dashboard.'); - } - - /** - * Tests that administrative blocks are available for the dashboard. - */ - function testBlockAvailability() { - // Test "Recent comments", which should be available (defined as - // "administrative") but not enabled. - $this->drupalGet('admin/dashboard'); - $this->assertNoText(t('Recent comments'), '"Recent comments" not on dashboard.'); - $this->drupalGet('admin/dashboard/drawer'); - $this->assertText(t('Recent comments'), 'Drawer of disabled blocks includes a block defined as "administrative".'); - $this->assertNoText(t('Syndicate'), 'Drawer of disabled blocks excludes a block not defined as "administrative".'); - $this->drupalGet('admin/dashboard/configure'); - $elements = $this->xpath('//select[@id=:id]//option[@selected="selected"]', array(':id' => 'edit-blocks-comment-recent-region')); - $this->assertTrue($elements[0]['value'] == 'dashboard_inactive', 'A block defined as "administrative" defaults to dashboard_inactive.'); - - // Now enable the block on the dashboard. - $values = array(); - $values['blocks[comment_recent][region]'] = 'dashboard_main'; - $this->drupalPost('admin/dashboard/configure', $values, t('Save blocks')); - $this->drupalGet('admin/dashboard'); - $this->assertText(t('Recent comments'), '"Recent comments" was placed on dashboard.'); - $this->drupalGet('admin/dashboard/drawer'); - $this->assertNoText(t('Recent comments'), 'Drawer of disabled blocks excludes enabled blocks.'); - } -} diff --git a/modules/dblog/dblog-rtl.css b/modules/dblog/dblog-rtl.css deleted file mode 100644 index 0fab8d0..0000000 --- a/modules/dblog/dblog-rtl.css +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @file - * Right-to-Left styling for the Database Logging module. - */ - -.form-item-type, -.form-item-severity { - float: right; - padding-right: 0; - padding-left: .8em; -} diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc deleted file mode 100644 index 7c1c0e2..0000000 --- a/modules/dblog/dblog.admin.inc +++ /dev/null @@ -1,418 +0,0 @@ - 'dblog-debug', - WATCHDOG_INFO => 'dblog-info', - WATCHDOG_NOTICE => 'dblog-notice', - WATCHDOG_WARNING => 'dblog-warning', - WATCHDOG_ERROR => 'dblog-error', - WATCHDOG_CRITICAL => 'dblog-critical', - WATCHDOG_ALERT => 'dblog-alert', - WATCHDOG_EMERGENCY => 'dblog-emerg', - ); - - $build['dblog_filter_form'] = drupal_get_form('dblog_filter_form'); - $build['dblog_clear_log_form'] = drupal_get_form('dblog_clear_log_form'); - - $header = array( - '', // Icon column. - array('data' => t('Type'), 'field' => 'w.type'), - array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'), - t('Message'), - array('data' => t('User'), 'field' => 'u.name'), - array('data' => t('Operations')), - ); - - $query = db_select('watchdog', 'w')->extend('PagerDefault')->extend('TableSort'); - $query->leftJoin('users', 'u', 'w.uid = u.uid'); - $query - ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link')) - ->addField('u', 'name'); - if (!empty($filter['where'])) { - $query->where($filter['where'], $filter['args']); - } - $result = $query - ->limit(50) - ->orderByHeader($header) - ->execute(); - - foreach ($result as $dblog) { - $rows[] = array('data' => - array( - // Cells - array('class' => 'icon'), - t($dblog->type), - format_date($dblog->timestamp, 'short'), - theme('dblog_message', array('event' => $dblog, 'link' => TRUE)), - theme('username', array('account' => $dblog)), - filter_xss($dblog->link), - ), - // Attributes for tr - 'class' => array(drupal_html_class('dblog-' . $dblog->type), $classes[$dblog->severity]), - ); - } - - $build['dblog_table'] = array( - '#theme' => 'table', - '#header' => $header, - '#rows' => $rows, - '#attributes' => array('id' => 'admin-dblog'), - '#empty' => t('No log messages available.'), - ); - $build['dblog_pager'] = array('#theme' => 'pager'); - - return $build; -} - -/** - * Page callback: Shows the most frequent log messages of a given event type. - * - * Messages are not truncated on this page because events detailed herein do not - * have links to a detailed view. - * - * @param string $type - * Type of database log events to display (e.g., 'search'). - * - * @return array - * A build array in the format expected by drupal_render(). - * - * @see dblog_menu() - */ -function dblog_top($type) { - - $header = array( - array('data' => t('Count'), 'field' => 'count', 'sort' => 'desc'), - array('data' => t('Message'), 'field' => 'message') - ); - $count_query = db_select('watchdog'); - $count_query->addExpression('COUNT(DISTINCT(message))'); - $count_query->condition('type', $type); - - $query = db_select('watchdog', 'w')->extend('PagerDefault')->extend('TableSort'); - $query->addExpression('COUNT(wid)', 'count'); - $query = $query - ->fields('w', array('message', 'variables')) - ->condition('w.type', $type) - ->groupBy('message') - ->groupBy('variables') - ->limit(30) - ->orderByHeader($header); - $query->setCountQuery($count_query); - $result = $query->execute(); - - $rows = array(); - foreach ($result as $dblog) { - $rows[] = array($dblog->count, theme('dblog_message', array('event' => $dblog))); - } - - $build['dblog_top_table'] = array( - '#theme' => 'table', - '#header' => $header, - '#rows' => $rows, - '#empty' => t('No log messages available.'), - ); - $build['dblog_top_pager'] = array('#theme' => 'pager'); - - return $build; -} - -/** - * Page callback: Displays details about a specific database log message. - * - * @param int $id - * Unique ID of the database log message. - * - * @return array|string - * If the ID is located in the Database Logging table, a build array in the - * format expected by drupal_render(); otherwise, an empty string. - * - * @see dblog_menu() - */ -function dblog_event($id) { - $severity = watchdog_severity_levels(); - $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = :id', array(':id' => $id))->fetchObject(); - if ($dblog = $result) { - $rows = array( - array( - array('data' => t('Type'), 'header' => TRUE), - t($dblog->type), - ), - array( - array('data' => t('Date'), 'header' => TRUE), - format_date($dblog->timestamp, 'long'), - ), - array( - array('data' => t('User'), 'header' => TRUE), - theme('username', array('account' => $dblog)), - ), - array( - array('data' => t('Location'), 'header' => TRUE), - l($dblog->location, $dblog->location), - ), - array( - array('data' => t('Referrer'), 'header' => TRUE), - l($dblog->referer, $dblog->referer), - ), - array( - array('data' => t('Message'), 'header' => TRUE), - theme('dblog_message', array('event' => $dblog)), - ), - array( - array('data' => t('Severity'), 'header' => TRUE), - $severity[$dblog->severity], - ), - array( - array('data' => t('Hostname'), 'header' => TRUE), - check_plain($dblog->hostname), - ), - array( - array('data' => t('Operations'), 'header' => TRUE), - $dblog->link, - ), - ); - $build['dblog_table'] = array( - '#theme' => 'table', - '#rows' => $rows, - '#attributes' => array('class' => array('dblog-event')), - ); - return $build; - } - else { - return ''; - } -} - -/** - * Builds a query for database log administration filters based on session. - * - * @return array - * An associative array with keys 'where' and 'args'. - */ -function dblog_build_filter_query() { - if (empty($_SESSION['dblog_overview_filter'])) { - return; - } - - $filters = dblog_filters(); - - // Build query - $where = $args = array(); - foreach ($_SESSION['dblog_overview_filter'] as $key => $filter) { - $filter_where = array(); - foreach ($filter as $value) { - $filter_where[] = $filters[$key]['where']; - $args[] = $value; - } - if (!empty($filter_where)) { - $where[] = '(' . implode(' OR ', $filter_where) . ')'; - } - } - $where = !empty($where) ? implode(' AND ', $where) : ''; - - return array( - 'where' => $where, - 'args' => $args, - ); -} - -/** - * Creates a list of database log administration filters that can be applied. - * - * @return array - * Associative array of filters. The top-level keys are used as the form - * element names for the filters, and the values are arrays with the following - * elements: - * - title: Title of the filter. - * - where: The filter condition. - * - options: Array of options for the select list for the filter. - */ -function dblog_filters() { - $filters = array(); - - foreach (_dblog_get_message_types() as $type) { - $types[$type] = t($type); - } - - if (!empty($types)) { - $filters['type'] = array( - 'title' => t('Type'), - 'where' => "w.type = ?", - 'options' => $types, - ); - } - - $filters['severity'] = array( - 'title' => t('Severity'), - 'where' => 'w.severity = ?', - 'options' => watchdog_severity_levels(), - ); - - return $filters; -} - -/** - * Returns HTML for a log message. - * - * @param array $variables - * An associative array containing: - * - event: An object with at least the message and variables properties. - * - link: (optional) Format message as link, event->wid is required. - * - * @ingroup themeable - */ -function theme_dblog_message($variables) { - $output = ''; - $event = $variables['event']; - // Check for required properties. - if (isset($event->message) && isset($event->variables)) { - // Messages without variables or user specified text. - if ($event->variables === 'N;') { - $output = $event->message; - } - // Message to translate with injected variables. - else { - $output = t($event->message, unserialize($event->variables)); - } - if ($variables['link'] && isset($event->wid)) { - // Truncate message to 56 chars. - $output = truncate_utf8(filter_xss($output, array()), 56, TRUE, TRUE); - $output = l($output, 'admin/reports/event/' . $event->wid, array('html' => TRUE)); - } - } - return $output; -} - -/** - * Form constructor for the database logging filter form. - * - * @see dblog_filter_form_validate() - * @see dblog_filter_form_submit() - * @see dblog_overview() - * - * @ingroup forms - */ -function dblog_filter_form($form) { - $filters = dblog_filters(); - - $form['filters'] = array( - '#type' => 'fieldset', - '#title' => t('Filter log messages'), - '#collapsible' => TRUE, - '#collapsed' => empty($_SESSION['dblog_overview_filter']), - ); - foreach ($filters as $key => $filter) { - $form['filters']['status'][$key] = array( - '#title' => $filter['title'], - '#type' => 'select', - '#multiple' => TRUE, - '#size' => 8, - '#options' => $filter['options'], - ); - if (!empty($_SESSION['dblog_overview_filter'][$key])) { - $form['filters']['status'][$key]['#default_value'] = $_SESSION['dblog_overview_filter'][$key]; - } - } - - $form['filters']['actions'] = array( - '#type' => 'actions', - '#attributes' => array('class' => array('container-inline')), - ); - $form['filters']['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Filter'), - ); - if (!empty($_SESSION['dblog_overview_filter'])) { - $form['filters']['actions']['reset'] = array( - '#type' => 'submit', - '#value' => t('Reset') - ); - } - return $form; -} - -/** - * Form validation handler for dblog_filter_form(). - * - * @see dblog_filter_form_submit() - */ -function dblog_filter_form_validate($form, &$form_state) { - if ($form_state['values']['op'] == t('Filter') && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) { - form_set_error('type', t('You must select something to filter by.')); - } -} - -/** - * Form submission handler for dblog_filter_form(). - * - * @see dblog_filter_form_validate() - */ -function dblog_filter_form_submit($form, &$form_state) { - $op = $form_state['values']['op']; - $filters = dblog_filters(); - switch ($op) { - case t('Filter'): - foreach ($filters as $name => $filter) { - if (isset($form_state['values'][$name])) { - $_SESSION['dblog_overview_filter'][$name] = $form_state['values'][$name]; - } - } - break; - case t('Reset'): - $_SESSION['dblog_overview_filter'] = array(); - break; - } - return 'admin/reports/dblog'; -} - -/** - * Form constructor for the form that clears out the log. - * - * @see dblog_clear_log_submit() - * @ingroup forms - */ -function dblog_clear_log_form($form) { - $form['dblog_clear'] = array( - '#type' => 'fieldset', - '#title' => t('Clear log messages'), - '#description' => t('This will permanently remove the log messages from the database.'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['dblog_clear']['clear'] = array( - '#type' => 'submit', - '#value' => t('Clear log messages'), - '#submit' => array('dblog_clear_log_submit'), - ); - - return $form; -} - -/** - * Form submission handler for dblog_clear_log_form(). - */ -function dblog_clear_log_submit() { - $_SESSION['dblog_overview_filter'] = array(); - db_delete('watchdog')->execute(); - drupal_set_message(t('Database log cleared.')); -} diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css deleted file mode 100644 index b127886..0000000 --- a/modules/dblog/dblog.css +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @file - * Admin styles for the Database Logging module. - */ - -.form-item-type, -.form-item-severity { - float: left; /* LTR */ - padding-right: .8em; /* LTR */ - margin: 0.1em; - /** - * In Opera 9, DOM elements with the property of "overflow: auto" - * will partially hide its contents with unnecessary scrollbars when - * its immediate child is floated without an explicit width set. - */ - width: 15em; -} -#dblog-filter-form .form-type-select select { - width: 100%; -} -#dblog-filter-form .form-actions { - float: left; - padding: 3ex 0 0 1em; -} - -tr.dblog-user { - background: #ffd; -} -tr.dblog-user .active { - background: #eed; -} -tr.dblog-content { - background: #ddf; -} -tr.dblog-content .active { - background: #cce; -} -tr.dblog-page-not-found, -tr.dblog-access-denied { - background: #dfd; -} -tr.dblog-page-not-found .active, -tr.dblog-access-denied .active { - background: #cec; -} -tr.dblog-error { - background: #ffc9c9; -} -tr.dblog-error .active { - background: #eeb9b9; -} -table#admin-dblog td.icon { - background: no-repeat center; - width: 16px; -} -table#admin-dblog tr.dblog-warning td.icon { - background-image: url(../../misc/message-16-warning.png); -} -table#admin-dblog tr.dblog-error td.icon, -table#admin-dblog tr.dblog-critical td.icon, -table#admin-dblog tr.dblog-alert td.icon, -table#admin-dblog tr.dblog-emerg td.icon { - background-image: url(../../misc/message-16-error.png); -} diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info deleted file mode 100644 index 608bdd7..0000000 --- a/modules/dblog/dblog.info +++ /dev/null @@ -1,6 +0,0 @@ -name = Database logging -description = Logs and records system events to the database. -package = Core -version = VERSION -core = 7.x -files[] = dblog.test diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install deleted file mode 100644 index abfd9a2..0000000 --- a/modules/dblog/dblog.install +++ /dev/null @@ -1,159 +0,0 @@ - 'Table that contains logs of all system events.', - 'fields' => array( - 'wid' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'Primary Key: Unique watchdog event ID.', - ), - 'uid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'The {users}.uid of the user who triggered the event.', - ), - 'type' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Type of log message, for example "user" or "page not found."', - ), - 'message' => array( - 'type' => 'text', - 'not null' => TRUE, - 'size' => 'big', - 'description' => 'Text of log message to be passed into the t() function.', - ), - 'variables' => array( - 'type' => 'blob', - 'not null' => TRUE, - 'size' => 'big', - 'description' => 'Serialized array of variables that match the message string and that is passed into the t() function.', - ), - 'severity' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'The severity level of the event; ranges from 0 (Emergency) to 7 (Debug)', - ), - 'link' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - 'default' => '', - 'description' => 'Link to view the result of the event.', - ), - 'location' => array( - 'type' => 'text', - 'not null' => TRUE, - 'description' => 'URL of the origin of the event.', - ), - 'referer' => array( - 'type' => 'text', - 'not null' => FALSE, - 'description' => 'URL of referring page.', - ), - 'hostname' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Hostname of the user who triggered the event.', - ), - 'timestamp' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Unix timestamp of when event occurred.', - ), - ), - 'primary key' => array('wid'), - 'indexes' => array( - 'type' => array('type'), - 'uid' => array('uid'), - 'severity' => array('severity'), - ), - ); - - return $schema; -} - -/** - * Implements hook_uninstall(). - */ -function dblog_uninstall() { - variable_del('dblog_row_limit'); -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Update the {watchdog} table. - */ -function dblog_update_7001() { - // Allow NULL values for links. - db_change_field('watchdog', 'link', 'link', array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - 'default' => '', - 'description' => 'Link to view the result of the event.', - )); - - // Add an index on uid. - db_add_index('watchdog', 'uid', array('uid')); - - // Allow longer type values. - db_change_field('watchdog', 'type', 'type', array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Type of log message, for example "user" or "page not found."', - )); - - // Convert the variables field (that stores serialized variables) from text to blob. - db_change_field('watchdog', 'variables', 'variables', array( - 'type' => 'blob', - 'not null' => TRUE, - 'size' => 'big', - 'description' => 'Serialized array of variables that match the message string and that is passed into the t() function.', - )); -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Add an index to the severity column in the watchdog database table. - */ -function dblog_update_7002() { - db_add_index('watchdog', 'severity', array('severity')); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module deleted file mode 100644 index 9183eed..0000000 --- a/modules/dblog/dblog.module +++ /dev/null @@ -1,187 +0,0 @@ -' . t('About') . ''; - $output .= '' . (!empty($block['title']) && $block['title'] != '
' - . '' - . '' ? check_plain($block['title']) : check_plain($block['info'])) . ' ' . t('The Database logging module logs system events in the Drupal database. For more information, see the online handbook entry for the Database logging module.', array('@dblog' => 'http://drupal.org/documentation/modules/dblog')) . '
'; - $output .= '' . t('Uses') . '
'; - $output .= '- ';
- $output .= '
' . t('The Database logging module monitors your website, capturing system events in a log (shown here) to be reviewed by an authorized individual at a later time. This log is a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the Recent log messages report on a regular basis, as it is often the only way to tell what is going on.') . '
'; - } -} - -/** - * Implements hook_menu(). - */ -function dblog_menu() { - $items['admin/reports/dblog'] = array( - 'title' => 'Recent log messages', - 'description' => 'View events that have recently been logged.', - 'page callback' => 'dblog_overview', - 'access arguments' => array('access site reports'), - 'weight' => -1, - 'file' => 'dblog.admin.inc', - ); - $items['admin/reports/page-not-found'] = array( - 'title' => "Top 'page not found' errors", - 'description' => "View 'page not found' errors (404s).", - 'page callback' => 'dblog_top', - 'page arguments' => array('page not found'), - 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', - ); - $items['admin/reports/access-denied'] = array( - 'title' => "Top 'access denied' errors", - 'description' => "View 'access denied' errors (403s).", - 'page callback' => 'dblog_top', - 'page arguments' => array('access denied'), - 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', - ); - $items['admin/reports/event/%'] = array( - 'title' => 'Details', - 'page callback' => 'dblog_event', - 'page arguments' => array(3), - 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', - ); - - if (module_exists('search')) { - $items['admin/reports/search'] = array( - 'title' => 'Top search phrases', - 'description' => 'View most popular search phrases.', - 'page callback' => 'dblog_top', - 'page arguments' => array('search'), - 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', - ); - } - - return $items; -} - -/** - * Implements hook_init(). - */ -function dblog_init() { - if (arg(0) == 'admin' && arg(1) == 'reports') { - // Add the CSS for this module - drupal_add_css(drupal_get_path('module', 'dblog') . '/dblog.css'); - } -} - -/** - * Implements hook_cron(). - * - * Controls the size of the log table, paring it to 'dblog_row_limit' messages. - */ -function dblog_cron() { - // Cleanup the watchdog table. - $row_limit = variable_get('dblog_row_limit', 1000); - - // For row limit n, get the wid of the nth row in descending wid order. - // Counting the most recent n rows avoids issues with wid number sequences, - // e.g. auto_increment value > 1 or rows deleted directly from the table. - if ($row_limit > 0) { - $min_row = db_select('watchdog', 'w') - ->fields('w', array('wid')) - ->orderBy('wid', 'DESC') - ->range($row_limit - 1, 1) - ->execute()->fetchField(); - - // Delete all table entries older than the nth row, if nth row was found. - if ($min_row) { - db_delete('watchdog') - ->condition('wid', $min_row, '<') - ->execute(); - } - } -} - -/** - * Gathers a list of uniquely defined database log message types. - * - * @return array - * List of uniquely defined database log message types. - */ -function _dblog_get_message_types() { - $types = array(); - - $result = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type'); - foreach ($result as $object) { - $types[] = $object->type; - } - - return $types; -} - -/** - * Implements hook_watchdog(). - * - * Note: Some values may be truncated to meet database column size restrictions. - */ -function dblog_watchdog(array $log_entry) { - Database::getConnection('default', 'default')->insert('watchdog') - ->fields(array( - 'uid' => $log_entry['uid'], - 'type' => substr($log_entry['type'], 0, 64), - 'message' => $log_entry['message'], - 'variables' => serialize($log_entry['variables']), - 'severity' => $log_entry['severity'], - 'link' => substr($log_entry['link'], 0, 255), - 'location' => $log_entry['request_uri'], - 'referer' => $log_entry['referer'], - 'hostname' => substr($log_entry['ip'], 0, 128), - 'timestamp' => $log_entry['timestamp'], - )) - ->execute(); -} - -/** - * Implements hook_form_FORM_ID_alter() for system_logging_settings(). - */ -function dblog_form_system_logging_settings_alter(&$form, $form_state) { - $form['dblog_row_limit'] = array( - '#type' => 'select', - '#title' => t('Database log messages to keep'), - '#default_value' => variable_get('dblog_row_limit', 1000), - '#options' => array(0 => t('All')) + drupal_map_assoc(array(100, 1000, 10000, 100000, 1000000)), - '#description' => t('The maximum number of messages to keep in the database log. Requires a cron maintenance task.', array('@cron' => url('admin/reports/status'))) - ); - $form['actions']['#weight'] = 1; -} - -/** - * Implements hook_theme(). - */ -function dblog_theme() { - return array( - 'dblog_message' => array( - 'variables' => array('event' => NULL, 'link' => FALSE), - 'file' => 'dblog.admin.inc', - ), - ); -} diff --git a/modules/field/field.default.inc b/modules/field/field.default.inc deleted file mode 100644 index cb49bdb..0000000 --- a/modules/field/field.default.inc +++ /dev/null @@ -1,268 +0,0 @@ -{$field['field_name']}[$langcode], or an empty array if unset. - * @param $errors - * The array of errors, keyed by field name and by value delta, that have - * already been reported for the entity. The function should add its errors - * to this array. Each error is an associative array, with the following - * keys and values: - * - 'error': an error code (should be a string, prefixed with the module name) - * - 'message': the human readable message to be displayed. - */ -function field_default_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { - // Filter out empty values. - $items = _field_filter_items($field, $items); - - // Check that the number of values doesn't exceed the field cardinality. - // For form submitted values, this can only happen with 'multiple value' - // widgets. - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && count($items) > $field['cardinality']) { - $errors[$field['field_name']][$langcode][0][] = array( - 'error' => 'field_cardinality', - 'message' => t('%name: this field cannot hold more than @count values.', array('%name' => $instance['label'], '@count' => $field['cardinality'])), - ); - } -} - -function field_default_submit($entity_type, $entity, $field, $instance, $langcode, &$items, $form, &$form_state) { - // Filter out empty values. - $items = _field_filter_items($field, $items); - // Reorder items to account for drag-n-drop reordering. - $items = _field_sort_items($field, $items); -} - -/** - * Default field 'insert' operation. - * - * Insert default value if no $entity->$field_name entry was provided. - * This can happen with programmatic saves, or on form-based creation where - * the current user doesn't have 'edit' permission for the field. - */ -function field_default_insert($entity_type, $entity, $field, $instance, $langcode, &$items) { - // _field_invoke() populates $items with an empty array if the $entity has no - // entry for the field, so we check on the $entity itself. - // We also check that the current field translation is actually defined before - // assigning it a default value. This way we ensure that only the intended - // languages get a default value. Otherwise we could have default values for - // not yet open languages. - if (empty($entity) || !property_exists($entity, $field['field_name']) || - (isset($entity->{$field['field_name']}[$langcode]) && count($entity->{$field['field_name']}[$langcode]) == 0)) { - $items = field_get_default_value($entity_type, $entity, $field, $instance, $langcode); - } -} - -/** - * Invokes hook_field_formatter_prepare_view() on the relevant formatters. - * - * @param $entity_type - * The type of $entity; e.g. 'node' or 'user'. - * @param $entities - * An array of entities being displayed, keyed by entity id. - * @param $field - * The field structure for the operation. - * @param $instances - * Array of instance structures for $field for each entity, keyed by entity - * id. - * @param $langcode - * The language associated to $items. - * @param $items - * Array of field values already loaded for the entities, keyed by entity id. - * @param $display - * Can be either: - * - the name of a view mode - * - or an array of display settings to use for display, as found in the - * 'display' entry of $instance definitions. - */ -function field_default_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $display) { - // Group entities, instances and items by formatter module. - $modules = array(); - foreach ($instances as $id => $instance) { - if (is_string($display)) { - $view_mode = $display; - $instance_display = field_get_display($instance, $view_mode, $entities[$id]); - } - else { - $instance_display = $display; - } - - if ($instance_display['type'] !== 'hidden') { - $module = $instance_display['module']; - $modules[$module] = $module; - $grouped_entities[$module][$id] = $entities[$id]; - $grouped_instances[$module][$id] = $instance; - $grouped_displays[$module][$id] = $instance_display; - // hook_field_formatter_prepare_view() alters $items by reference. - $grouped_items[$module][$id] = &$items[$id]; - } - } - - foreach ($modules as $module) { - // Invoke hook_field_formatter_prepare_view(). - $function = $module . '_field_formatter_prepare_view'; - if (function_exists($function)) { - $function($entity_type, $grouped_entities[$module], $field, $grouped_instances[$module], $langcode, $grouped_items[$module], $grouped_displays[$module]); - } - } -} - -/** - * Builds a renderable array for one field on one entity instance. - * - * @param $entity_type - * The type of $entity; e.g. 'node' or 'user'. - * @param $entity - * A single object of type $entity_type. - * @param $field - * The field structure for the operation. - * @param $instance - * An array containing each field on $entity's bundle. - * @param $langcode - * The language associated to $items. - * @param $items - * Array of field values already loaded for the entities, keyed by entity id. - * @param $display - * Can be either: - * - the name of a view mode; - * - or an array of custom display settings, as found in the 'display' entry - * of $instance definitions. - */ -function field_default_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - $addition = array(); - - // Prepare incoming display specifications. - if (is_string($display)) { - $view_mode = $display; - $display = field_get_display($instance, $view_mode, $entity); - } - else { - $view_mode = '_custom_display'; - } - - if ($display['type'] !== 'hidden') { - // Calling the formatter function through module_invoke() can have a - // performance impact on pages with many fields and values. - $function = $display['module'] . '_field_formatter_view'; - if (function_exists($function)) { - $elements = $function($entity_type, $entity, $field, $instance, $langcode, $items, $display); - - if ($elements) { - $info = array( - '#theme' => 'field', - '#weight' => $display['weight'], - '#title' => $instance['label'], - '#access' => field_access('view', $field, $entity_type, $entity), - '#label_display' => $display['label'], - '#view_mode' => $view_mode, - '#language' => $langcode, - '#field_name' => $field['field_name'], - '#field_type' => $field['type'], - '#field_translatable' => $field['translatable'], - '#entity_type' => $entity_type, - '#bundle' => $bundle, - '#object' => $entity, - '#items' => $items, - '#formatter' => $display['type'] - ); - - $addition[$field['field_name']] = array_merge($info, $elements); - } - } - } - - return $addition; -} - -/** - * Copies source field values into the entity to be prepared. - * - * @param $entity_type - * The type of $entity; e.g. 'node' or 'user'. - * @param $entity - * The entity to be prepared for translation. - * @param $field - * The field structure for the operation. - * @param $instance - * The instance structure for $field on $entity's bundle. - * @param $langcode - * The language the entity has to be translated in. - * @param $items - * $entity->{$field['field_name']}[$langcode], or an empty array if unset. - * @param $source_entity - * The source entity holding the field values to be translated. - * @param $source_langcode - * The source language from which translate. - */ -function field_default_prepare_translation($entity_type, $entity, $field, $instance, $langcode, &$items, $source_entity, $source_langcode) { - $field_name = $field['field_name']; - // If the field is untranslatable keep using LANGUAGE_NONE. - if ($langcode == LANGUAGE_NONE) { - $source_langcode = LANGUAGE_NONE; - } - if (isset($source_entity->{$field_name}[$source_langcode])) { - $items = $source_entity->{$field_name}[$source_langcode]; - } -} diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc deleted file mode 100644 index 280f778..0000000 --- a/modules/field/field.form.inc +++ /dev/null @@ -1,604 +0,0 @@ - $entity_type, - 'entity' => $entity, - 'field' => $field, - 'instance' => $instance, - ); - drupal_alter(array('field_widget_properties', 'field_widget_properties_' . $entity_type), $instance['widget'], $context); - - // Collect widget elements. - $elements = array(); - - // Store field information in $form_state. - if (!field_form_get_state($parents, $field_name, $langcode, $form_state)) { - $field_state = array( - 'field' => $field, - 'instance' => $instance, - 'items_count' => count($items), - 'array_parents' => array(), - 'errors' => array(), - ); - field_form_set_state($parents, $field_name, $langcode, $form_state, $field_state); - } - - // If field module handles multiple values for this form element, and we are - // displaying an individual element, process the multiple value form. - if (!isset($get_delta) && field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) { - // Store the entity in the form. - $form['#entity'] = $entity; - $elements = field_multiple_value_form($field, $instance, $langcode, $items, $form, $form_state); - } - // If the widget is handling multiple values (e.g Options), or if we are - // displaying an individual element, just get a single form element and make - // it the $delta value. - else { - $delta = isset($get_delta) ? $get_delta : 0; - $function = $instance['widget']['module'] . '_field_widget_form'; - if (function_exists($function)) { - $element = array( - '#entity' => $entity, - '#entity_type' => $instance['entity_type'], - '#bundle' => $instance['bundle'], - '#field_name' => $field_name, - '#language' => $langcode, - '#field_parents' => $parents, - '#columns' => array_keys($field['columns']), - '#title' => check_plain($instance['label']), - '#description' => field_filter_xss($instance['description']), - // Only the first widget should be required. - '#required' => $delta == 0 && $instance['required'], - '#delta' => $delta, - ); - if ($element = $function($form, $form_state, $field, $instance, $langcode, $items, $delta, $element)) { - // Allow modules to alter the field widget form element. - $context = array( - 'form' => $form, - 'field' => $field, - 'instance' => $instance, - 'langcode' => $langcode, - 'items' => $items, - 'delta' => $delta, - ); - drupal_alter(array('field_widget_form', 'field_widget_' . $instance['widget']['type'] . '_form'), $element, $form_state, $context); - - // If we're processing a specific delta value for a field where the - // field module handles multiples, set the delta in the result. - // For fields that handle their own processing, we can't make - // assumptions about how the field is structured, just merge in the - // returned element. - if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) { - $elements[$delta] = $element; - } - else { - $elements = $element; - } - } - } - } - - // Also aid in theming of field widgets by rendering a classified container. - $addition[$field_name] = array( - '#type' => 'container', - '#attributes' => array( - 'class' => array( - 'field-type-' . drupal_html_class($field['type']), - 'field-name-' . drupal_html_class($field_name), - 'field-widget-' . drupal_html_class($instance['widget']['type']), - ), - ), - '#weight' => $instance['widget']['weight'], - ); - - // Populate the 'array_parents' information in $form_state['field'] after - // the form is built, so that we catch changes in the form structure performed - // in alter() hooks. - $elements['#after_build'][] = 'field_form_element_after_build'; - $elements['#field_name'] = $field_name; - $elements['#language'] = $langcode; - $elements['#field_parents'] = $parents; - - $addition[$field_name] += array( - '#tree' => TRUE, - // The '#language' key can be used to access the field's form element - // when $langcode is unknown. - '#language' => $langcode, - $langcode => $elements, - '#access' => field_access('edit', $field, $entity_type, $entity), - ); - - return $addition; -} - -/** - * Special handling to create form elements for multiple values. - * - * Handles generic features for multiple fields: - * - number of widgets - * - AHAH-'add more' button - * - drag-n-drop value reordering - */ -function field_multiple_value_form($field, $instance, $langcode, $items, &$form, &$form_state) { - $field_name = $field['field_name']; - $parents = $form['#parents']; - - // Determine the number of widgets to display. - switch ($field['cardinality']) { - case FIELD_CARDINALITY_UNLIMITED: - $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state); - $max = $field_state['items_count']; - break; - - default: - $max = $field['cardinality'] - 1; - break; - } - - $title = check_plain($instance['label']); - $description = field_filter_xss($instance['description']); - - $id_prefix = implode('-', array_merge($parents, array($field_name))); - $wrapper_id = drupal_html_id($id_prefix . '-add-more-wrapper'); - - $field_elements = array(); - - $function = $instance['widget']['module'] . '_field_widget_form'; - if (function_exists($function)) { - for ($delta = 0; $delta <= $max; $delta++) { - $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; - $element = array( - '#entity_type' => $instance['entity_type'], - '#entity' => $form['#entity'], - '#bundle' => $instance['bundle'], - '#field_name' => $field_name, - '#language' => $langcode, - '#field_parents' => $parents, - '#columns' => array_keys($field['columns']), - // For multiple fields, title and description are handled by the wrapping table. - '#title' => $multiple ? '' : $title, - '#description' => $multiple ? '' : $description, - // Only the first widget should be required. - '#required' => $delta == 0 && $instance['required'], - '#delta' => $delta, - '#weight' => $delta, - ); - if ($element = $function($form, $form_state, $field, $instance, $langcode, $items, $delta, $element)) { - // Input field for the delta (drag-n-drop reordering). - if ($multiple) { - // We name the element '_weight' to avoid clashing with elements - // defined by widget. - $element['_weight'] = array( - '#type' => 'weight', - '#title' => t('Weight for row @number', array('@number' => $delta + 1)), - '#title_display' => 'invisible', - // Note: this 'delta' is the FAPI 'weight' element's property. - '#delta' => $max, - '#default_value' => isset($items[$delta]['_weight']) ? $items[$delta]['_weight'] : $delta, - '#weight' => 100, - ); - } - - // Allow modules to alter the field widget form element. - $context = array( - 'form' => $form, - 'field' => $field, - 'instance' => $instance, - 'langcode' => $langcode, - 'items' => $items, - 'delta' => $delta, - ); - drupal_alter(array('field_widget_form', 'field_widget_' . $instance['widget']['type'] . '_form'), $element, $form_state, $context); - - $field_elements[$delta] = $element; - } - } - - if ($field_elements) { - $field_elements += array( - '#theme' => 'field_multiple_value_form', - '#field_name' => $field['field_name'], - '#cardinality' => $field['cardinality'], - '#title' => $title, - '#required' => $instance['required'], - '#description' => $description, - '#prefix' => '', - '#suffix' => '', - '#max_delta' => $max, - ); - // Add 'add more' button, if not working with a programmed form. - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED && empty($form_state['programmed'])) { - $field_elements['add_more'] = array( - '#type' => 'submit', - '#name' => strtr($id_prefix, '-', '_') . '_add_more', - '#value' => t('Add another item'), - '#attributes' => array('class' => array('field-add-more-submit')), - '#limit_validation_errors' => array(array_merge($parents, array($field_name, $langcode))), - '#submit' => array('field_add_more_submit'), - '#ajax' => array( - 'callback' => 'field_add_more_js', - 'wrapper' => $wrapper_id, - 'effect' => 'fade', - ), - ); - } - } - } - - return $field_elements; -} - -/** - * Returns HTML for an individual form element. - * - * Combine multiple values into a table with drag-n-drop reordering. - * TODO : convert to a template. - * - * @param $variables - * An associative array containing: - * - element: A render element representing the form element. - * - * @ingroup themeable - */ -function theme_field_multiple_value_form($variables) { - $element = $variables['element']; - $output = ''; - - if ($element['#cardinality'] > 1 || $element['#cardinality'] == FIELD_CARDINALITY_UNLIMITED) { - $table_id = drupal_html_id($element['#field_name'] . '_values'); - $order_class = $element['#field_name'] . '-delta-order'; - $required = !empty($element['#required']) ? theme('form_required_marker', $variables) : ''; - - $header = array( - array( - 'data' => '", - 'colspan' => 2, - 'class' => array('field-label'), - ), - t('Order'), - ); - $rows = array(); - - // Sort items according to '_weight' (needed when the form comes back after - // preview or failed validation) - $items = array(); - foreach (element_children($element) as $key) { - if ($key === 'add_more') { - $add_more_button = &$element[$key]; - } - else { - $items[] = &$element[$key]; - } - } - usort($items, '_field_sort_items_value_helper'); - - // Add the items as table rows. - foreach ($items as $key => $item) { - $item['_weight']['#attributes']['class'] = array($order_class); - $delta_element = drupal_render($item['_weight']); - $cells = array( - array('data' => '', 'class' => array('field-multiple-drag')), - drupal_render($item), - array('data' => $delta_element, 'class' => array('delta-order')), - ); - $rows[] = array( - 'data' => $cells, - 'class' => array('draggable'), - ); - } - - $output = ''; - $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => $table_id, 'class' => array('field-multiple-table')))); - $output .= $element['#description'] ? ''; - - drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class); - } - else { - foreach (element_children($element) as $key) { - $output .= drupal_render($element[$key]); - } - } - - return $output; -} - -/** - * #after_build callback for field elements in a form. - * - * This stores the final location of the field within the form structure so - * that field_default_form_errors() can assign validation errors to the right - * form element. - * - * @see field_default_form_errors() - */ -function field_form_element_after_build($element, &$form_state) { - $parents = $element['#field_parents']; - $field_name = $element['#field_name']; - $langcode = $element['#language']; - - $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state); - $field_state['array_parents'] = $element['#array_parents']; - field_form_set_state($parents, $field_name, $langcode, $form_state, $field_state); - - return $element; -} - -/** - * Transfer field-level validation errors to widgets. - */ -function field_default_form_errors($entity_type, $entity, $field, $instance, $langcode, $items, $form, &$form_state) { - $field_state = field_form_get_state($form['#parents'], $field['field_name'], $langcode, $form_state); - - if (!empty($field_state['errors'])) { - // Locate the correct element in the form. - $element = drupal_array_get_nested_value($form_state['complete form'], $field_state['array_parents']); - // Only set errors if the element is accessible. - if (!isset($element['#access']) || $element['#access']) { - $function = $instance['widget']['module'] . '_field_widget_error'; - $function_exists = function_exists($function); - - $multiple_widget = field_behaviors_widget('multiple values', $instance) != FIELD_BEHAVIOR_DEFAULT; - foreach ($field_state['errors'] as $delta => $delta_errors) { - // For multiple single-value widgets, pass errors by delta. - // For a multiple-value widget, pass all errors to the main widget. - $error_element = $multiple_widget ? $element : $element[$delta]; - foreach ($delta_errors as $error) { - if ($function_exists) { - $function($error_element, $error, $form, $form_state); - } - else { - // Make sure that errors are reported (even incorrectly flagged) if - // the widget module fails to implement hook_field_widget_error(). - form_error($error_element, $error['message']); - } - } - } - // Reinitialize the errors list for the next submit. - $field_state['errors'] = array(); - field_form_set_state($form['#parents'], $field['field_name'], $langcode, $form_state, $field_state); - } - } -} - -/** - * Submit handler for the "Add another item" button of a field form. - * - * This handler is run regardless of whether JS is enabled or not. It makes - * changes to the form state. If the button was clicked with JS disabled, then - * the page is reloaded with the complete rebuilt form. If the button was - * clicked with JS enabled, then ajax_form_callback() calls field_add_more_js() - * to return just the changed part of the form. - */ -function field_add_more_submit($form, &$form_state) { - $button = $form_state['triggering_element']; - - // Go one level up in the form, to the widgets container. - $element = drupal_array_get_nested_value($form, array_slice($button['#array_parents'], 0, -1)); - $field_name = $element['#field_name']; - $langcode = $element['#language']; - $parents = $element['#field_parents']; - - // Increment the items count. - $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state); - $field_state['items_count']++; - field_form_set_state($parents, $field_name, $langcode, $form_state, $field_state); - - $form_state['rebuild'] = TRUE; -} - -/** - * Ajax callback in response to a new empty widget being added to the form. - * - * This returns the new page content to replace the page content made obsolete - * by the form submission. - * - * @see field_add_more_submit() - */ -function field_add_more_js($form, $form_state) { - $button = $form_state['triggering_element']; - - // Go one level up in the form, to the widgets container. - $element = drupal_array_get_nested_value($form, array_slice($button['#array_parents'], 0, -1)); - $field_name = $element['#field_name']; - $langcode = $element['#language']; - $parents = $element['#field_parents']; - - $field_state = field_form_get_state($parents, $field_name, $langcode, $form_state); - - $field = $field_state['field']; - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED) { - return; - } - - // Add a DIV around the delta receiving the Ajax effect. - $delta = $element['#max_delta']; - $element[$delta]['#prefix'] = '' . $element['#description'] . '' : ''; - $output .= '' . drupal_render($add_more_button) . ''; - $output .= '' . (isset($element[$delta]['#prefix']) ? $element[$delta]['#prefix'] : ''); - $element[$delta]['#suffix'] = (isset($element[$delta]['#suffix']) ? $element[$delta]['#suffix'] : '') . ''; - - return $element; -} - -/** - * Retrieves processing information about a field from $form_state. - * - * @param $parents - * The array of #parents where the field lives in the form. - * @param $field_name - * The field name. - * @param $langcode - * The language in which the field values are entered. - * @param $form_state - * The form state. - * - * @return - * An array with the following key/data pairs: - * - field: the field definition array, - * - instance: the field instance definition array, - * - items_count: the number of widgets to display for the field, - * - array_parents: the location of the field's widgets within the $form - * structure. This entry is populated at '#after_build' time. - * - errors: the array of field validation errors reported on the field. This - * entry is populated at field_attach_form_validate() time. - * - * @see field_form_set_state() - */ -function field_form_get_state($parents, $field_name, $langcode, &$form_state) { - $form_state_parents = _field_form_state_parents($parents, $field_name, $langcode); - return drupal_array_get_nested_value($form_state, $form_state_parents); -} - -/** - * Stores processing information about a field in $form_state. - * - * @param $parents - * The array of #parents where the field lives in the form. - * @param $field_name - * The field name. - * @param $langcode - * The language in which the field values are entered. - * @param $form_state - * The form state. - * @param $field_state - * The array of data to store. See field_form_get_state() for the structure - * and content of the array. - * - * @see field_form_get_state() - */ -function field_form_set_state($parents, $field_name, $langcode, &$form_state, $field_state) { - $form_state_parents = _field_form_state_parents($parents, $field_name, $langcode); - drupal_array_set_nested_value($form_state, $form_state_parents, $field_state); -} - -/** - * Returns the location of processing information within $form_state. - */ -function _field_form_state_parents($parents, $field_name, $langcode) { - // To ensure backwards compatibility on regular entity forms for widgets that - // still access $form_state['field'][$field_name] directly, - // - top-level fields (empty $parents) are placed directly under - // $form_state['fields'][$field_name]. - // - Other fields are placed under - // $form_state['field']['#parents'][...$parents...]['#fields'][$field_name] - // to avoid clashes between field names and $parents parts. - // @todo Remove backwards compatibility in Drupal 8, and use a unique - // $form_state['field'][...$parents...]['#fields'][$field_name] structure. - if (!empty($parents)) { - $form_state_parents = array_merge(array('#parents'), $parents, array('#fields')); - } - else { - $form_state_parents = array(); - } - $form_state_parents = array_merge(array('field'), $form_state_parents, array($field_name, $langcode)); - - return $form_state_parents; -} - -/** - * Retrieves the field definition for a widget's helper callbacks. - * - * Widgets helper element callbacks (such as #process, #element_validate, - * #value_callback, ...) should use field_widget_field() and - * field_widget_instance() instead of field_info_field() and - * field_info_instance() when they need to access field or instance properties. - * See hook_field_widget_form() for more details. - * - * @param $element - * The structured array for the widget. - * @param $form_state - * The form state. - * - * @return - * The $field definition array for the current widget. - * - * @see field_widget_instance() - * @see hook_field_widget_form() - */ -function field_widget_field($element, $form_state) { - $field_state = field_form_get_state($element['#field_parents'], $element['#field_name'], $element['#language'], $form_state); - return $field_state['field']; -} - -/** - * Retrieves the instance definition array for a widget's helper callbacks. - * - * Widgets helper element callbacks (such as #process, #element_validate, - * #value_callback, ...) should use field_widget_field() and - * field_widget_instance() instead of field_info_field() and - * field_info_instance() when they need to access field or instance properties. - * See hook_field_widget_form() for more details. - * - * @param $element - * The structured array for the widget. - * @param $form_state - * The form state. - * - * @return - * The $instance definition array for the current widget. - * - * @see field_widget_field() - * @see hook_field_widget_form() - */ -function field_widget_instance($element, $form_state) { - $field_state = field_form_get_state($element['#field_parents'], $element['#field_name'], $element['#language'], $form_state); - return $field_state['instance']; -} diff --git a/modules/field/field.info b/modules/field/field.info deleted file mode 100644 index fcdca88..0000000 --- a/modules/field/field.info +++ /dev/null @@ -1,12 +0,0 @@ -name = Field -description = Field API to add fields to entities like nodes and users. -package = Core -version = VERSION -core = 7.x -files[] = field.module -files[] = field.attach.inc -files[] = field.info.class.inc -files[] = tests/field.test -dependencies[] = field_sql_storage -required = TRUE -stylesheets[all][] = theme/field.css diff --git a/modules/field/field.info.class.inc b/modules/field/field.info.class.inc deleted file mode 100644 index 3b89898..0000000 --- a/modules/field/field.info.class.inc +++ /dev/null @@ -1,668 +0,0 @@ -fieldMap = NULL; - - $this->fieldsById = array(); - $this->fieldIdsByName = array(); - $this->loadedAllFields = FALSE; - $this->unknownFields = array(); - - $this->bundleInstances = array(); - $this->loadedAllInstances = FALSE; - $this->emptyBundles = array(); - - $this->bundleExtraFields = array(); - - cache_clear_all('field_info:', 'cache_field', TRUE); - } - - /** - * Collects a lightweight map of fields across bundles. - * - * @return - * An array keyed by field name. Each value is an array with two entries: - * - type: The field type. - * - bundles: The bundles in which the field appears, as an array with - * entity types as keys and the array of bundle names as values. - */ - public function getFieldMap() { - // Read from the "static" cache. - if ($this->fieldMap !== NULL) { - return $this->fieldMap; - } - - // Read from persistent cache. - if ($cached = cache_get('field_info:field_map', 'cache_field')) { - $map = $cached->data; - - // Save in "static" cache. - $this->fieldMap = $map; - - return $map; - } - - $map = array(); - - $query = db_query('SELECT fc.type, fci.field_name, fci.entity_type, fci.bundle FROM {field_config_instance} fci INNER JOIN {field_config} fc ON fc.id = fci.field_id WHERE fc.active = 1 AND fc.storage_active = 1 AND fc.deleted = 0 AND fci.deleted = 0'); - foreach ($query as $row) { - $map[$row->field_name]['bundles'][$row->entity_type][] = $row->bundle; - $map[$row->field_name]['type'] = $row->type; - } - - // Save in "static" and persistent caches. - $this->fieldMap = $map; - cache_set('field_info:field_map', $map, 'cache_field'); - - return $map; - } - - /** - * Returns all active fields, including deleted ones. - * - * @return - * An array of field definitions, keyed by field ID. - */ - public function getFields() { - // Read from the "static" cache. - if ($this->loadedAllFields) { - return $this->fieldsById; - } - - // Read from persistent cache. - if ($cached = cache_get('field_info:fields', 'cache_field')) { - $this->fieldsById = $cached->data; - } - else { - // Collect and prepare fields. - foreach (field_read_fields(array(), array('include_deleted' => TRUE)) as $field) { - $this->fieldsById[$field['id']] = $this->prepareField($field); - } - - // Store in persistent cache. - cache_set('field_info:fields', $this->fieldsById, 'cache_field'); - } - - // Fill the name/ID map. - foreach ($this->fieldsById as $field) { - if (!$field['deleted']) { - $this->fieldIdsByName[$field['field_name']] = $field['id']; - } - } - - $this->loadedAllFields = TRUE; - - return $this->fieldsById; - } - - /** - * Retrieves all active, non-deleted instances definitions. - * - * @param $entity_type - * (optional) The entity type. - * - * @return - * If $entity_type is not set, all instances keyed by entity type and bundle - * name. If $entity_type is set, all instances for that entity type, keyed - * by bundle name. - */ - public function getInstances($entity_type = NULL) { - // If the full list is not present in "static" cache yet. - if (!$this->loadedAllInstances) { - - // Read from persistent cache. - if ($cached = cache_get('field_info:instances', 'cache_field')) { - $this->bundleInstances = $cached->data; - } - else { - // Collect and prepare instances. - - // We also need to populate the static field cache, since it will not - // be set by subsequent getBundleInstances() calls. - $this->getFields(); - - // Initialize empty arrays for all existing entity types and bundles. - // This is not strictly needed, but is done to preserve the behavior of - // field_info_instances() before http://drupal.org/node/1915646. - foreach (field_info_bundles() as $existing_entity_type => $bundles) { - foreach ($bundles as $bundle => $bundle_info) { - $this->bundleInstances[$existing_entity_type][$bundle] = array(); - } - } - - foreach (field_read_instances() as $instance) { - $field = $this->getField($instance['field_name']); - $instance = $this->prepareInstance($instance, $field['type']); - $this->bundleInstances[$instance['entity_type']][$instance['bundle']][$instance['field_name']] = $instance; - } - - // Store in persistent cache. - cache_set('field_info:instances', $this->bundleInstances, 'cache_field'); - } - - $this->loadedAllInstances = TRUE; - } - - if (isset($entity_type)) { - return isset($this->bundleInstances[$entity_type]) ? $this->bundleInstances[$entity_type] : array(); - } - else { - return $this->bundleInstances; - } - } - - /** - * Returns a field definition from a field name. - * - * This method only retrieves active, non-deleted fields. - * - * @param $field_name - * The field name. - * - * @return - * The field definition, or NULL if no field was found. - */ - public function getField($field_name) { - // Read from the "static" cache. - if (isset($this->fieldIdsByName[$field_name])) { - $field_id = $this->fieldIdsByName[$field_name]; - return $this->fieldsById[$field_id]; - } - if (isset($this->unknownFields[$field_name])) { - return; - } - - // Do not check the (large) persistent cache, but read the definition. - - // Cache miss: read from definition. - if ($field = field_read_field($field_name)) { - $field = $this->prepareField($field); - - // Save in the "static" cache. - $this->fieldsById[$field['id']] = $field; - $this->fieldIdsByName[$field['field_name']] = $field['id']; - - return $field; - } - else { - $this->unknownFields[$field_name] = TRUE; - } - } - - /** - * Returns a field definition from a field ID. - * - * This method only retrieves active fields, deleted or not. - * - * @param $field_id - * The field ID. - * - * @return - * The field definition, or NULL if no field was found. - */ - public function getFieldById($field_id) { - // Read from the "static" cache. - if (isset($this->fieldsById[$field_id])) { - return $this->fieldsById[$field_id]; - } - if (isset($this->unknownFields[$field_id])) { - return; - } - - // No persistent cache, fields are only persistently cached as part of a - // bundle. - - // Cache miss: read from definition. - if ($fields = field_read_fields(array('id' => $field_id), array('include_deleted' => TRUE))) { - $field = current($fields); - $field = $this->prepareField($field); - - // Store in the static cache. - $this->fieldsById[$field['id']] = $field; - if (!$field['deleted']) { - $this->fieldIdsByName[$field['field_name']] = $field['id']; - } - - return $field; - } - else { - $this->unknownFields[$field_id] = TRUE; - } - } - - /** - * Retrieves the instances for a bundle. - * - * The function also populates the corresponding field definitions in the - * "static" cache. - * - * @param $entity_type - * The entity type. - * @param $bundle - * The bundle name. - * - * @return - * The array of instance definitions, keyed by field name. - */ - public function getBundleInstances($entity_type, $bundle) { - // Read from the "static" cache. - if (isset($this->bundleInstances[$entity_type][$bundle])) { - return $this->bundleInstances[$entity_type][$bundle]; - } - if (isset($this->emptyBundles[$entity_type][$bundle])) { - return array(); - } - - // Read from the persistent cache. - if ($cached = cache_get("field_info:bundle:$entity_type:$bundle", 'cache_field')) { - $info = $cached->data; - - // Extract the field definitions and save them in the "static" cache. - foreach ($info['fields'] as $field) { - if (!isset($this->fieldsById[$field['id']])) { - $this->fieldsById[$field['id']] = $field; - if (!$field['deleted']) { - $this->fieldIdsByName[$field['field_name']] = $field['id']; - } - } - } - unset($info['fields']); - - // Store the instance definitions in the "static" cache'. Empty (or - // non-existent) bundles are stored separately, so that they do not - // pollute the global list returned by getInstances(). - if ($info['instances']) { - $this->bundleInstances[$entity_type][$bundle] = $info['instances']; - } - else { - $this->emptyBundles[$entity_type][$bundle] = TRUE; - } - - return $info['instances']; - } - - // Cache miss: collect from the definitions. - - $instances = array(); - - // Collect the fields in the bundle. - $params = array('entity_type' => $entity_type, 'bundle' => $bundle); - $fields = field_read_fields($params); - - // This iterates on non-deleted instances, so deleted fields are kept out of - // the persistent caches. - foreach (field_read_instances($params) as $instance) { - $field = $fields[$instance['field_name']]; - - $instance = $this->prepareInstance($instance, $field['type']); - $instances[$field['field_name']] = $instance; - - // If the field is not in our global "static" list yet, add it. - if (!isset($this->fieldsById[$field['id']])) { - $field = $this->prepareField($field); - - $this->fieldsById[$field['id']] = $field; - $this->fieldIdsByName[$field['field_name']] = $field['id']; - } - } - - // Store in the 'static' cache'. Empty (or non-existent) bundles are stored - // separately, so that they do not pollute the global list returned by - // getInstances(). - if ($instances) { - $this->bundleInstances[$entity_type][$bundle] = $instances; - } - else { - $this->emptyBundles[$entity_type][$bundle] = TRUE; - } - - // The persistent cache additionally contains the definitions of the fields - // involved in the bundle. - $cache = array( - 'instances' => $instances, - 'fields' => array() - ); - foreach ($instances as $instance) { - $cache['fields'][] = $this->fieldsById[$instance['field_id']]; - } - cache_set("field_info:bundle:$entity_type:$bundle", $cache, 'cache_field'); - - return $instances; - } - - /** - * Retrieves the "extra fields" for a bundle. - * - * @param $entity_type - * The entity type. - * @param $bundle - * The bundle name. - * - * @return - * The array of extra fields. - */ - public function getBundleExtraFields($entity_type, $bundle) { - // Read from the "static" cache. - if (isset($this->bundleExtraFields[$entity_type][$bundle])) { - return $this->bundleExtraFields[$entity_type][$bundle]; - } - - // Read from the persistent cache. - if ($cached = cache_get("field_info:bundle_extra:$entity_type:$bundle", 'cache_field')) { - $this->bundleExtraFields[$entity_type][$bundle] = $cached->data; - return $this->bundleExtraFields[$entity_type][$bundle]; - } - - // Cache miss: read from hook_field_extra_fields(). Note: given the current - // shape of the hook, we have no other way than collecting extra fields on - // all bundles. - $info = array(); - $extra = module_invoke_all('field_extra_fields'); - drupal_alter('field_extra_fields', $extra); - // Merge in saved settings. - if (isset($extra[$entity_type][$bundle])) { - $info = $this->prepareExtraFields($extra[$entity_type][$bundle], $entity_type, $bundle); - } - - // Store in the 'static' and persistent caches. - $this->bundleExtraFields[$entity_type][$bundle] = $info; - cache_set("field_info:bundle_extra:$entity_type:$bundle", $info, 'cache_field'); - - return $this->bundleExtraFields[$entity_type][$bundle]; - } - - /** - * Prepares a field definition for the current run-time context. - * - * @param $field - * The raw field structure as read from the database. - * - * @return - * The field definition completed for the current runtime context. - */ - public function prepareField($field) { - // Make sure all expected field settings are present. - $field['settings'] += field_info_field_settings($field['type']); - $field['storage']['settings'] += field_info_storage_settings($field['storage']['type']); - - // Add storage details. - $details = (array) module_invoke($field['storage']['module'], 'field_storage_details', $field); - drupal_alter('field_storage_details', $details, $field); - $field['storage']['details'] = $details; - - // Populate the list of bundles using the field. - $field['bundles'] = array(); - if (!$field['deleted']) { - $map = $this->getFieldMap(); - if (isset($map[$field['field_name']])) { - $field['bundles'] = $map[$field['field_name']]['bundles']; - } - } - - return $field; - } - - /** - * Prepares an instance definition for the current run-time context. - * - * @param $instance - * The raw instance structure as read from the database. - * @param $field_type - * The field type. - * - * @return - * The field instance array completed for the current runtime context. - */ - public function prepareInstance($instance, $field_type) { - // Make sure all expected instance settings are present. - $instance['settings'] += field_info_instance_settings($field_type); - - // Set a default value for the instance. - if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT && !isset($instance['default_value'])) { - $instance['default_value'] = NULL; - } - - // Prepare widget settings. - $instance['widget'] = $this->prepareInstanceWidget($instance['widget'], $field_type); - - // Prepare display settings. - foreach ($instance['display'] as $view_mode => $display) { - $instance['display'][$view_mode] = $this->prepareInstanceDisplay($display, $field_type); - } - - // Fall back to 'hidden' for view modes configured to use custom display - // settings, and for which the instance has no explicit settings. - $entity_info = entity_get_info($instance['entity_type']); - $view_modes = array_merge(array('default'), array_keys($entity_info['view modes'])); - $view_mode_settings = field_view_mode_settings($instance['entity_type'], $instance['bundle']); - foreach ($view_modes as $view_mode) { - if ($view_mode == 'default' || !empty($view_mode_settings[$view_mode]['custom_settings'])) { - if (!isset($instance['display'][$view_mode])) { - $instance['display'][$view_mode] = array( - 'type' => 'hidden', - 'label' => 'above', - 'settings' => array(), - 'weight' => 0, - ); - } - } - } - - return $instance; - } - - /** - * Prepares widget properties for the current run-time context. - * - * @param $widget - * Widget specifications as found in $instance['widget']. - * @param $field_type - * The field type. - * - * @return - * The widget properties completed for the current runtime context. - */ - public function prepareInstanceWidget($widget, $field_type) { - $field_type_info = field_info_field_types($field_type); - - // Fill in default values. - $widget += array( - 'type' => $field_type_info['default_widget'], - 'settings' => array(), - 'weight' => 0, - ); - - $widget_type_info = field_info_widget_types($widget['type']); - // Fall back to default formatter if formatter type is not available. - if (!$widget_type_info) { - $widget['type'] = $field_type_info['default_widget']; - $widget_type_info = field_info_widget_types($widget['type']); - } - $widget['module'] = $widget_type_info['module']; - // Fill in default settings for the widget. - $widget['settings'] += field_info_widget_settings($widget['type']); - - return $widget; - } - - /** - * Adapts display specifications to the current run-time context. - * - * @param $display - * Display specifications as found in $instance['display']['a_view_mode']. - * @param $field_type - * The field type. - * - * @return - * The display properties completed for the current runtime context. - */ - public function prepareInstanceDisplay($display, $field_type) { - $field_type_info = field_info_field_types($field_type); - - // Fill in default values. - $display += array( - 'label' => 'above', - 'type' => $field_type_info['default_formatter'], - 'settings' => array(), - 'weight' => 0, - ); - if ($display['type'] != 'hidden') { - $formatter_type_info = field_info_formatter_types($display['type']); - // Fall back to default formatter if formatter type is not available. - if (!$formatter_type_info) { - $display['type'] = $field_type_info['default_formatter']; - $formatter_type_info = field_info_formatter_types($display['type']); - } - $display['module'] = $formatter_type_info['module']; - // Fill in default settings for the formatter. - $display['settings'] += field_info_formatter_settings($display['type']); - } - - return $display; - } - - /** - * Prepares 'extra fields' for the current run-time context. - * - * @param $extra_fields - * The array of extra fields, as collected in hook_field_extra_fields(). - * @param $entity_type - * The entity type. - * @param $bundle - * The bundle name. - * - * @return - * The list of extra fields completed for the current runtime context. - */ - public function prepareExtraFields($extra_fields, $entity_type, $bundle) { - $entity_type_info = entity_get_info($entity_type); - $bundle_settings = field_bundle_settings($entity_type, $bundle); - $extra_fields += array('form' => array(), 'display' => array()); - - $result = array(); - // Extra fields in forms. - foreach ($extra_fields['form'] as $name => $field_data) { - $settings = isset($bundle_settings['extra_fields']['form'][$name]) ? $bundle_settings['extra_fields']['form'][$name] : array(); - if (isset($settings['weight'])) { - $field_data['weight'] = $settings['weight']; - } - $result['form'][$name] = $field_data; - } - - // Extra fields in displayed entities. - $data = $extra_fields['display']; - foreach ($extra_fields['display'] as $name => $field_data) { - $settings = isset($bundle_settings['extra_fields']['display'][$name]) ? $bundle_settings['extra_fields']['display'][$name] : array(); - $view_modes = array_merge(array('default'), array_keys($entity_type_info['view modes'])); - foreach ($view_modes as $view_mode) { - if (isset($settings[$view_mode])) { - $field_data['display'][$view_mode] = $settings[$view_mode]; - } - else { - $field_data['display'][$view_mode] = array( - 'weight' => $field_data['weight'], - 'visible' => TRUE, - ); - } - } - unset($field_data['weight']); - $result['display'][$name] = $field_data; - } - - return $result; - } -} diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc deleted file mode 100644 index 02b3c9c..0000000 --- a/modules/field/field.info.inc +++ /dev/null @@ -1,812 +0,0 @@ -flush(); -} - -/** - * Collates all information on existing fields and instances. - * - * Deprecated. This function is kept to ensure backwards compatibility, but has - * a serious performance impact, and should be absolutely avoided. - * See http://drupal.org/node/1915646. - * - * Use the regular field_info_*() API functions to access the information, or - * field_info_cache_clear() to clear the cached data. - */ -function _field_info_collate_fields($reset = FALSE) { - if ($reset) { - _field_info_field_cache()->flush(); - return; - } - - $cache = _field_info_field_cache(); - - // Collect fields, and build the array of IDs keyed by field_name. - $fields = $cache->getFields(); - $field_ids = array(); - foreach ($fields as $id => $field) { - if (!$field['deleted']) { - $field_ids[$field['field_name']] = $id; - } - } - - // Collect extra fields for all entity types. - $extra_fields = array(); - foreach (field_info_bundles() as $entity_type => $bundles) { - foreach ($bundles as $bundle => $info) { - $extra_fields[$entity_type][$bundle] = $cache->getBundleExtraFields($entity_type, $bundle); - } - } - - return array( - 'fields' => $fields, - 'field_ids' => $field_ids, - 'instances' => $cache->getInstances(), - 'extra_fields' => $extra_fields, - ); -} - -/** - * Collates all information on field types, widget types and related structures. - * - * @param $reset - * If TRUE, clear the cache. The information will be rebuilt from the database - * next time it is needed. Defaults to FALSE. - * - * @return - * If $reset is TRUE, nothing. - * If $reset is FALSE, an array containing the following elements: - * - 'field types': Array of hook_field_info() results, keyed by field_type. - * Each element has the following components: label, description, settings, - * instance_settings, default_widget, default_formatter, and behaviors - * from hook_field_info(), as well as module, giving the module that exposes - * the field type. - * - 'widget types': Array of hook_field_widget_info() results, keyed by - * widget_type. Each element has the following components: label, field - * types, settings, weight, and behaviors from hook_field_widget_info(), - * as well as module, giving the module that exposes the widget type. - * - 'formatter types': Array of hook_field_formatter_info() results, keyed by - * formatter_type. Each element has the following components: label, field - * types, and behaviors from hook_field_formatter_info(), as well as - * module, giving the module that exposes the formatter type. - * - 'storage types': Array of hook_field_storage_info() results, keyed by - * storage type names. Each element has the following components: label, - * description, and settings from hook_field_storage_info(), as well as - * module, giving the module that exposes the storage type. - * - 'fieldable types': Array of hook_entity_info() results, keyed by - * entity_type. Each element has the following components: name, id key, - * revision key, bundle key, cacheable, and bundles from hook_entity_info(), - * as well as module, giving the module that exposes the entity type. - */ -function _field_info_collate_types($reset = FALSE) { - global $language; - static $info; - - // The _info() hooks invoked below include translated strings, so each - // language is cached separately. - $langcode = $language->language; - - if ($reset) { - $info = NULL; - // Clear all languages. - cache_clear_all('field_info_types:', 'cache_field', TRUE); - return; - } - - if (!isset($info)) { - if ($cached = cache_get("field_info_types:$langcode", 'cache_field')) { - $info = $cached->data; - } - else { - $info = array( - 'field types' => array(), - 'widget types' => array(), - 'formatter types' => array(), - 'storage types' => array(), - ); - - // Populate field types. - foreach (module_implements('field_info') as $module) { - $field_types = (array) module_invoke($module, 'field_info'); - foreach ($field_types as $name => $field_info) { - // Provide defaults. - $field_info += array( - 'settings' => array(), - 'instance_settings' => array(), - ); - $info['field types'][$name] = $field_info; - $info['field types'][$name]['module'] = $module; - } - } - drupal_alter('field_info', $info['field types']); - - // Populate widget types. - foreach (module_implements('field_widget_info') as $module) { - $widget_types = (array) module_invoke($module, 'field_widget_info'); - foreach ($widget_types as $name => $widget_info) { - // Provide defaults. - $widget_info += array( - 'settings' => array(), - ); - $info['widget types'][$name] = $widget_info; - $info['widget types'][$name]['module'] = $module; - } - } - drupal_alter('field_widget_info', $info['widget types']); - uasort($info['widget types'], 'drupal_sort_weight'); - - // Populate formatter types. - foreach (module_implements('field_formatter_info') as $module) { - $formatter_types = (array) module_invoke($module, 'field_formatter_info'); - foreach ($formatter_types as $name => $formatter_info) { - // Provide defaults. - $formatter_info += array( - 'settings' => array(), - ); - $info['formatter types'][$name] = $formatter_info; - $info['formatter types'][$name]['module'] = $module; - } - } - drupal_alter('field_formatter_info', $info['formatter types']); - - // Populate storage types. - foreach (module_implements('field_storage_info') as $module) { - $storage_types = (array) module_invoke($module, 'field_storage_info'); - foreach ($storage_types as $name => $storage_info) { - // Provide defaults. - $storage_info += array( - 'settings' => array(), - ); - $info['storage types'][$name] = $storage_info; - $info['storage types'][$name]['module'] = $module; - } - } - drupal_alter('field_storage_info', $info['storage types']); - - cache_set("field_info_types:$langcode", $info, 'cache_field'); - } - } - - return $info; -} - -/** - * Prepares a field definition for the current run-time context. - * - * The functionality has moved to the FieldInfo class. This function is kept as - * a backwards-compatibility layer. See http://drupal.org/node/1915646. - * - * @see FieldInfo::prepareField() - */ -function _field_info_prepare_field($field) { - $cache = _field_info_field_cache(); - return $cache->prepareField($field); -} - -/** - * Prepares an instance definition for the current run-time context. - * - * The functionality has moved to the FieldInfo class. This function is kept as - * a backwards-compatibility layer. See http://drupal.org/node/1915646. - * - * @see FieldInfo::prepareInstance() - */ -function _field_info_prepare_instance($instance, $field) { - $cache = _field_info_field_cache(); - return $cache->prepareInstance($instance, $field['type']); -} - -/** - * Adapts display specifications to the current run-time context. - * - * The functionality has moved to the FieldInfo class. This function is kept as - * a backwards-compatibility layer. See http://drupal.org/node/1915646. - * - * @see FieldInfo::prepareInstanceDisplay() - */ -function _field_info_prepare_instance_display($field, $display) { - $cache = _field_info_field_cache(); - return $cache->prepareInstanceDisplay($display, $field['type']); -} - -/** - * Prepares widget specifications for the current run-time context. - * - * The functionality has moved to the FieldInfo class. This function is kept as - * a backwards-compatibility layer. See http://drupal.org/node/1915646. - * - * @see FieldInfo::prepareInstanceWidget() - */ -function _field_info_prepare_instance_widget($field, $widget) { - $cache = _field_info_field_cache(); - return $cache->prepareInstanceWidget($widget, $field['type']); -} - -/** - * Prepares 'extra fields' for the current run-time context. - * - * The functionality has moved to the FieldInfo class. This function is kept as - * a backwards-compatibility layer. See http://drupal.org/node/1915646. - * - * @see FieldInfo::prepareExtraFields() - */ -function _field_info_prepare_extra_fields($extra_fields, $entity_type, $bundle) { - $cache = _field_info_field_cache(); - return $cache->prepareExtraFields($extra_fields, $entity_type, $bundle); -} - -/** - * Determines the behavior of a widget with respect to an operation. - * - * @param $op - * The name of the operation. Currently supported: 'default value', - * 'multiple values'. - * @param $instance - * The field instance array. - * - * @return - * One of these values: - * - FIELD_BEHAVIOR_NONE: Do nothing for this operation. - * - FIELD_BEHAVIOR_CUSTOM: Use the widget's callback function. - * - FIELD_BEHAVIOR_DEFAULT: Use field.module default behavior. - */ -function field_behaviors_widget($op, $instance) { - $info = field_info_widget_types($instance['widget']['type']); - return isset($info['behaviors'][$op]) ? $info['behaviors'][$op] : FIELD_BEHAVIOR_DEFAULT; -} - -/** - * Returns information about field types from hook_field_info(). - * - * @param $field_type - * (optional) A field type name. If omitted, all field types will be - * returned. - * - * @return - * Either a field type description, as provided by hook_field_info(), or an - * array of all existing field types, keyed by field type name. - */ -function field_info_field_types($field_type = NULL) { - $info = _field_info_collate_types(); - $field_types = $info['field types']; - if ($field_type) { - if (isset($field_types[$field_type])) { - return $field_types[$field_type]; - } - } - else { - return $field_types; - } -} - -/** - * Returns information about field widgets from hook_field_widget_info(). - * - * @param $widget_type - * (optional) A widget type name. If omitted, all widget types will be - * returned. - * - * @return - * Either a single widget type description, as provided by - * hook_field_widget_info(), or an array of all existing widget types, keyed - * by widget type name. - */ -function field_info_widget_types($widget_type = NULL) { - $info = _field_info_collate_types(); - $widget_types = $info['widget types']; - if ($widget_type) { - if (isset($widget_types[$widget_type])) { - return $widget_types[$widget_type]; - } - } - else { - return $widget_types; - } -} - -/** - * Returns information about field formatters from hook_field_formatter_info(). - * - * @param $formatter_type - * (optional) A formatter type name. If omitted, all formatter types will be - * returned. - * - * @return - * Either a single formatter type description, as provided by - * hook_field_formatter_info(), or an array of all existing formatter types, - * keyed by formatter type name. - */ -function field_info_formatter_types($formatter_type = NULL) { - $info = _field_info_collate_types(); - $formatter_types = $info['formatter types']; - if ($formatter_type) { - if (isset($formatter_types[$formatter_type])) { - return $formatter_types[$formatter_type]; - } - } - else { - return $formatter_types; - } -} - -/** - * Returns information about field storage from hook_field_storage_info(). - * - * @param $storage_type - * (optional) A storage type name. If omitted, all storage types will be - * returned. - * - * @return - * Either a storage type description, as provided by - * hook_field_storage_info(), or an array of all existing storage types, - * keyed by storage type name. - */ -function field_info_storage_types($storage_type = NULL) { - $info = _field_info_collate_types(); - $storage_types = $info['storage types']; - if ($storage_type) { - if (isset($storage_types[$storage_type])) { - return $storage_types[$storage_type]; - } - } - else { - return $storage_types; - } -} - -/** - * Returns information about existing bundles. - * - * @param $entity_type - * The type of entity; e.g. 'node' or 'user'. - * - * @return - * An array of bundles for the $entity_type keyed by bundle name, - * or, if no $entity_type was provided, the array of all existing bundles, - * keyed by entity type. - */ -function field_info_bundles($entity_type = NULL) { - $info = entity_get_info(); - - if ($entity_type) { - return isset($info[$entity_type]['bundles']) ? $info[$entity_type]['bundles'] : array(); - } - - $bundles = array(); - foreach ($info as $type => $entity_info) { - $bundles[$type] = $entity_info['bundles']; - } - return $bundles; -} - -/** - * Returns a lightweight map of fields across bundles. - * - * The function only returns active, non deleted fields. - * - * @return - * An array keyed by field name. Each value is an array with two entries: - * - type: The field type. - * - bundles: The bundles in which the field appears, as an array with entity - * types as keys and the array of bundle names as values. - * Example: - * @code - * array( - * 'body' => array( - * 'bundles' => array( - * 'node' => array('page', 'article'), - * ), - * 'type' => 'text_with_summary', - * ), - * ); - * @endcode - */ -function field_info_field_map() { - $cache = _field_info_field_cache(); - return $cache->getFieldMap(); -} - -/** - * Returns all field definitions. - * - * Use of this function should be avoided when possible, since it loads and - * statically caches a potentially large array of information. Use - * field_info_field_map() instead. - * - * When iterating over the fields present in a given bundle after a call to - * field_info_instances($entity_type, $bundle), it is recommended to use - * field_info_field() on each individual field instead. - * - * @return - * An array of field definitions, keyed by field name. Each field has an - * additional property, 'bundles', which is an array of all the bundles to - * which this field belongs keyed by entity type. - * - * @see field_info_field_map() - */ -function field_info_fields() { - $cache = _field_info_field_cache(); - $info = $cache->getFields(); - - $fields = array(); - foreach ($info as $key => $field) { - if (!$field['deleted']) { - $fields[$field['field_name']] = $field; - } - } - - return $fields; -} - -/** - * Returns data about an individual field, given a field name. - * - * @param $field_name - * The name of the field to retrieve. $field_name can only refer to a - * non-deleted, active field. For deleted fields, use - * field_info_field_by_id(). To retrieve information about inactive fields, - * use field_read_fields(). - * - * @return - * The field array, as returned by field_read_fields(), with an - * additional element 'bundles', whose value is an array of all the bundles - * this field belongs to keyed by entity type. NULL if the field was not - * found. - * - * @see field_info_field_by_id() - */ -function field_info_field($field_name) { - $cache = _field_info_field_cache(); - return $cache->getField($field_name); -} - -/** - * Returns data about an individual field, given a field ID. - * - * @param $field_id - * The id of the field to retrieve. $field_id can refer to a - * deleted field, but not an inactive one. - * - * @return - * The field array, as returned by field_read_fields(), with an - * additional element 'bundles', whose value is an array of all the bundles - * this field belongs to. - * - * @see field_info_field() - */ -function field_info_field_by_id($field_id) { - $cache = _field_info_field_cache(); - return $cache->getFieldById($field_id); -} - -/** - * Returns the same data as field_info_field_by_id() for every field. - * - * Use of this function should be avoided when possible, since it loads and - * statically caches a potentially large array of information. - * - * When iterating over the fields present in a given bundle after a call to - * field_info_instances($entity_type, $bundle), it is recommended to use - * field_info_field() on each individual field instead. - * - * @return - * An array, each key is a field ID and the values are field arrays as - * returned by field_read_fields(), with an additional element 'bundles', - * whose value is an array of all the bundle this field belongs to. - * - * @see field_info_field() - * @see field_info_field_by_id() - */ -function field_info_field_by_ids() { - $cache = _field_info_field_cache(); - return $cache->getFields(); -} - -/** - * Retrieves information about field instances. - * - * Use of this function to retrieve instances across separate bundles (i.e. - * when the $bundle parameter is NULL) should be avoided when possible, since - * it loads and statically caches a potentially large array of information. Use - * field_info_field_map() instead. - * - * When retrieving the instances of a specific bundle (i.e. when both - * $entity_type and $bundle_name are provided), the function also populates a - * static cache with the corresponding field definitions, allowing fast - * retrieval of field_info_field() later in the request. - * - * @param $entity_type - * (optional) The entity type for which to return instances. - * @param $bundle_name - * (optional) The bundle name for which to return instances. If $entity_type - * is NULL, the $bundle_name parameter is ignored. - * - * @return - * If $entity_type is not set, return all instances keyed by entity type and - * bundle name. If $entity_type is set, return all instances for that entity - * type, keyed by bundle name. If $entity_type and $bundle_name are set, return - * all instances for that bundle. - * - * @see field_info_field_map() - */ -function field_info_instances($entity_type = NULL, $bundle_name = NULL) { - $cache = _field_info_field_cache(); - - if (!isset($entity_type)) { - return $cache->getInstances(); - } - if (!isset($bundle_name)) { - return $cache->getInstances($entity_type); - } - - return $cache->getBundleInstances($entity_type, $bundle_name); -} - -/** - * Returns an array of instance data for a specific field and bundle. - * - * The function populates a static cache with all fields and instances used in - * the bundle, allowing fast retrieval of field_info_field() or - * field_info_instance() later in the request. - * - * @param $entity_type - * The entity type for the instance. - * @param $field_name - * The field name for the instance. - * @param $bundle_name - * The bundle name for the instance. - * - * @return - * An associative array of instance data for the specific field and bundle; - * NULL if the instance does not exist. - */ -function field_info_instance($entity_type, $field_name, $bundle_name) { - $cache = _field_info_field_cache(); - $info = $cache->getBundleInstances($entity_type, $bundle_name); - if (isset($info[$field_name])) { - return $info[$field_name]; - } -} - -/** - * Returns a list and settings of pseudo-field elements in a given bundle. - * - * If $context is 'form', an array with the following structure: - * @code - * array( - * 'name_of_pseudo_field_component' => array( - * 'label' => The human readable name of the component, - * 'description' => A short description of the component content, - * 'weight' => The weight of the component in edit forms, - * ), - * 'name_of_other_pseudo_field_component' => array( - * // ... - * ), - * ); - * @endcode - * - * If $context is 'display', an array with the following structure: - * @code - * array( - * 'name_of_pseudo_field_component' => array( - * 'label' => The human readable name of the component, - * 'description' => A short description of the component content, - * // One entry per view mode, including the 'default' mode: - * 'display' => array( - * 'default' => array( - * 'weight' => The weight of the component in displayed entities in - * this view mode, - * 'visible' => TRUE if the component is visible, FALSE if hidden, in - * displayed entities in this view mode, - * ), - * 'teaser' => array( - * // ... - * ), - * ), - * ), - * 'name_of_other_pseudo_field_component' => array( - * // ... - * ), - * ); - * @endcode - * - * @param $entity_type - * The type of entity; e.g. 'node' or 'user'. - * @param $bundle - * The bundle name. - * @param $context - * The context for which the list of pseudo-fields is requested. Either - * 'form' or 'display'. - * - * @return - * The array of pseudo-field elements in the bundle. - */ -function field_info_extra_fields($entity_type, $bundle, $context) { - $cache = _field_info_field_cache(); - $info = $cache->getBundleExtraFields($entity_type, $bundle); - - return isset($info[$context]) ? $info[$context] : array(); -} - -/** - * Returns the maximum weight of all the components in an entity. - * - * This includes fields, 'extra_fields', and other components added by - * third-party modules (e.g. field_group). - * - * @param $entity_type - * The type of entity; e.g. 'node' or 'user'. - * @param $bundle - * The bundle name. - * @param $context - * The context for which the maximum weight is requested. Either 'form', or - * the name of a view mode. - * @return - * The maximum weight of the entity's components, or NULL if no components - * were found. - */ -function field_info_max_weight($entity_type, $bundle, $context) { - $weights = array(); - - // Collect weights for fields. - foreach (field_info_instances($entity_type, $bundle) as $instance) { - if ($context == 'form') { - $weights[] = $instance['widget']['weight']; - } - elseif (isset($instance['display'][$context]['weight'])) { - $weights[] = $instance['display'][$context]['weight']; - } - } - // Collect weights for extra fields. - foreach (field_info_extra_fields($entity_type, $bundle, $context) as $extra) { - $weights[] = $extra['weight']; - } - - // Let other modules feedback about their own additions. - $weights = array_merge($weights, module_invoke_all('field_info_max_weight', $entity_type, $bundle, $context)); - $max_weight = $weights ? max($weights) : NULL; - - return $max_weight; -} - -/** - * Returns a field type's default settings. - * - * @param $type - * A field type name. - * - * @return - * The field type's default settings, as provided by hook_field_info(), or an - * empty array if type or settings are not defined. - */ -function field_info_field_settings($type) { - $info = field_info_field_types($type); - return isset($info['settings']) ? $info['settings'] : array(); -} - -/** - * Returns a field type's default instance settings. - * - * @param $type - * A field type name. - * - * @return - * The field type's default instance settings, as provided by - * hook_field_info(), or an empty array if type or settings are not defined. - */ -function field_info_instance_settings($type) { - $info = field_info_field_types($type); - return isset($info['instance_settings']) ? $info['instance_settings'] : array(); -} - -/** - * Returns a field widget's default settings. - * - * @param $type - * A widget type name. - * - * @return - * The widget type's default settings, as provided by - * hook_field_widget_info(), or an empty array if type or settings are - * undefined. - */ -function field_info_widget_settings($type) { - $info = field_info_widget_types($type); - return isset($info['settings']) ? $info['settings'] : array(); -} - -/** - * Returns a field formatter's default settings. - * - * @param $type - * A field formatter type name. - * - * @return - * The formatter type's default settings, as provided by - * hook_field_formatter_info(), or an empty array if type or settings are - * undefined. - */ -function field_info_formatter_settings($type) { - $info = field_info_formatter_types($type); - return isset($info['settings']) ? $info['settings'] : array(); -} - -/** - * Returns a field storage type's default settings. - * - * @param $type - * A field storage type name. - * - * @return - * The storage type's default settings, as provided by - * hook_field_storage_info(), or an empty array if type or settings are - * undefined. - */ -function field_info_storage_settings($type) { - $info = field_info_storage_types($type); - return isset($info['settings']) ? $info['settings'] : array(); -} - -/** - * @} End of "defgroup field_info". - */ diff --git a/modules/field/field.install b/modules/field/field.install deleted file mode 100644 index c5c5005..0000000 --- a/modules/field/field.install +++ /dev/null @@ -1,471 +0,0 @@ - array( - 'id' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'The primary identifier for a field', - ), - 'field_name' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'description' => 'The name of this field. Non-deleted field names are unique, but multiple deleted fields can have the same name.', - ), - 'type' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'description' => 'The type of this field.', - ), - 'module' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The module that implements the field type.', - ), - 'active' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Boolean indicating whether the module that implements the field type is enabled.', - ), - 'storage_type' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'description' => 'The storage backend for the field.', - ), - 'storage_module' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The module that implements the storage backend.', - ), - 'storage_active' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Boolean indicating whether the module that implements the storage backend is enabled.', - ), - 'locked' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - 'description' => '@TODO', - ), - 'data' => array( - 'type' => 'blob', - 'size' => 'big', - 'not null' => TRUE, - 'serialize' => TRUE, - 'description' => 'Serialized data containing the field properties that do not warrant a dedicated column.', - ), - 'cardinality' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - ), - 'translatable' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - ), - 'deleted' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - ), - ), - 'primary key' => array('id'), - 'indexes' => array( - 'field_name' => array('field_name'), - // Used by field_sync_field_status(). - 'active' => array('active'), - 'storage_active' => array('storage_active'), - 'deleted' => array('deleted'), - // Used by field_modules_disabled(). - 'module' => array('module'), - 'storage_module' => array('storage_module'), - 'type' => array('type'), - 'storage_type' => array('storage_type'), - ), - ); - $schema['field_config_instance'] = array( - 'fields' => array( - 'id' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'The primary identifier for a field instance', - ), - 'field_id' => array( - 'type' => 'int', - 'not null' => TRUE, - 'description' => 'The identifier of the field attached by this instance', - ), - 'field_name' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '' - ), - 'entity_type' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '' - ), - 'bundle' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '' - ), - 'data' => array( - 'type' => 'blob', - 'size' => 'big', - 'not null' => TRUE, - 'serialize' => TRUE, - ), - 'deleted' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - ), - ), - 'primary key' => array('id'), - 'indexes' => array( - // Used by field_delete_instance(). - 'field_name_bundle' => array('field_name', 'entity_type', 'bundle'), - // Used by field_read_instances(). - 'deleted' => array('deleted'), - ), - ); - $schema['cache_field'] = drupal_get_schema_unprocessed('system', 'cache'); - - return $schema; -} - -/** - * Utility function: create a field by writing directly to the database. - * - * This function can be used for databases whose schema is at field module - * version 7000 or higher. - * - * @ingroup update_api - */ -function _update_7000_field_create_field(&$field) { - // Merge in default values.` - $field += array( - 'entity_types' => array(), - 'cardinality' => 1, - 'translatable' => FALSE, - 'locked' => FALSE, - 'settings' => array(), - 'indexes' => array(), - 'deleted' => 0, - 'active' => 1, - ); - - // Set storage. - $field['storage'] = array( - 'type' => 'field_sql_storage', - 'settings' => array(), - 'module' => 'field_sql_storage', - 'active' => 1, - ); - - // Fetch the field schema to initialize columns and indexes. The field module - // is not guaranteed to be loaded at this point. - module_load_install($field['module']); - $schema = (array) module_invoke($field['module'], 'field_schema', $field); - $schema += array('columns' => array(), 'indexes' => array()); - // 'columns' are hardcoded in the field type. - $field['columns'] = $schema['columns']; - // 'indexes' can be both hardcoded in the field type, and specified in the - // incoming $field definition. - $field['indexes'] += $schema['indexes']; - - // The serialized 'data' column contains everything from $field that does not - // have its own column and is not automatically populated when the field is - // read. - $data = $field; - unset($data['columns'], $data['field_name'], $data['type'], $data['active'], $data['module'], $data['storage_type'], $data['storage_active'], $data['storage_module'], $data['locked'], $data['cardinality'], $data['deleted']); - // Additionally, do not save the 'bundles' property populated by - // field_info_field(). - unset($data['bundles']); - - // Write the field to the database. - $record = array( - 'field_name' => $field['field_name'], - 'type' => $field['type'], - 'module' => $field['module'], - 'active' => (int) $field['active'], - 'storage_type' => $field['storage']['type'], - 'storage_module' => $field['storage']['module'], - 'storage_active' => (int) $field['storage']['active'], - 'locked' => (int) $field['locked'], - 'data' => serialize($data), - 'cardinality' => $field['cardinality'], - 'translatable' => (int) $field['translatable'], - 'deleted' => (int) $field['deleted'], - ); - // We don't use drupal_write_record() here because it depends on the schema. - $field['id'] = db_insert('field_config') - ->fields($record) - ->execute(); - - // Create storage for the field. - field_sql_storage_field_storage_create_field($field); -} - -/** - * Utility function: delete a field stored in SQL storage directly from the database. - * - * To protect user data, this function can only be used to delete fields once - * all information it stored is gone. Delete all data from the - * field_data_$field_name table before calling by either manually issuing - * delete queries against it or using _update_7000_field_delete_instance(). - * - * This function can be used for databases whose schema is at field module - * version 7000 or higher. - * - * @param $field_name - * The field name to delete. - * - * @ingroup update_api - */ -function _update_7000_field_delete_field($field_name) { - $table_name = 'field_data_' . $field_name; - if (db_select($table_name)->range(0, 1)->countQuery()->execute()->fetchField()) { - $t = get_t(); - throw new Exception($t('This function can only be used to delete fields without data')); - } - // Delete all instances. - db_delete('field_config_instance') - ->condition('field_name', $field_name) - ->execute(); - - // Nuke field data and revision tables. - db_drop_table($table_name); - db_drop_table('field_revision_' . $field_name); - - // Delete the field. - db_delete('field_config') - ->condition('field_name', $field_name) - ->execute(); -} - - -/** - * Utility function: delete an instance and all its data of a field stored in SQL Storage. - * - * BEWARE: this function deletes user data from the field storage tables. - * - * This function is valid for a database schema version 7000. - * - * @ingroup update_api - */ -function _update_7000_field_delete_instance($field_name, $entity_type, $bundle) { - // Delete field instance configuration data. - db_delete('field_config_instance') - ->condition('field_name', $field_name) - ->condition('entity_type', $entity_type) - ->condition('bundle', $bundle) - ->execute(); - - // Nuke data. - db_delete('field_data_' . $field_name) - ->condition('entity_type', $entity_type) - ->condition('bundle', $bundle) - ->execute(); - db_delete('field_revision_' . $field_name) - ->condition('entity_type', $entity_type) - ->condition('bundle', $bundle) - ->execute(); -} - -/** - * Utility function: fetch all the field definitions from the database. - * - * Warning: unlike the field_read_fields() API function, this function returns - * all fields by default, including deleted and inactive fields, unless - * specified otherwise in the $conditions parameter. - * - * @param $conditions - * An array of conditions to limit the select query to. - * @param $key - * The name of the field property the return array is indexed by. Using - * anything else than 'id' might cause incomplete results if the $conditions - * do not filter out deleted fields. - * - * @return - * An array of fields matching $conditions, keyed by the property specified - * by the $key parameter. - * - * @ingroup update_api - */ -function _update_7000_field_read_fields(array $conditions = array(), $key = 'id') { - $fields = array(); - $query = db_select('field_config', 'fc', array('fetch' => PDO::FETCH_ASSOC)) - ->fields('fc'); - foreach ($conditions as $column => $value) { - $query->condition($column, $value); - } - foreach ($query->execute() as $record) { - $field = unserialize($record['data']); - $field['id'] = $record['id']; - $field['field_name'] = $record['field_name']; - $field['type'] = $record['type']; - $field['module'] = $record['module']; - $field['active'] = $record['active']; - $field['storage']['type'] = $record['storage_type']; - $field['storage']['module'] = $record['storage_module']; - $field['storage']['active'] = $record['storage_active']; - $field['locked'] = $record['locked']; - $field['cardinality'] = $record['cardinality']; - $field['translatable'] = $record['translatable']; - $field['deleted'] = $record['deleted']; - - $fields[$field[$key]] = $field; - } - return $fields; -} - -/** - * Utility function: write a field instance directly to the database. - * - * This function can be used for databases whose schema is at field module - * version 7000 or higher. - * - * @ingroup update_api - */ -function _update_7000_field_create_instance($field, &$instance) { - // Merge in defaults. - $instance += array( - 'field_id' => $field['id'], - 'field_name' => $field['field_name'], - 'deleted' => 0, - ); - - // The serialized 'data' column contains everything from $instance that does - // not have its own column and is not automatically populated when the - // instance is read. - $data = $instance; - unset($data['id'], $data['field_id'], $data['field_name'], $data['entity_type'], $data['bundle'], $data['deleted']); - - $record = array( - 'field_id' => $instance['field_id'], - 'field_name' => $instance['field_name'], - 'entity_type' => $instance['entity_type'], - 'bundle' => $instance['bundle'], - 'data' => serialize($data), - 'deleted' => (int) $instance['deleted'], - ); - $instance['id'] = db_insert('field_config_instance') - ->fields($record) - ->execute(); -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Field update version placeholder. - */ -function field_update_7000() { - // Some update helper functions (such as _update_7000_field_create_field()) - // modify the database directly. They can be used safely only if the database - // schema matches the field module schema established for Drupal 7.0 (i.e. - // version 7000). This function exists solely to set the schema version to - // 7000, so that update functions calling those helpers can do so safely - // by declaring a dependency on field_update_7000(). -} - -/** - * Fix fields definitions created during the d6 to d7 upgrade path. - */ -function field_update_7001() { - $fields = _update_7000_field_read_fields(); - foreach ($fields as $field) { - // _update_7000_field_create_field() was broken in d7 RC2, and the fields - // created during a d6 to d7 upgrade do not correcly store the 'index' - // entry. See http://drupal.org/node/996160. - - module_load_install($field['module']); - $schema = (array) module_invoke($field['module'], 'field_schema', $field); - $schema += array('indexes' => array()); - // 'indexes' can be both hardcoded in the field type, and specified in the - // incoming $field definition. - $field['indexes'] += $schema['indexes']; - - // Place the updated entries in the existing serialized 'data' column. - $data = db_query("SELECT data FROM {field_config} WHERE id = :id", array(':id' => $field['id']))->fetchField(); - $data = unserialize($data); - $data['columns'] = $field['columns']; - $data['indexes'] = $field['indexes']; - - // Save the new data. - $query = db_update('field_config') - ->condition('id', $field['id']) - ->fields(array('data' => serialize($data))) - ->execute(); - } -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Split the all-inclusive field_bundle_settings variable per bundle. - */ -function field_update_7002() { - $settings = variable_get('field_bundle_settings', array()); - if ($settings) { - foreach ($settings as $entity_type => $entity_type_settings) { - foreach ($entity_type_settings as $bundle => $bundle_settings) { - variable_set('field_bundle_settings_' . $entity_type . '__' . $bundle, $bundle_settings); - } - } - variable_del('field_bundle_settings'); - } -} - -/** - * Add the FieldInfo class to the class registry. - */ -function field_update_7003() { - // Empty update to force a rebuild of the registry. -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ diff --git a/modules/field/field.multilingual.inc b/modules/field/field.multilingual.inc deleted file mode 100644 index 4b4f01d..0000000 --- a/modules/field/field.multilingual.inc +++ /dev/null @@ -1,301 +0,0 @@ -{$field_name}[$langcode][$delta][$column_name] - * @endcode - * Every field can hold a single or multiple value for each language belonging - * to the available languages set: - * - For untranslatable fields this set only contains LANGUAGE_NONE. - * - For translatable fields this set can contain any language code. By default - * it is the list returned by field_content_languages(), which contains all - * installed languages with the addition of LANGUAGE_NONE. This default can be - * altered by modules implementing hook_field_available_languages_alter(). - * - * The available languages for a particular field are returned by - * field_available_languages(). Whether a field is translatable is determined by - * calling field_is_translatable(), which checks the $field['translatable'] - * property returned by field_info_field(), and whether there is at least one - * translation handler available for the field. A translation handler is a - * module registering itself via hook_entity_info() to handle field - * translations. - * - * By default, _field_invoke() and _field_invoke_multiple() are processing a - * field in all available languages, unless they are given a language - * suggestion. Based on that suggestion, _field_language_suggestion() determines - * the languages to act on. - * - * Most field_attach_*() functions act on all available languages, except for - * the following: - * - field_attach_form() only takes a single language code, specifying which - * language the field values will be submitted in. - * - field_attach_view() requires the language the entity will be displayed in. - * Since it is unknown whether a field translation exists for the requested - * language, the translation handler is responsible for performing one of the - * following actions: - * - Ignore missing translations, i.e. do not show any field values for the - * requested language. For example, see locale_field_language_alter(). - * - Provide a value in a different language as fallback. By default, the - * fallback logic is applied separately to each field to ensure that there - * is a value for each field to display. - * The field language fallback logic relies on the global language fallback - * configuration. Therefore, the displayed field values can be in the - * requested language, but may be different if no values for the requested - * language are available. The default language fallback rules inspect all the - * enabled languages ordered by their weight. This behavior can be altered or - * even disabled by modules implementing hook_field_language_alter(), making - * it possible to choose the first approach. The display language for each - * field is returned by field_language(). - * - * See @link field Field API @endlink for information about the other parts of - * the Field API. - */ - -/** - * Implements hook_multilingual_settings_changed(). - */ -function field_multilingual_settings_changed() { - field_info_cache_clear(); -} - -/** - * Collects the available languages for the given entity type and field. - * - * If the given field has language support enabled, an array of available - * languages will be returned, otherwise only LANGUAGE_NONE will be returned. - * Since the default value for a 'translatable' entity property is FALSE, we - * ensure that only entities that are able to handle translations actually get - * translatable fields. - * - * @param $entity_type - * The type of the entity the field is attached to, e.g. 'node' or 'user'. - * @param $field - * A field structure. - * - * @return - * An array of valid language codes. - */ -function field_available_languages($entity_type, $field) { - static $drupal_static_fast; - if (!isset($drupal_static_fast)) { - $drupal_static_fast['field_languages'] = &drupal_static(__FUNCTION__); - } - $field_languages = &$drupal_static_fast['field_languages']; - $field_name = $field['field_name']; - - if (!isset($field_languages[$entity_type][$field_name])) { - // If the field has language support enabled we retrieve an (alterable) list - // of enabled languages, otherwise we return just LANGUAGE_NONE. - if (field_is_translatable($entity_type, $field)) { - $languages = field_content_languages(); - // Let other modules alter the available languages. - $context = array('entity_type' => $entity_type, 'field' => $field); - drupal_alter('field_available_languages', $languages, $context); - $field_languages[$entity_type][$field_name] = $languages; - } - else { - $field_languages[$entity_type][$field_name] = array(LANGUAGE_NONE); - } - } - - return $field_languages[$entity_type][$field_name]; -} - -/** - * Process the given language suggestion based on the available languages. - * - * If a non-empty language suggestion is provided it must appear among the - * available languages, otherwise it will be ignored. - * - * @param $available_languages - * An array of valid language codes. - * @param $language_suggestion - * A language code or an array of language codes keyed by field name. - * @param $field_name - * The name of the field being processed. - * - * @return - * An array of valid language codes. - */ -function _field_language_suggestion($available_languages, $language_suggestion, $field_name) { - // Handle possible language suggestions. - if (!empty($language_suggestion)) { - // We might have an array of language suggestions keyed by field name. - if (is_array($language_suggestion) && isset($language_suggestion[$field_name])) { - $language_suggestion = $language_suggestion[$field_name]; - } - - // If we have a language suggestion and the suggested language is available, - // we return only it. - if (in_array($language_suggestion, $available_languages)) { - $available_languages = array($language_suggestion); - } - } - - return $available_languages; -} - -/** - * Returns available content languages. - * - * The languages that may be associated to fields include LANGUAGE_NONE. - * - * @return - * An array of language codes. - */ -function field_content_languages() { - return array_keys(language_list() + array(LANGUAGE_NONE => NULL)); -} - -/** - * Checks whether a field has language support. - * - * A field has language support enabled if its 'translatable' property is set to - * TRUE, and its entity type has at least one translation handler registered. - * - * @param $entity_type - * The type of the entity the field is attached to. - * @param $field - * A field data structure. - * - * @return - * TRUE if the field can be translated. - */ -function field_is_translatable($entity_type, $field) { - return $field['translatable'] && field_has_translation_handler($entity_type); -} - -/** - * Checks if a module is registered as a translation handler for a given entity. - * - * If no handler is passed, simply check if there is any translation handler - * enabled for the given entity type. - * - * @param $entity_type - * The type of the entity whose fields are to be translated. - * @param $handler - * (optional) The name of the handler to be checked. Defaults to NULL. - * - * @return - * TRUE, if the given handler is allowed to manage field translations. If no - * handler is passed, TRUE means there is at least one registered translation - * handler. - */ -function field_has_translation_handler($entity_type, $handler = NULL) { - $entity_info = entity_get_info($entity_type); - - if (isset($handler)) { - return !empty($entity_info['translation'][$handler]); - } - elseif (isset($entity_info['translation'])) { - foreach ($entity_info['translation'] as $handler_info) { - // The translation handler must use a non-empty data structure. - if (!empty($handler_info)) { - return TRUE; - } - } - } - - return FALSE; -} - -/** - * Ensures that a given language code is valid. - * - * Checks whether the given language is one of the enabled languages. Otherwise, - * it returns the current, global language; or the site's default language, if - * the additional parameter $default is TRUE. - * - * @param $langcode - * The language code to validate. - * @param $default - * Whether to return the default language code or the current language code in - * case $langcode is invalid. - * @return - * A valid language code. - */ -function field_valid_language($langcode, $default = TRUE) { - $enabled_languages = field_content_languages(); - if (in_array($langcode, $enabled_languages)) { - return $langcode; - } - global $language_content; - return $default ? language_default('language') : $language_content->language; -} - -/** - * Returns the display language for the fields attached to the given entity. - * - * The actual language for each given field is determined based on the requested - * language and the actual data available in the fields themselves. - * If there is no registered translation handler for the given entity type, the - * display language to be used is just LANGUAGE_NONE, as no other language code - * is allowed by field_available_languages(). - * If translation handlers are found, we let modules provide alternative display - * languages for fields not having the requested language available. - * Core language fallback rules are provided by locale_field_language_fallback() - * which is called by locale_field_language_alter(). - * - * @param $entity_type - * The type of $entity. - * @param $entity - * The entity to be displayed. - * @param $field_name - * (optional) The name of the field to be displayed. Defaults to NULL. If - * no value is specified, the display languages for every field attached to - * the given entity will be returned. - * @param $langcode - * (optional) The language code $entity has to be displayed in. Defaults to - * NULL. If no value is given the current language will be used. - * - * @return - * A language code if a field name is specified, an array of language codes - * keyed by field name otherwise. - */ -function field_language($entity_type, $entity, $field_name = NULL, $langcode = NULL) { - $display_languages = &drupal_static(__FUNCTION__, array()); - list($id, , $bundle) = entity_extract_ids($entity_type, $entity); - $langcode = field_valid_language($langcode, FALSE); - - if (!isset($display_languages[$entity_type][$id][$langcode])) { - $display_language = array(); - - // By default display language is set to LANGUAGE_NONE if the field - // translation is not available. It is up to translation handlers to - // implement language fallback rules. - foreach (field_info_instances($entity_type, $bundle) as $instance) { - $display_language[$instance['field_name']] = isset($entity->{$instance['field_name']}[$langcode]) ? $langcode : LANGUAGE_NONE; - } - - if (field_has_translation_handler($entity_type)) { - $context = array( - 'entity_type' => $entity_type, - 'entity' => $entity, - 'language' => $langcode, - ); - drupal_alter('field_language', $display_language, $context); - } - - $display_languages[$entity_type][$id][$langcode] = $display_language; - } - - $display_language = $display_languages[$entity_type][$id][$langcode]; - - // Single-field mode. - if (isset($field_name)) { - return isset($display_language[$field_name]) ? $display_language[$field_name] : FALSE; - } - - return $display_language; -} diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info deleted file mode 100644 index 9313850..0000000 --- a/modules/field/modules/field_sql_storage/field_sql_storage.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Field SQL storage -description = Stores field data in an SQL database. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -files[] = field_sql_storage.test -required = TRUE diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.install b/modules/field/modules/field_sql_storage/field_sql_storage.install deleted file mode 100644 index 24973ab..0000000 --- a/modules/field/modules/field_sql_storage/field_sql_storage.install +++ /dev/null @@ -1,215 +0,0 @@ - TRUE, 'include_inactive' => TRUE)); - drupal_load('module', 'field_sql_storage'); - foreach ($fields as $field) { - if ($field['storage']['type'] == 'field_sql_storage') { - $schema += _field_sql_storage_schema($field); - } - } - } - return $schema; -} - -/** - * Utility function: write field data directly to SQL storage. - * - * This function can be used for databases whose schema is at field module - * version 7000 or higher. - * - * @ingroup update_api - */ -function _update_7000_field_sql_storage_write($entity_type, $bundle, $entity_id, $revision_id, $field_name, $data) { - $table_name = "field_data_{$field_name}"; - $revision_name = "field_revision_{$field_name}"; - - db_delete($table_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $entity_id) - ->execute(); - db_delete($revision_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $entity_id) - ->condition('revision_id', $revision_id) - ->execute(); - - $columns = array(); - foreach ($data as $langcode => $items) { - foreach ($items as $delta => $item) { - $record = array( - 'entity_type' => $entity_type, - 'entity_id' => $entity_id, - 'revision_id' => $revision_id, - 'bundle' => $bundle, - 'delta' => $delta, - 'language' => $langcode, - ); - foreach ($item as $column => $value) { - $record[_field_sql_storage_columnname($field_name, $column)] = $value; - } - - $records[] = $record; - // Record the columns used. - $columns += $record; - } - } - - if ($columns) { - $query = db_insert($table_name)->fields(array_keys($columns)); - $revision_query = db_insert($revision_name)->fields(array_keys($columns)); - foreach ($records as $record) { - $query->values($record); - if ($revision_id) { - $revision_query->values($record); - } - } - $query->execute(); - $revision_query->execute(); - } -} - -/** - * @addtogroup updates-6.x-to-7.x - * @{ - */ - -/** - * Field SQL storage update version placeholder. - */ -function field_sql_storage_update_7000() { - // Some update helper functions (such as - // _update_7000_field_sql_storage_write()) modify the database directly. They - // can be used safely only if the database schema matches the field module - // schema established for Drupal 7.0 (i.e. version 7000). This function exists - // solely to set the schema version to 7000, so that update functions calling - // those helpers can do so safely by declaring a dependency on - // field_sql_storage_update_7000(). -} - -/** - * Remove the field_config_entity_type table and store 'entity_type' strings. - */ -function field_sql_storage_update_7001(&$sandbox) { - if (!isset($sandbox['progress'])) { - // Collect current etids. - $sandbox['etids'] = db_query('SELECT etid, type FROM {field_config_entity_type}')->fetchAllKeyed(); - - // Collect affected tables: field data, field revision data, 'deleted' - // tables. - $sandbox['tables'] = array(); - $results = db_select('field_config', 'fc', array('fetch' => PDO::FETCH_ASSOC)) - ->fields('fc') - ->condition('storage_module', 'field_sql_storage') - ->execute(); - foreach ($results as $field) { - if ($field['deleted']) { - $sandbox['tables']["field_deleted_data_{$field['id']}"] = 'data'; - $sandbox['tables']["field_deleted_revision_{$field['id']}"] = 'revision'; - } - else { - $sandbox['tables']["field_data_{$field['field_name']}"] = 'data'; - $sandbox['tables']["field_revision_{$field['field_name']}"] = 'revision'; - } - } - reset($sandbox['tables']); - - $sandbox['total'] = count($sandbox['tables']); - $sandbox['progress'] = 0; - } - - if ($sandbox['tables']) { - // Grab the next table to process. - $table = key($sandbox['tables']); - $type = array_shift($sandbox['tables']); - - if (db_table_exists($table)) { - // Add the 'entity_type' column. - if (!db_field_exists($table, 'entity_type')) { - $column = array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The entity type this data is attached to.', - ); - db_add_field($table, 'entity_type', $column); - - // Populate the 'entity_type' column based on the 'etid' column. - foreach ($sandbox['etids'] as $etid => $entity_type) { - db_update($table) - ->fields(array('entity_type' => $entity_type)) - ->condition('etid', $etid) - ->execute(); - } - - // Index the new column. - db_add_index($table, 'entity_type', array('entity_type')); - } - - // Use the 'entity_type' column in the primary key. - db_drop_primary_key($table); - $primary_keys = array( - 'data' => array('entity_type', 'entity_id', 'deleted', 'delta', 'language'), - 'revision' => array('entity_type', 'entity_id', 'revision_id', 'deleted', 'delta', 'language'), - ); - db_add_primary_key($table, $primary_keys[$type]); - - // Drop the 'etid' column. - if (db_field_exists($table, 'etid')) { - db_drop_field($table, 'etid'); - } - } - - // Report progress. - $sandbox['progress']++; - $sandbox['#finished'] = min(0.99, $sandbox['progress'] / $sandbox['total']); - } - else { - // No more tables left: drop the field_config_entity_type table. - db_drop_table('field_config_entity_type'); - - // Drop the previous 'field_sql_storage_ENTITYTYPE_etid' system variables. - foreach ($sandbox['etids'] as $etid => $entity_type) { - variable_del('field_sql_storage_' . $entity_type . '_etid'); - } - - // We're done. - $sandbox['#finished'] = 1; - } -} - -/** - * Fix primary keys in field revision data tables. - */ -function field_sql_storage_update_7002() { - $results = db_select('field_config', 'fc', array('fetch' => PDO::FETCH_ASSOC)) - ->fields('fc') - ->condition('storage_module', 'field_sql_storage') - ->execute(); - foreach ($results as $field) { - // Revision tables of deleted fields do not need to be fixed, since no new - // data is written to them. - if (!$field['deleted']) { - $table = "field_revision_{$field['field_name']}"; - db_drop_primary_key($table); - db_add_primary_key($table, array('entity_type', 'entity_id', 'revision_id', 'deleted', 'delta', 'language')); - } - } -} - -/** - * @} End of "addtogroup updates-6.x-to-7.x". - */ diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module deleted file mode 100644 index 93f2077..0000000 --- a/modules/field/modules/field_sql_storage/field_sql_storage.module +++ /dev/null @@ -1,758 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Field SQL storage module stores field data in the database. It is the default field storage module; other field storage mechanisms may be available as contributed modules. See the Field module help page for more information about fields.', array('@field-help' => url('admin/help/field'))) . '
'; - return $output; - } -} - -/** - * Implements hook_field_storage_info(). - */ -function field_sql_storage_field_storage_info() { - return array( - 'field_sql_storage' => array( - 'label' => t('Default SQL storage'), - 'description' => t('Stores fields in the local SQL database, using per-field tables.'), - ), - ); -} - -/** - * Generate a table name for a field data table. - * - * @param $field - * The field structure. - * @return - * A string containing the generated name for the database table - */ -function _field_sql_storage_tablename($field) { - if ($field['deleted']) { - return "field_deleted_data_{$field['id']}"; - } - else { - return "field_data_{$field['field_name']}"; - } -} - -/** - * Generate a table name for a field revision archive table. - * - * @param $name - * The field structure. - * @return - * A string containing the generated name for the database table - */ -function _field_sql_storage_revision_tablename($field) { - if ($field['deleted']) { - return "field_deleted_revision_{$field['id']}"; - } - else { - return "field_revision_{$field['field_name']}"; - } -} - -/** - * Generate a column name for a field data table. - * - * @param $name - * The name of the field - * @param $column - * The name of the column - * @return - * A string containing a generated column name for a field data - * table that is unique among all other fields. - */ -function _field_sql_storage_columnname($name, $column) { - return $name . '_' . $column; -} - -/** - * Generate an index name for a field data table. - * - * @param $name - * The name of the field - * @param $column - * The name of the index - * @return - * A string containing a generated index name for a field data - * table that is unique among all other fields. - */ -function _field_sql_storage_indexname($name, $index) { - return $name . '_' . $index; -} - -/** - * Return the database schema for a field. This may contain one or - * more tables. Each table will contain the columns relevant for the - * specified field. Leave the $field's 'columns' and 'indexes' keys - * empty to get only the base schema. - * - * @param $field - * The field structure for which to generate a database schema. - * @return - * One or more tables representing the schema for the field. - */ -function _field_sql_storage_schema($field) { - $deleted = $field['deleted'] ? 'deleted ' : ''; - $current = array( - 'description' => "Data storage for {$deleted}field {$field['id']} ({$field['field_name']})", - 'fields' => array( - 'entity_type' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The entity type this data is attached to', - ), - 'bundle' => array( - 'type' => 'varchar', - 'length' => 128, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The field instance bundle to which this row belongs, used when deleting a field instance', - ), - 'deleted' => array( - 'type' => 'int', - 'size' => 'tiny', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'A boolean indicating whether this data item has been deleted' - ), - 'entity_id' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => 'The entity id this data is attached to', - ), - 'revision_id' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => FALSE, - 'description' => 'The entity revision id this data is attached to, or NULL if the entity type is not versioned', - ), - // @todo Consider storing language as integer. - 'language' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The language for this data item.', - ), - 'delta' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'description' => 'The sequence number for this data item, used for multi-value fields', - ), - ), - 'primary key' => array('entity_type', 'entity_id', 'deleted', 'delta', 'language'), - 'indexes' => array( - 'entity_type' => array('entity_type'), - 'bundle' => array('bundle'), - 'deleted' => array('deleted'), - 'entity_id' => array('entity_id'), - 'revision_id' => array('revision_id'), - 'language' => array('language'), - ), - ); - - $field += array('columns' => array(), 'indexes' => array(), 'foreign keys' => array()); - // Add field columns. - foreach ($field['columns'] as $column_name => $attributes) { - $real_name = _field_sql_storage_columnname($field['field_name'], $column_name); - $current['fields'][$real_name] = $attributes; - } - - // Add indexes. - foreach ($field['indexes'] as $index_name => $columns) { - $real_name = _field_sql_storage_indexname($field['field_name'], $index_name); - foreach ($columns as $column_name) { - $current['indexes'][$real_name][] = _field_sql_storage_columnname($field['field_name'], $column_name); - } - } - - // Add foreign keys. - foreach ($field['foreign keys'] as $specifier => $specification) { - $real_name = _field_sql_storage_indexname($field['field_name'], $specifier); - $current['foreign keys'][$real_name]['table'] = $specification['table']; - foreach ($specification['columns'] as $column_name => $referenced) { - $sql_storage_column = _field_sql_storage_columnname($field['field_name'], $column_name); - $current['foreign keys'][$real_name]['columns'][$sql_storage_column] = $referenced; - } - } - - // Construct the revision table. - $revision = $current; - $revision['description'] = "Revision archive storage for {$deleted}field {$field['id']} ({$field['field_name']})"; - $revision['primary key'] = array('entity_type', 'entity_id', 'revision_id', 'deleted', 'delta', 'language'); - $revision['fields']['revision_id']['not null'] = TRUE; - $revision['fields']['revision_id']['description'] = 'The entity revision id this data is attached to'; - - return array( - _field_sql_storage_tablename($field) => $current, - _field_sql_storage_revision_tablename($field) => $revision, - ); -} - -/** - * Implements hook_field_storage_create_field(). - */ -function field_sql_storage_field_storage_create_field($field) { - $schema = _field_sql_storage_schema($field); - foreach ($schema as $name => $table) { - db_create_table($name, $table); - } - drupal_get_schema(NULL, TRUE); -} - -/** - * Implements hook_field_update_forbid(). - * - * Forbid any field update that changes column definitions if there is - * any data. - */ -function field_sql_storage_field_update_forbid($field, $prior_field, $has_data) { - if ($has_data && $field['columns'] != $prior_field['columns']) { - throw new FieldUpdateForbiddenException("field_sql_storage cannot change the schema for an existing field with data."); - } -} - -/** - * Implements hook_field_storage_update_field(). - */ -function field_sql_storage_field_storage_update_field($field, $prior_field, $has_data) { - if (! $has_data) { - // There is no data. Re-create the tables completely. - - if (Database::getConnection()->supportsTransactionalDDL()) { - // If the database supports transactional DDL, we can go ahead and rely - // on it. If not, we will have to rollback manually if something fails. - $transaction = db_transaction(); - } - - try { - $prior_schema = _field_sql_storage_schema($prior_field); - foreach ($prior_schema as $name => $table) { - db_drop_table($name, $table); - } - $schema = _field_sql_storage_schema($field); - foreach ($schema as $name => $table) { - db_create_table($name, $table); - } - } - catch (Exception $e) { - if (Database::getConnection()->supportsTransactionalDDL()) { - $transaction->rollback(); - } - else { - // Recreate tables. - $prior_schema = _field_sql_storage_schema($prior_field); - foreach ($prior_schema as $name => $table) { - if (!db_table_exists($name)) { - db_create_table($name, $table); - } - } - } - throw $e; - } - } - else { - // There is data, so there are no column changes. Drop all the - // prior indexes and create all the new ones, except for all the - // priors that exist unchanged. - $table = _field_sql_storage_tablename($prior_field); - $revision_table = _field_sql_storage_revision_tablename($prior_field); - foreach ($prior_field['indexes'] as $name => $columns) { - if (!isset($field['indexes'][$name]) || $columns != $field['indexes'][$name]) { - $real_name = _field_sql_storage_indexname($field['field_name'], $name); - db_drop_index($table, $real_name); - db_drop_index($revision_table, $real_name); - } - } - $table = _field_sql_storage_tablename($field); - $revision_table = _field_sql_storage_revision_tablename($field); - foreach ($field['indexes'] as $name => $columns) { - if (!isset($prior_field['indexes'][$name]) || $columns != $prior_field['indexes'][$name]) { - $real_name = _field_sql_storage_indexname($field['field_name'], $name); - $real_columns = array(); - foreach ($columns as $column_name) { - $real_columns[] = _field_sql_storage_columnname($field['field_name'], $column_name); - } - db_add_index($table, $real_name, $real_columns); - db_add_index($revision_table, $real_name, $real_columns); - } - } - } - drupal_get_schema(NULL, TRUE); -} - -/** - * Implements hook_field_storage_delete_field(). - */ -function field_sql_storage_field_storage_delete_field($field) { - // Mark all data associated with the field for deletion. - $field['deleted'] = 0; - $table = _field_sql_storage_tablename($field); - $revision_table = _field_sql_storage_revision_tablename($field); - db_update($table) - ->fields(array('deleted' => 1)) - ->execute(); - - // Move the table to a unique name while the table contents are being deleted. - $field['deleted'] = 1; - $new_table = _field_sql_storage_tablename($field); - $revision_new_table = _field_sql_storage_revision_tablename($field); - db_rename_table($table, $new_table); - db_rename_table($revision_table, $revision_new_table); - drupal_get_schema(NULL, TRUE); -} - -/** - * Implements hook_field_storage_load(). - */ -function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fields, $options) { - $load_current = $age == FIELD_LOAD_CURRENT; - - foreach ($fields as $field_id => $ids) { - // By the time this hook runs, the relevant field definitions have been - // populated and cached in FieldInfo, so calling field_info_field_by_id() - // on each field individually is more efficient than loading all fields in - // memory upfront with field_info_field_by_ids(). - $field = field_info_field_by_id($field_id); - $field_name = $field['field_name']; - $table = $load_current ? _field_sql_storage_tablename($field) : _field_sql_storage_revision_tablename($field); - - $query = db_select($table, 't') - ->fields('t') - ->condition('entity_type', $entity_type) - ->condition($load_current ? 'entity_id' : 'revision_id', $ids, 'IN') - ->condition('language', field_available_languages($entity_type, $field), 'IN') - ->orderBy('delta'); - - if (empty($options['deleted'])) { - $query->condition('deleted', 0); - } - - $results = $query->execute(); - - $delta_count = array(); - foreach ($results as $row) { - if (!isset($delta_count[$row->entity_id][$row->language])) { - $delta_count[$row->entity_id][$row->language] = 0; - } - - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->language] < $field['cardinality']) { - $item = array(); - // For each column declared by the field, populate the item - // from the prefixed database column. - foreach ($field['columns'] as $column => $attributes) { - $column_name = _field_sql_storage_columnname($field_name, $column); - $item[$column] = $row->$column_name; - } - - // Add the item to the field values for the entity. - $entities[$row->entity_id]->{$field_name}[$row->language][] = $item; - $delta_count[$row->entity_id][$row->language]++; - } - } - } -} - -/** - * Implements hook_field_storage_write(). - */ -function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fields) { - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - if (!isset($vid)) { - $vid = $id; - } - - foreach ($fields as $field_id) { - $field = field_info_field_by_id($field_id); - $field_name = $field['field_name']; - $table_name = _field_sql_storage_tablename($field); - $revision_name = _field_sql_storage_revision_tablename($field); - - $all_languages = field_available_languages($entity_type, $field); - $field_languages = array_intersect($all_languages, array_keys((array) $entity->$field_name)); - - // Delete and insert, rather than update, in case a value was added. - if ($op == FIELD_STORAGE_UPDATE) { - // Delete languages present in the incoming $entity->$field_name. - // Delete all languages if $entity->$field_name is empty. - $languages = !empty($entity->$field_name) ? $field_languages : $all_languages; - if ($languages) { - db_delete($table_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $id) - ->condition('language', $languages, 'IN') - ->execute(); - db_delete($revision_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $id) - ->condition('revision_id', $vid) - ->condition('language', $languages, 'IN') - ->execute(); - } - } - - // Prepare the multi-insert query. - $do_insert = FALSE; - $columns = array('entity_type', 'entity_id', 'revision_id', 'bundle', 'delta', 'language'); - foreach ($field['columns'] as $column => $attributes) { - $columns[] = _field_sql_storage_columnname($field_name, $column); - } - $query = db_insert($table_name)->fields($columns); - $revision_query = db_insert($revision_name)->fields($columns); - - foreach ($field_languages as $langcode) { - $items = (array) $entity->{$field_name}[$langcode]; - $delta_count = 0; - foreach ($items as $delta => $item) { - // We now know we have someting to insert. - $do_insert = TRUE; - $record = array( - 'entity_type' => $entity_type, - 'entity_id' => $id, - 'revision_id' => $vid, - 'bundle' => $bundle, - 'delta' => $delta, - 'language' => $langcode, - ); - foreach ($field['columns'] as $column => $attributes) { - $record[_field_sql_storage_columnname($field_name, $column)] = isset($item[$column]) ? $item[$column] : NULL; - } - $query->values($record); - if (isset($vid)) { - $revision_query->values($record); - } - - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) { - break; - } - } - } - - // Execute the query if we have values to insert. - if ($do_insert) { - $query->execute(); - $revision_query->execute(); - } - } -} - -/** - * Implements hook_field_storage_delete(). - * - * This function deletes data for all fields for an entity from the database. - */ -function field_sql_storage_field_storage_delete($entity_type, $entity, $fields) { - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - foreach (field_info_instances($entity_type, $bundle) as $instance) { - if (isset($fields[$instance['field_id']])) { - $field = field_info_field_by_id($instance['field_id']); - field_sql_storage_field_storage_purge($entity_type, $entity, $field, $instance); - } - } -} - -/** - * Implements hook_field_storage_purge(). - * - * This function deletes data from the database for a single field on - * an entity. - */ -function field_sql_storage_field_storage_purge($entity_type, $entity, $field, $instance) { - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - $table_name = _field_sql_storage_tablename($field); - $revision_name = _field_sql_storage_revision_tablename($field); - db_delete($table_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $id) - ->execute(); - db_delete($revision_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $id) - ->execute(); -} - -/** - * Implements hook_field_storage_query(). - */ -function field_sql_storage_field_storage_query(EntityFieldQuery $query) { - if ($query->age == FIELD_LOAD_CURRENT) { - $tablename_function = '_field_sql_storage_tablename'; - $id_key = 'entity_id'; - } - else { - $tablename_function = '_field_sql_storage_revision_tablename'; - $id_key = 'revision_id'; - } - $table_aliases = array(); - // Add tables for the fields used. - foreach ($query->fields as $key => $field) { - $tablename = $tablename_function($field); - // Every field needs a new table. - $table_alias = $tablename . $key; - $table_aliases[$key] = $table_alias; - if ($key) { - $select_query->join($tablename, $table_alias, "$table_alias.entity_type = $field_base_table.entity_type AND $table_alias.$id_key = $field_base_table.$id_key"); - } - else { - $select_query = db_select($tablename, $table_alias); - // Allow queries internal to the Field API to opt out of the access - // check, for situations where the query's results should not depend on - // the access grants for the current user. - if (!isset($query->tags['DANGEROUS_ACCESS_CHECK_OPT_OUT'])) { - $select_query->addTag('entity_field_access'); - } - $select_query->addMetaData('base_table', $tablename); - $select_query->fields($table_alias, array('entity_type', 'entity_id', 'revision_id', 'bundle')); - $field_base_table = $table_alias; - } - if ($field['cardinality'] != 1 || $field['translatable']) { - $select_query->distinct(); - } - } - - // Add field conditions. We need a fresh grouping cache. - drupal_static_reset('_field_sql_storage_query_field_conditions'); - _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldConditions, $table_aliases, '_field_sql_storage_columnname'); - - // Add field meta conditions. - _field_sql_storage_query_field_conditions($query, $select_query, $query->fieldMetaConditions, $table_aliases, '_field_sql_storage_query_columnname'); - - if (isset($query->deleted)) { - $select_query->condition("$field_base_table.deleted", (int) $query->deleted); - } - - // Is there a need to sort the query by property? - $has_property_order = FALSE; - foreach ($query->order as $order) { - if ($order['type'] == 'property') { - $has_property_order = TRUE; - } - } - - if ($query->propertyConditions || $has_property_order) { - if (empty($query->entityConditions['entity_type']['value'])) { - throw new EntityFieldQueryException('Property conditions and orders must have an entity type defined.'); - } - $entity_type = $query->entityConditions['entity_type']['value']; - $entity_base_table = _field_sql_storage_query_join_entity($select_query, $entity_type, $field_base_table); - $query->entityConditions['entity_type']['operator'] = '='; - foreach ($query->propertyConditions as $property_condition) { - $query->addCondition($select_query, "$entity_base_table." . $property_condition['column'], $property_condition); - } - } - foreach ($query->entityConditions as $key => $condition) { - $query->addCondition($select_query, "$field_base_table.$key", $condition); - } - - // Order the query. - foreach ($query->order as $order) { - if ($order['type'] == 'entity') { - $key = $order['specifier']; - $select_query->orderBy("$field_base_table.$key", $order['direction']); - } - elseif ($order['type'] == 'field') { - $specifier = $order['specifier']; - $field = $specifier['field']; - $table_alias = $table_aliases[$specifier['index']]; - $sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']); - $select_query->orderBy($sql_field, $order['direction']); - } - elseif ($order['type'] == 'property') { - $select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']); - } - } - - return $query->finishQuery($select_query, $id_key); -} - -/** - * Adds the base entity table to a field query object. - * - * @param SelectQuery $select_query - * A SelectQuery containing at least one table as specified by - * _field_sql_storage_tablename(). - * @param $entity_type - * The entity type for which the base table should be joined. - * @param $field_base_table - * Name of a table in $select_query. As only INNER JOINs are used, it does - * not matter which. - * - * @return - * The name of the entity base table joined in. - */ -function _field_sql_storage_query_join_entity(SelectQuery $select_query, $entity_type, $field_base_table) { - $entity_info = entity_get_info($entity_type); - $entity_base_table = $entity_info['base table']; - $entity_field = $entity_info['entity keys']['id']; - $select_query->join($entity_base_table, $entity_base_table, "$entity_base_table.$entity_field = $field_base_table.entity_id"); - return $entity_base_table; -} - -/** - * Adds field (meta) conditions to the given query objects respecting groupings. - * - * @param EntityFieldQuery $query - * The field query object to be processed. - * @param SelectQuery $select_query - * The SelectQuery that should get grouping conditions. - * @param condtions - * The conditions to be added. - * @param $table_aliases - * An associative array of table aliases keyed by field index. - * @param $column_callback - * A callback that should return the column name to be used for the field - * conditions. Accepts a field name and a field column name as parameters. - */ -function _field_sql_storage_query_field_conditions(EntityFieldQuery $query, SelectQuery $select_query, $conditions, $table_aliases, $column_callback) { - $groups = &drupal_static(__FUNCTION__, array()); - foreach ($conditions as $key => $condition) { - $table_alias = $table_aliases[$key]; - $field = $condition['field']; - // Add the specified condition. - $sql_field = "$table_alias." . $column_callback($field['field_name'], $condition['column']); - $query->addCondition($select_query, $sql_field, $condition); - // Add delta / language group conditions. - foreach (array('delta', 'language') as $column) { - if (isset($condition[$column . '_group'])) { - $group_name = $condition[$column . '_group']; - if (!isset($groups[$column][$group_name])) { - $groups[$column][$group_name] = $table_alias; - } - else { - $select_query->where("$table_alias.$column = " . $groups[$column][$group_name] . ".$column"); - } - } - } - } -} - -/** - * Field meta condition column callback. - */ -function _field_sql_storage_query_columnname($field_name, $column) { - return $column; -} - -/** - * Implements hook_field_storage_delete_revision(). - * - * This function actually deletes the data from the database. - */ -function field_sql_storage_field_storage_delete_revision($entity_type, $entity, $fields) { - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - if (isset($vid)) { - foreach ($fields as $field_id) { - $field = field_info_field_by_id($field_id); - $revision_name = _field_sql_storage_revision_tablename($field); - db_delete($revision_name) - ->condition('entity_type', $entity_type) - ->condition('entity_id', $id) - ->condition('revision_id', $vid) - ->execute(); - } - } -} - -/** - * Implements hook_field_storage_delete_instance(). - * - * This function simply marks for deletion all data associated with the field. - */ -function field_sql_storage_field_storage_delete_instance($instance) { - $field = field_info_field($instance['field_name']); - $table_name = _field_sql_storage_tablename($field); - $revision_name = _field_sql_storage_revision_tablename($field); - db_update($table_name) - ->fields(array('deleted' => 1)) - ->condition('entity_type', $instance['entity_type']) - ->condition('bundle', $instance['bundle']) - ->execute(); - db_update($revision_name) - ->fields(array('deleted' => 1)) - ->condition('entity_type', $instance['entity_type']) - ->condition('bundle', $instance['bundle']) - ->execute(); -} - -/** - * Implements hook_field_attach_rename_bundle(). - */ -function field_sql_storage_field_attach_rename_bundle($entity_type, $bundle_old, $bundle_new) { - // We need to account for deleted or inactive fields and instances. - $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); - foreach ($instances as $instance) { - $field = field_info_field_by_id($instance['field_id']); - if ($field['storage']['type'] == 'field_sql_storage') { - $table_name = _field_sql_storage_tablename($field); - $revision_name = _field_sql_storage_revision_tablename($field); - db_update($table_name) - ->fields(array('bundle' => $bundle_new)) - ->condition('entity_type', $entity_type) - ->condition('bundle', $bundle_old) - ->execute(); - db_update($revision_name) - ->fields(array('bundle' => $bundle_new)) - ->condition('entity_type', $entity_type) - ->condition('bundle', $bundle_old) - ->execute(); - } - } -} - -/** - * Implements hook_field_storage_purge_field(). - * - * All field data items and instances have already been purged, so all - * that is left is to delete the table. - */ -function field_sql_storage_field_storage_purge_field($field) { - $table_name = _field_sql_storage_tablename($field); - $revision_name = _field_sql_storage_revision_tablename($field); - db_drop_table($table_name); - db_drop_table($revision_name); -} - -/** - * Implements hook_field_storage_details(). - */ -function field_sql_storage_field_storage_details($field) { - $details = array(); - if (!empty($field['columns'])) { - // Add field columns. - foreach ($field['columns'] as $column_name => $attributes) { - $real_name = _field_sql_storage_columnname($field['field_name'], $column_name); - $columns[$column_name] = $real_name; - } - return array( - 'sql' => array( - FIELD_LOAD_CURRENT => array( - _field_sql_storage_tablename($field) => $columns, - ), - FIELD_LOAD_REVISION => array( - _field_sql_storage_revision_tablename($field) => $columns, - ), - ), - ); - } -} diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.test b/modules/field/modules/field_sql_storage/field_sql_storage.test deleted file mode 100644 index 12c54ba..0000000 --- a/modules/field/modules/field_sql_storage/field_sql_storage.test +++ /dev/null @@ -1,441 +0,0 @@ - 'Field SQL storage tests', - 'description' => "Test field SQL storage module.", - 'group' => 'Field API' - ); - } - - function setUp() { - parent::setUp('field_sql_storage', 'field', 'field_test', 'text'); - $this->field_name = strtolower($this->randomName()); - $this->field = array('field_name' => $this->field_name, 'type' => 'test_field', 'cardinality' => 4); - $this->field = field_create_field($this->field); - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle' - ); - $this->instance = field_create_instance($this->instance); - $this->table = _field_sql_storage_tablename($this->field); - $this->revision_table = _field_sql_storage_revision_tablename($this->field); - - } - - /** - * Uses the mysql tables and records to verify - * field_load_revision works correctly. - */ - function testFieldAttachLoad() { - $entity_type = 'test_entity'; - $eid = 0; - $langcode = LANGUAGE_NONE; - - $columns = array('entity_type', 'entity_id', 'revision_id', 'delta', 'language', $this->field_name . '_value'); - - // Insert data for four revisions to the field revisions table - $query = db_insert($this->revision_table)->fields($columns); - for ($evid = 0; $evid < 4; ++$evid) { - $values[$evid] = array(); - // Note: we insert one extra value ('<=' instead of '<'). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { - $value = mt_rand(1, 127); - $values[$evid][] = $value; - $query->values(array($entity_type, $eid, $evid, $delta, $langcode, $value)); - } - } - $query->execute(); - - // Insert data for the "most current revision" into the field table - $query = db_insert($this->table)->fields($columns); - foreach ($values[0] as $delta => $value) { - $query->values(array($entity_type, $eid, 0, $delta, $langcode, $value)); - } - $query->execute(); - - // Load the "most current revision" - $entity = field_test_create_stub_entity($eid, 0, $this->instance['bundle']); - field_attach_load($entity_type, array($eid => $entity)); - foreach ($values[0] as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['value'], $value, "Value $delta is loaded correctly for current revision"); - } - else { - $this->assertFalse(array_key_exists($delta, $entity->{$this->field_name}[$langcode]), "No extraneous value gets loaded for current revision."); - } - } - - // Load every revision - for ($evid = 0; $evid < 4; ++$evid) { - $entity = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']); - field_attach_load_revision($entity_type, array($eid => $entity)); - foreach ($values[$evid] as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['value'], $value, "Value $delta for revision $evid is loaded correctly"); - } - else { - $this->assertFalse(array_key_exists($delta, $entity->{$this->field_name}[$langcode]), "No extraneous value gets loaded for revision $evid."); - } - } - } - - // Add a translation in an unavailable language and verify it is not loaded. - $eid = $evid = 1; - $unavailable_language = 'xx'; - $entity = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']); - $values = array($entity_type, $eid, $evid, 0, $unavailable_language, mt_rand(1, 127)); - db_insert($this->table)->fields($columns)->values($values)->execute(); - db_insert($this->revision_table)->fields($columns)->values($values)->execute(); - field_attach_load($entity_type, array($eid => $entity)); - $this->assertFalse(array_key_exists($unavailable_language, $entity->{$this->field_name}), 'Field translation in an unavailable language ignored'); - } - - /** - * Reads mysql to verify correct data is - * written when using insert and update. - */ - function testFieldAttachInsertAndUpdate() { - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - - // Test insert. - $values = array(); - // Note: we try to insert one extra value ('<=' instead of '<'). - // TODO : test empty values filtering and "compression" (store consecutive deltas). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { - $values[$delta]['value'] = mt_rand(1, 127); - } - $entity->{$this->field_name}[$langcode] = $rev_values[0] = $values; - field_attach_insert($entity_type, $entity); - - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], format_string("Value %delta is inserted correctly", array('%delta' => $delta))); - } - else { - $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets inserted."); - } - } - - // Test update. - $entity = field_test_create_stub_entity(0, 1, $this->instance['bundle']); - $values = array(); - // Note: we try to update one extra value ('<=' instead of '<'). - for ($delta = 0; $delta <= $this->field['cardinality']; $delta++) { - $values[$delta]['value'] = mt_rand(1, 127); - } - $entity->{$this->field_name}[$langcode] = $rev_values[1] = $values; - field_attach_update($entity_type, $entity); - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], format_string("Value %delta is updated correctly", array('%delta' => $delta))); - } - else { - $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets updated."); - } - } - - // Check that data for both revisions are in the revision table. - // We make sure each value is stored correctly, then unset it. - // When an entire revision's values are unset (remembering that we - // put one extra value in $values per revision), unset the entire - // revision. Then, if $rev_values is empty at the end, all - // revision data was found. - $results = db_select($this->revision_table, 't')->fields('t')->execute(); - foreach ($results as $row) { - $this->assertEqual($row->{$this->field_name . '_value'}, $rev_values[$row->revision_id][$row->delta]['value'], "Value {$row->delta} for revision {$row->revision_id} stored correctly"); - unset($rev_values[$row->revision_id][$row->delta]); - if (count($rev_values[$row->revision_id]) == 1) { - unset($rev_values[$row->revision_id]); - } - } - $this->assertTrue(empty($rev_values), "All values for all revisions are stored in revision table {$this->revision_table}"); - - // Check that update leaves the field data untouched if - // $entity->{$field_name} is absent. - unset($entity->{$this->field_name}); - field_attach_update($entity_type, $entity); - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - foreach ($values as $delta => $value) { - if ($delta < $this->field['cardinality']) { - $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], format_string("Update with no field_name entry leaves value %delta untouched", array('%delta' => $delta))); - } - } - - // Check that update with an empty $entity->$field_name empties the field. - $entity->{$this->field_name} = NULL; - field_attach_update($entity_type, $entity); - $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC); - $this->assertEqual(count($rows), 0, "Update with an empty field_name entry empties the field."); - } - - /** - * Tests insert and update with missing or NULL fields. - */ - function testFieldAttachSaveMissingData() { - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - - // Insert: Field is missing - field_attach_insert($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 0, 'Missing field results in no inserts'); - - // Insert: Field is NULL - $entity->{$this->field_name} = NULL; - field_attach_insert($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 0, 'NULL field results in no inserts'); - - // Add some real data - $entity->{$this->field_name}[$langcode] = array(0 => array('value' => 1)); - field_attach_insert($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 1, 'Field data saved'); - - // Update: Field is missing. Data should survive. - unset($entity->{$this->field_name}); - field_attach_update($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 1, 'Missing field leaves data in table'); - - // Update: Field is NULL. Data should be wiped. - $entity->{$this->field_name} = NULL; - field_attach_update($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 0, 'NULL field leaves no data in table'); - - // Add a translation in an unavailable language. - $unavailable_language = 'xx'; - db_insert($this->table) - ->fields(array('entity_type', 'bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'language')) - ->values(array($entity_type, $this->instance['bundle'], 0, 0, 0, 0, $unavailable_language)) - ->execute(); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 1, 'Field translation in an unavailable language saved.'); - - // Again add some real data. - $entity->{$this->field_name}[$langcode] = array(0 => array('value' => 1)); - field_attach_insert($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 2, 'Field data saved.'); - - // Update: Field translation is missing but field is not empty. Translation - // data should survive. - $entity->{$this->field_name}[$unavailable_language] = array(mt_rand(1, 127)); - unset($entity->{$this->field_name}[$langcode]); - field_attach_update($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 2, 'Missing field translation leaves data in table.'); - - // Update: Field translation is NULL but field is not empty. Translation - // data should be wiped. - $entity->{$this->field_name}[$langcode] = NULL; - field_attach_update($entity_type, $entity); - $count = db_select($this->table) - ->countQuery() - ->execute() - ->fetchField(); - $this->assertEqual($count, 1, 'NULL field translation is wiped.'); - } - - /** - * Test trying to update a field with data. - */ - function testUpdateFieldSchemaWithData() { - // Create a decimal 5.2 field and add some data. - $field = array('field_name' => 'decimal52', 'type' => 'number_decimal', 'settings' => array('precision' => 5, 'scale' => 2)); - $field = field_create_field($field); - $instance = array('field_name' => 'decimal52', 'entity_type' => 'test_entity', 'bundle' => 'test_bundle'); - $instance = field_create_instance($instance); - $entity = field_test_create_stub_entity(0, 0, $instance['bundle']); - $entity->decimal52[LANGUAGE_NONE][0]['value'] = '1.235'; - field_attach_insert('test_entity', $entity); - - // Attempt to update the field in a way that would work without data. - $field['settings']['scale'] = 3; - try { - field_update_field($field); - $this->fail(t('Cannot update field schema with data.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot update field schema with data.')); - } - } - - /** - * Test that failure to create fields is handled gracefully. - */ - function testFieldUpdateFailure() { - // Create a text field. - $field = array('field_name' => 'test_text', 'type' => 'text', 'settings' => array('max_length' => 255)); - $field = field_create_field($field); - - // Attempt to update the field in a way that would break the storage. - $prior_field = $field; - $field['settings']['max_length'] = -1; - try { - field_update_field($field); - $this->fail(t('Update succeeded.')); - } - catch (Exception $e) { - $this->pass(t('Update properly failed.')); - } - - // Ensure that the field tables are still there. - foreach (_field_sql_storage_schema($prior_field) as $table_name => $table_info) { - $this->assertTrue(db_table_exists($table_name), format_string('Table %table exists.', array('%table' => $table_name))); - } - } - - /** - * Test adding and removing indexes while data is present. - */ - function testFieldUpdateIndexesWithData() { - - // Create a decimal field. - $field_name = 'testfield'; - $field = array('field_name' => $field_name, 'type' => 'text'); - $field = field_create_field($field); - $instance = array('field_name' => $field_name, 'entity_type' => 'test_entity', 'bundle' => 'test_bundle'); - $instance = field_create_instance($instance); - $tables = array(_field_sql_storage_tablename($field), _field_sql_storage_revision_tablename($field)); - - // Verify the indexes we will create do not exist yet. - foreach ($tables as $table) { - $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value'), format_string("No index named value exists in %table", array('%table' => $table))); - $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value_format'), format_string("No index named value_format exists in %table", array('%table' => $table))); - } - - // Add data so the table cannot be dropped. - $entity = field_test_create_stub_entity(0, 0, $instance['bundle']); - $entity->{$field_name}[LANGUAGE_NONE][0]['value'] = 'field data'; - field_attach_insert('test_entity', $entity); - - // Add an index - $field = array('field_name' => $field_name, 'indexes' => array('value' => array('value'))); - field_update_field($field); - foreach ($tables as $table) { - $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), format_string("Index on value created in %table", array('%table' => $table))); - } - - // Add a different index, removing the existing custom one. - $field = array('field_name' => $field_name, 'indexes' => array('value_format' => array('value', 'format'))); - field_update_field($field); - foreach ($tables as $table) { - $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), format_string("Index on value_format created in %table", array('%table' => $table))); - $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), format_string("Index on value removed in %table", array('%table' => $table))); - } - - // Verify that the tables were not dropped. - $entity = field_test_create_stub_entity(0, 0, $instance['bundle']); - field_attach_load('test_entity', array(0 => $entity)); - $this->assertEqual($entity->{$field_name}[LANGUAGE_NONE][0]['value'], 'field data', "Index changes performed without dropping the tables"); - } - - /** - * Test the storage details. - */ - function testFieldStorageDetails() { - $current = _field_sql_storage_tablename($this->field); - $revision = _field_sql_storage_revision_tablename($this->field); - - // Retrieve the field and instance with field_info so the storage details are attached. - $field = field_info_field($this->field['field_name']); - $instance = field_info_instance($this->instance['entity_type'], $this->instance['field_name'], $this->instance['bundle']); - - // The storage details are indexed by a storage engine type. - $this->assertTrue(array_key_exists('sql', $field['storage']['details']), 'The storage type is SQL.'); - - // The SQL details are indexed by table name. - $details = $field['storage']['details']['sql']; - $this->assertTrue(array_key_exists($current, $details[FIELD_LOAD_CURRENT]), 'Table name is available in the instance array.'); - $this->assertTrue(array_key_exists($revision, $details[FIELD_LOAD_REVISION]), 'Revision table name is available in the instance array.'); - - // Test current and revision storage details together because the columns - // are the same. - foreach ((array) $this->field['columns'] as $column_name => $attributes) { - $storage_column_name = _field_sql_storage_columnname($this->field['field_name'], $column_name); - $this->assertEqual($details[FIELD_LOAD_CURRENT][$current][$column_name], $storage_column_name, format_string('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => $current))); - $this->assertEqual($details[FIELD_LOAD_REVISION][$revision][$column_name], $storage_column_name, format_string('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => $revision))); - } - } - - /** - * Test foreign key support. - */ - function testFieldSqlStorageForeignKeys() { - // Create a 'shape' field, with a configurable foreign key (see - // field_test_field_schema()). - $field_name = 'testfield'; - $foreign_key_name = 'shape'; - $field = array('field_name' => $field_name, 'type' => 'shape', 'settings' => array('foreign_key_name' => $foreign_key_name)); - field_create_field($field); - - // Retrieve the field definition and check that the foreign key is in place. - $field = field_info_field($field_name); - $this->assertEqual($field['foreign keys'][$foreign_key_name]['table'], $foreign_key_name, 'Foreign key table name preserved through CRUD'); - $this->assertEqual($field['foreign keys'][$foreign_key_name]['columns'][$foreign_key_name], 'id', 'Foreign key column name preserved through CRUD'); - - // Update the field settings, it should update the foreign key definition - // too. - $foreign_key_name = 'color'; - $field['settings']['foreign_key_name'] = $foreign_key_name; - field_update_field($field); - - // Retrieve the field definition and check that the foreign key is in place. - $field = field_info_field($field_name); - $this->assertEqual($field['foreign keys'][$foreign_key_name]['table'], $foreign_key_name, 'Foreign key table name modified after update'); - $this->assertEqual($field['foreign keys'][$foreign_key_name]['columns'][$foreign_key_name], 'id', 'Foreign key column name modified after update'); - - // Now grab the SQL schema and verify that too. - $schema = drupal_get_schema(_field_sql_storage_tablename($field), TRUE); - $this->assertEqual(count($schema['foreign keys']), 1, 'There is 1 foreign key in the schema'); - $foreign_key = reset($schema['foreign keys']); - $foreign_key_column = _field_sql_storage_columnname($field['field_name'], $foreign_key_name); - $this->assertEqual($foreign_key['table'], $foreign_key_name, 'Foreign key table name preserved in the schema'); - $this->assertEqual($foreign_key['columns'][$foreign_key_column], 'id', 'Foreign key column name preserved in the schema'); - } -} diff --git a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info deleted file mode 100644 index 6bcec5d..0000000 --- a/modules/field/modules/list/list.info +++ /dev/null @@ -1,8 +0,0 @@ -name = List -description = Defines list field types. Use with Options to create selection lists. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -dependencies[] = options -files[] = tests/list.test diff --git a/modules/field/modules/list/list.install b/modules/field/modules/list/list.install deleted file mode 100644 index 2386f04..0000000 --- a/modules/field/modules/list/list.install +++ /dev/null @@ -1,138 +0,0 @@ - array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - ), - ); - break; - case 'list_float': - $columns = array( - 'value' => array( - 'type' => 'float', - 'not null' => FALSE, - ), - ); - break; - case 'list_integer': - case 'list_boolean': - $columns = array( - 'value' => array( - 'type' => 'int', - 'not null' => FALSE, - ), - ); - break; - } - return array( - 'columns' => $columns, - 'indexes' => array( - 'value' => array('value'), - ), - ); -} - -/** - * Rename the list field types and change 'allowed_values' format. - */ -function list_update_7001() { - $fields = _update_7000_field_read_fields(array('module' => 'list')); - foreach ($fields as $field) { - $update = array(); - - // Translate the old string format into the new array format. - $allowed_values = $field['settings']['allowed_values']; - if (is_string($allowed_values)) { - $position_keys = ($field['type'] == 'list'); - $allowed_values = _list_update_7001_extract_allowed_values($allowed_values, $position_keys); - - // Additionally, float keys need to be disambiguated ('.5' is '0.5'). - if ($field['type'] == 'list_number' && !empty($allowed_values)) { - $keys = array_map(create_function('$a', 'return (string) (float) $a;'), array_keys($allowed_values)); - $allowed_values = array_combine($keys, array_values($allowed_values)); - } - - // Place the new setting in the existing serialized 'data' column. - $data = db_query("SELECT data FROM {field_config} WHERE id = :id", array(':id' => $field['id']))->fetchField(); - $data = unserialize($data); - $data['settings']['allowed_values'] = $allowed_values; - $update['data'] = serialize($data); - } - - // Rename field types. - $types = array('list' => 'list_integer', 'list_number' => 'list_float'); - if (isset($types[$field['type']])) { - $update['type'] = $types[$field['type']]; - } - - // Save the new data. - if ($update) { - $query = db_update('field_config') - ->condition('id', $field['id']) - ->fields($update) - ->execute(); - } - } -} - -/** - * Helper function for list_update_7001: extract allowed values from a string. - * - * This reproduces the parsing logic in use before D7 RC2. - */ -function _list_update_7001_extract_allowed_values($string, $position_keys) { - $values = array(); - - $list = explode("\n", $string); - $list = array_map('trim', $list); - $list = array_filter($list, 'strlen'); - - foreach ($list as $key => $value) { - // Check for a manually specified key. - if (strpos($value, '|') !== FALSE) { - list($key, $value) = explode('|', $value); - } - // Otherwise see if we need to use the value as the key. The "list" type - // will automatically convert non-keyed lines to integers. - elseif (!$position_keys) { - $key = $value; - } - $values[$key] = (isset($value) && $value !== '') ? $value : $key; - } - - return $values; -} - -/** - * @addtogroup updates-7.x-extra - * @{ - */ - -/** - * Re-apply list_update_7001() for deleted fields. - */ -function list_update_7002() { - // See http://drupal.org/node/1022924: list_update_7001() intitally - // overlooked deleted fields, which then caused fatal errors when the fields - // were being purged. - // list_update_7001() has the required checks to ensure it is reentrant, so - // it can simply be executed once more.. - list_update_7001(); -} - -/** - * @} End of "addtogroup updates-7.x-extra". - */ diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module deleted file mode 100644 index 634c134..0000000 --- a/modules/field/modules/list/list.module +++ /dev/null @@ -1,486 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The List module defines various fields for storing a list of items, for use with the Field module. Usually these items are entered through a select list, checkboxes, or radio buttons. See the Field module help page for more information about fields.', array('@field-help' => url('admin/help/field'))) . '
'; - return $output; - } -} - -/** - * Implements hook_field_info(). - */ -function list_field_info() { - return array( - 'list_integer' => array( - 'label' => t('List (integer)'), - 'description' => t("This field stores integer values from a list of allowed 'value => label' pairs, i.e. 'Lifetime in days': 1 => 1 day, 7 => 1 week, 31 => 1 month."), - 'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''), - 'default_widget' => 'options_select', - 'default_formatter' => 'list_default', - ), - 'list_float' => array( - 'label' => t('List (float)'), - 'description' => t("This field stores float values from a list of allowed 'value => label' pairs, i.e. 'Fraction': 0 => 0, .25 => 1/4, .75 => 3/4, 1 => 1."), - 'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''), - 'default_widget' => 'options_select', - 'default_formatter' => 'list_default', - ), - 'list_text' => array( - 'label' => t('List (text)'), - 'description' => t("This field stores text values from a list of allowed 'value => label' pairs, i.e. 'US States': IL => Illinois, IA => Iowa, IN => Indiana."), - 'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''), - 'default_widget' => 'options_select', - 'default_formatter' => 'list_default', - ), - 'list_boolean' => array( - 'label' => t('Boolean'), - 'description' => t('This field stores simple on/off or yes/no options.'), - 'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''), - 'default_widget' => 'options_buttons', - 'default_formatter' => 'list_default', - ), - ); -} - -/** - * Implements hook_field_settings_form(). - */ -function list_field_settings_form($field, $instance, $has_data) { - $settings = $field['settings']; - - switch ($field['type']) { - case 'list_integer': - case 'list_float': - case 'list_text': - $form['allowed_values'] = array( - '#type' => 'textarea', - '#title' => t('Allowed values list'), - '#default_value' => list_allowed_values_string($settings['allowed_values']), - '#rows' => 10, - '#element_validate' => array('list_allowed_values_setting_validate'), - '#field_has_data' => $has_data, - '#field' => $field, - '#field_type' => $field['type'], - '#access' => empty($settings['allowed_values_function']), - ); - - $description = '' . t('The possible values this field can contain. Enter one value per line, in the format key|label.'); - if ($field['type'] == 'list_integer' || $field['type'] == 'list_float') { - $description .= '
'; - $form['allowed_values']['#description'] = $description; - - break; - - case 'list_boolean': - $values = $settings['allowed_values']; - $off_value = array_shift($values); - $on_value = array_shift($values); - - $form['allowed_values'] = array( - '#type' => 'value', - '#description' => '', - '#value_callback' => 'list_boolean_allowed_values_callback', - '#access' => empty($settings['allowed_values_function']), - ); - $form['allowed_values']['on'] = array( - '#type' => 'textfield', - '#title' => t('On value'), - '#default_value' => $on_value, - '#required' => FALSE, - '#description' => t('If left empty, "1" will be used.'), - // Change #parents to make sure the element is not saved into field - // settings. - '#parents' => array('on'), - ); - $form['allowed_values']['off'] = array( - '#type' => 'textfield', - '#title' => t('Off value'), - '#default_value' => $off_value, - '#required' => FALSE, - '#description' => t('If left empty, "0" will be used.'), - // Change #parents to make sure the element is not saved into field - // settings. - '#parents' => array('off'), - ); - - // Link the allowed value to the on / off elements to prepare for the rare - // case of an alter changing #parents. - $form['allowed_values']['#on_parents'] = &$form['allowed_values']['on']['#parents']; - $form['allowed_values']['#off_parents'] = &$form['allowed_values']['off']['#parents']; - - break; - } - - // Alter the description for allowed values depending on the widget type. - if ($instance['widget']['type'] == 'options_onoff') { - $form['allowed_values']['#description'] .= '
' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single number, it will be used as key and label.'); - $description .= '
' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.'); - } - else { - $description .= '
' . t('The key is the stored value. The label will be used in displayed values and edit forms.'); - $description .= '
' . t('The label is optional: if a line contains a single string, it will be used as key and label.'); - } - $description .= '' . t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the Allowed values section. Note that the checkbox will be labeled with the label of the 'on' value.") . '
'; - } - elseif ($instance['widget']['type'] == 'options_buttons') { - $form['allowed_values']['#description'] .= '' . t("The 'checkboxes/radio buttons' widget will display checkboxes if the Number of values option is greater than 1 for this field, otherwise radios will be displayed.") . '
'; - } - $form['allowed_values']['#description'] .= '' . t('Allowed HTML tags in labels: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '
'; - - $form['allowed_values_function'] = array( - '#type' => 'value', - '#value' => $settings['allowed_values_function'], - ); - $form['allowed_values_function_display'] = array( - '#type' => 'item', - '#title' => t('Allowed values list'), - '#markup' => t('The value of this field is being determined by the %function function and may not be changed.', array('%function' => $settings['allowed_values_function'])), - '#access' => !empty($settings['allowed_values_function']), - ); - - return $form; -} - -/** - * Element validate callback; check that the entered values are valid. - */ -function list_allowed_values_setting_validate($element, &$form_state) { - $field = $element['#field']; - $has_data = $element['#field_has_data']; - $field_type = $field['type']; - $generate_keys = ($field_type == 'list_integer' || $field_type == 'list_float') && !$has_data; - - $values = list_extract_allowed_values($element['#value'], $field['type'], $generate_keys); - - if (!is_array($values)) { - form_error($element, t('Allowed values list: invalid input.')); - } - else { - // Check that keys are valid for the field type. - foreach ($values as $key => $value) { - if ($field_type == 'list_integer' && !preg_match('/^-?\d+$/', $key)) { - form_error($element, t('Allowed values list: keys must be integers.')); - break; - } - if ($field_type == 'list_float' && !is_numeric($key)) { - form_error($element, t('Allowed values list: each key must be a valid integer or decimal.')); - break; - } - elseif ($field_type == 'list_text' && drupal_strlen($key) > 255) { - form_error($element, t('Allowed values list: each key must be a string at most 255 characters long.')); - break; - } - } - - // Prevent removing values currently in use. - if ($has_data) { - $lost_keys = array_diff(array_keys($field['settings']['allowed_values']), array_keys($values)); - if (_list_values_in_use($field, $lost_keys)) { - form_error($element, t('Allowed values list: some values are being removed while currently in use.')); - } - } - - form_set_value($element, $values, $form_state); - } -} - -/** -* Form element #value_callback: assembles the allowed values for 'boolean' fields. -*/ -function list_boolean_allowed_values_callback($element, $input, $form_state) { - $on = drupal_array_get_nested_value($form_state['input'], $element['#on_parents']); - $off = drupal_array_get_nested_value($form_state['input'], $element['#off_parents']); - return array($off, $on); -} - -/** - * Implements hook_field_update_field(). - */ -function list_field_update_field($field, $prior_field, $has_data) { - drupal_static_reset('list_allowed_values'); -} - -/** - * Returns the array of allowed values for a list field. - * - * The strings are not safe for output. Keys and values of the array should be - * sanitized through field_filter_xss() before being displayed. - * - * @param $field - * The field definition. - * @param $instance - * (optional) A field instance array. Defaults to NULL. - * @param $entity_type - * (optional) The type of entity; e.g. 'node' or 'user'. Defaults to NULL. - * @param $entity - * (optional) The entity object. Defaults to NULL. - * - * @return - * The array of allowed values. Keys of the array are the raw stored values - * (number or text), values of the array are the display labels. - */ -function list_allowed_values($field, $instance = NULL, $entity_type = NULL, $entity = NULL) { - $allowed_values = &drupal_static(__FUNCTION__, array()); - - if (!isset($allowed_values[$field['id']])) { - $function = $field['settings']['allowed_values_function']; - // If $cacheable is FALSE, then the allowed values are not statically - // cached. See list_test_dynamic_values_callback() for an example of - // generating dynamic and uncached values. - $cacheable = TRUE; - if (!empty($function) && function_exists($function)) { - $values = $function($field, $instance, $entity_type, $entity, $cacheable); - } - else { - $values = $field['settings']['allowed_values']; - } - - if ($cacheable) { - $allowed_values[$field['id']] = $values; - } - else { - return $values; - } - } - - return $allowed_values[$field['id']]; -} - -/** - * Parses a string of 'allowed values' into an array. - * - * @param $string - * The list of allowed values in string format described in - * list_allowed_values_string(). - * @param $field_type - * The field type. Either 'list_number' or 'list_text'. - * @param $generate_keys - * Boolean value indicating whether to generate keys based on the position of - * the value if a key is not manually specified, and if the value cannot be - * used as a key. This should only be TRUE for fields of type 'list_number'. - * - * @return - * The array of extracted key/value pairs, or NULL if the string is invalid. - * - * @see list_allowed_values_string() - */ -function list_extract_allowed_values($string, $field_type, $generate_keys) { - $values = array(); - - $list = explode("\n", $string); - $list = array_map('trim', $list); - $list = array_filter($list, 'strlen'); - - $generated_keys = $explicit_keys = FALSE; - foreach ($list as $position => $text) { - $value = $key = FALSE; - - // Check for an explicit key. - $matches = array(); - if (preg_match('/(.*)\|(.*)/', $text, $matches)) { - $key = $matches[1]; - $value = $matches[2]; - $explicit_keys = TRUE; - } - // Otherwise see if we can use the value as the key. Detecting true integer - // strings takes a little trick. - elseif ($field_type == 'list_text' - || ($field_type == 'list_float' && is_numeric($text)) - || ($field_type == 'list_integer' && is_numeric($text) && (float) $text == intval($text))) { - $key = $value = $text; - $explicit_keys = TRUE; - } - // Otherwise see if we can generate a key from the position. - elseif ($generate_keys) { - $key = (string) $position; - $value = $text; - $generated_keys = TRUE; - } - else { - return; - } - - // Float keys are represented as strings and need to be disambiguated - // ('.5' is '0.5'). - if ($field_type == 'list_float' && is_numeric($key)) { - $key = (string) (float) $key; - } - - $values[$key] = $value; - } - - // We generate keys only if the list contains no explicit key at all. - if ($explicit_keys && $generated_keys) { - return; - } - - return $values; -} - -/** - * Generates a string representation of an array of 'allowed values'. - * - * This string format is suitable for edition in a textarea. - * - * @param $values - * An array of values, where array keys are values and array values are - * labels. - * - * @return - * The string representation of the $values array: - * - Values are separated by a carriage return. - * - Each value is in the format "value|label" or "value". - */ -function list_allowed_values_string($values) { - $lines = array(); - foreach ($values as $key => $value) { - $lines[] = "$key|$value"; - } - return implode("\n", $lines); -} - -/** - * Implements hook_field_update_forbid(). - */ -function list_field_update_forbid($field, $prior_field, $has_data) { - if ($field['module'] == 'list' && $has_data) { - // Forbid any update that removes allowed values with actual data. - $lost_keys = array_diff(array_keys($prior_field['settings']['allowed_values']), array_keys($field['settings']['allowed_values'])); - if (_list_values_in_use($field, $lost_keys)) { - throw new FieldUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', array('@field_name' => $field['field_name']))); - } - } -} - -/** - * Checks if a list of values are being used in actual field values. - */ -function _list_values_in_use($field, $values) { - if ($values) { - $query = new EntityFieldQuery(); - $found = $query - ->fieldCondition($field['field_name'], 'value', $values) - ->range(0, 1) - ->execute(); - return !empty($found); - } - - return FALSE; -} - -/** - * Implements hook_field_validate(). - * - * Possible error codes: - * - 'list_illegal_value': The value is not part of the list of allowed values. - */ -function list_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { - $allowed_values = list_allowed_values($field, $instance, $entity_type, $entity); - foreach ($items as $delta => $item) { - if (!empty($item['value'])) { - if (!empty($allowed_values) && !isset($allowed_values[$item['value']])) { - $errors[$field['field_name']][$langcode][$delta][] = array( - 'error' => 'list_illegal_value', - 'message' => t('%name: illegal value.', array('%name' => $instance['label'])), - ); - } - } - } -} - -/** - * Implements hook_field_is_empty(). - */ -function list_field_is_empty($item, $field) { - if (empty($item['value']) && (string) $item['value'] !== '0') { - return TRUE; - } - return FALSE; -} - -/** - * Implements hook_field_widget_info_alter(). - * - * The List module does not implement widgets of its own, but reuses the - * widgets defined in options.module. - * - * @see list_options_list() - */ -function list_field_widget_info_alter(&$info) { - $widgets = array( - 'options_select' => array('list_integer', 'list_float', 'list_text'), - 'options_buttons' => array('list_integer', 'list_float', 'list_text', 'list_boolean'), - 'options_onoff' => array('list_boolean'), - ); - - foreach ($widgets as $widget => $field_types) { - $info[$widget]['field types'] = array_merge($info[$widget]['field types'], $field_types); - } -} - -/** - * Implements hook_options_list(). - */ -function list_options_list($field, $instance, $entity_type, $entity) { - return list_allowed_values($field, $instance, $entity_type, $entity); -} - -/** - * Implements hook_field_formatter_info(). - */ -function list_field_formatter_info() { - return array( - 'list_default' => array( - 'label' => t('Default'), - 'field types' => array('list_integer', 'list_float', 'list_text', 'list_boolean'), - ), - 'list_key' => array( - 'label' => t('Key'), - 'field types' => array('list_integer', 'list_float', 'list_text', 'list_boolean'), - ), - ); -} - -/** - * Implements hook_field_formatter_view(). - */ -function list_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { - $element = array(); - - switch ($display['type']) { - case 'list_default': - $allowed_values = list_allowed_values($field, $instance, $entity_type, $entity); - foreach ($items as $delta => $item) { - if (isset($allowed_values[$item['value']])) { - $output = field_filter_xss($allowed_values[$item['value']]); - } - else { - // If no match was found in allowed values, fall back to the key. - $output = field_filter_xss($item['value']); - } - $element[$delta] = array('#markup' => $output); - } - break; - - case 'list_key': - foreach ($items as $delta => $item) { - $element[$delta] = array('#markup' => field_filter_xss($item['value'])); - } - break; - } - - return $element; -} diff --git a/modules/field/modules/list/tests/list.test b/modules/field/modules/list/tests/list.test deleted file mode 100644 index 84de7e8..0000000 --- a/modules/field/modules/list/tests/list.test +++ /dev/null @@ -1,457 +0,0 @@ - 'List field', - 'description' => 'Test the List field type.', - 'group' => 'Field types', - ); - } - - function setUp() { - parent::setUp('field_test'); - - $this->field_name = 'test_list'; - $this->field = array( - 'field_name' => $this->field_name, - 'type' => 'list_integer', - 'cardinality' => 1, - 'settings' => array( - 'allowed_values' => array(1 => 'One', 2 => 'Two', 3 => 'Three'), - ), - ); - $this->field = field_create_field($this->field); - - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'widget' => array( - 'type' => 'options_buttons', - ), - ); - $this->instance = field_create_instance($this->instance); - } - - /** - * Test that allowed values can be updated. - */ - function testUpdateAllowedValues() { - $langcode = LANGUAGE_NONE; - - // All three options appear. - $entity = field_test_create_stub_entity(); - $form = drupal_get_form('field_test_entity_form', $entity); - $this->assertTrue(!empty($form[$this->field_name][$langcode][1]), 'Option 1 exists'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][2]), 'Option 2 exists'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][3]), 'Option 3 exists'); - - // Use one of the values in an actual entity, and check that this value - // cannot be removed from the list. - $entity = field_test_create_stub_entity(); - $entity->{$this->field_name}[$langcode][0] = array('value' => 1); - field_test_entity_save($entity); - $this->field['settings']['allowed_values'] = array(2 => 'Two'); - try { - field_update_field($this->field); - $this->fail(t('Cannot update a list field to not include keys with existing data.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot update a list field to not include keys with existing data.')); - } - // Empty the value, so that we can actually remove the option. - $entity->{$this->field_name}[$langcode] = array(); - field_test_entity_save($entity); - - // Removed options do not appear. - $this->field['settings']['allowed_values'] = array(2 => 'Two'); - field_update_field($this->field); - $entity = field_test_create_stub_entity(); - $form = drupal_get_form('field_test_entity_form', $entity); - $this->assertTrue(empty($form[$this->field_name][$langcode][1]), 'Option 1 does not exist'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][2]), 'Option 2 exists'); - $this->assertTrue(empty($form[$this->field_name][$langcode][3]), 'Option 3 does not exist'); - - // Completely new options appear. - $this->field['settings']['allowed_values'] = array(10 => 'Update', 20 => 'Twenty'); - field_update_field($this->field); - $form = drupal_get_form('field_test_entity_form', $entity); - $this->assertTrue(empty($form[$this->field_name][$langcode][1]), 'Option 1 does not exist'); - $this->assertTrue(empty($form[$this->field_name][$langcode][2]), 'Option 2 does not exist'); - $this->assertTrue(empty($form[$this->field_name][$langcode][3]), 'Option 3 does not exist'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][10]), 'Option 10 exists'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][20]), 'Option 20 exists'); - - // Options are reset when a new field with the same name is created. - field_delete_field($this->field_name); - unset($this->field['id']); - $this->field['settings']['allowed_values'] = array(1 => 'One', 2 => 'Two', 3 => 'Three'); - $this->field = field_create_field($this->field); - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'widget' => array( - 'type' => 'options_buttons', - ), - ); - $this->instance = field_create_instance($this->instance); - $entity = field_test_create_stub_entity(); - $form = drupal_get_form('field_test_entity_form', $entity); - $this->assertTrue(!empty($form[$this->field_name][$langcode][1]), 'Option 1 exists'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][2]), 'Option 2 exists'); - $this->assertTrue(!empty($form[$this->field_name][$langcode][3]), 'Option 3 exists'); - } -} - -/** - * Sets up a List field for testing allowed values functions. - */ -class ListDynamicValuesTestCase extends FieldTestCase { - function setUp() { - parent::setUp(array('list', 'field_test', 'list_test')); - - $this->field_name = 'test_list'; - $this->field = array( - 'field_name' => $this->field_name, - 'type' => 'list_text', - 'cardinality' => 1, - 'settings' => array( - 'allowed_values_function' => 'list_test_dynamic_values_callback', - ), - ); - $this->field = field_create_field($this->field); - - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'required' => TRUE, - 'widget' => array( - 'type' => 'options_select', - ), - ); - $this->instance = field_create_instance($this->instance); - $this->test = array( - 'id' => mt_rand(1, 10), - // Make sure this does not equal the ID so that - // list_test_dynamic_values_callback() always returns 4 values. - 'vid' => mt_rand(20, 30), - 'bundle' => 'test_bundle', - 'label' => $this->randomName(), - ); - $this->entity = call_user_func_array('field_test_create_stub_entity', $this->test); - } -} - -/** - * Tests the List field allowed values function. - */ -class ListDynamicValuesValidationTestCase extends ListDynamicValuesTestCase { - public static function getInfo() { - return array( - 'name' => 'List field dynamic values', - 'description' => 'Test the List field allowed values function.', - 'group' => 'Field types', - ); - } - - /** - * Test that allowed values function gets the entity. - */ - function testDynamicAllowedValues() { - // Verify that the test passes against every value we had. - foreach ($this->test as $key => $value) { - $this->entity->test_list[LANGUAGE_NONE][0]['value'] = $value; - try { - field_attach_validate('test_entity', $this->entity); - $this->pass("$key should pass"); - } - catch (FieldValidationException $e) { - // This will display as an exception, no need for a separate error. - throw($e); - } - } - // Now verify that the test does not pass against anything else. - foreach ($this->test as $key => $value) { - $this->entity->test_list[LANGUAGE_NONE][0]['value'] = is_numeric($value) ? (100 - $value) : ('X' . $value); - $pass = FALSE; - try { - field_attach_validate('test_entity', $this->entity); - } - catch (FieldValidationException $e) { - $pass = TRUE; - } - $this->assertTrue($pass, $key . ' should not pass'); - } - } -} - -/** - * List module UI tests. - */ -class ListFieldUITestCase extends FieldTestCase { - public static function getInfo() { - return array( - 'name' => 'List field UI', - 'description' => 'Test the List field UI functionality.', - 'group' => 'Field types', - ); - } - - function setUp() { - parent::setUp('field_test', 'field_ui'); - - // Create test user. - $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer taxonomy')); - $this->drupalLogin($admin_user); - - // Create content type, with underscores. - $type_name = 'test_' . strtolower($this->randomName()); - $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name)); - $this->type = $type->type; - // Store a valid URL name, with hyphens instead of underscores. - $this->hyphen_type = str_replace('_', '-', $this->type); - } - - /** - * List (integer) : test 'allowed values' input. - */ - function testListAllowedValuesInteger() { - $this->field_name = 'field_list_integer'; - $this->createListField('list_integer'); - - // Flat list of textual values. - $string = "Zero\nOne"; - $array = array('0' => 'Zero', '1' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are accepted.'); - // Explicit integer keys. - $string = "0|Zero\n2|Two"; - $array = array('0' => 'Zero', '2' => 'Two'); - $this->assertAllowedValuesInput($string, $array, 'Integer keys are accepted.'); - // Check that values can be added and removed. - $string = "0|Zero\n1|One"; - $array = array('0' => 'Zero', '1' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Values can be added and removed.'); - // Non-integer keys. - $this->assertAllowedValuesInput("1.1|One", 'keys must be integers', 'Non integer keys are rejected.'); - $this->assertAllowedValuesInput("abc|abc", 'keys must be integers', 'Non integer keys are rejected.'); - // Mixed list of keyed and unkeyed values. - $this->assertAllowedValuesInput("Zero\n1|One", 'invalid input', 'Mixed lists are rejected.'); - - // Create a node with actual data for the field. - $settings = array( - 'type' => $this->type, - $this->field_name => array(LANGUAGE_NONE => array(array('value' => 1))), - ); - $node = $this->drupalCreateNode($settings); - - // Check that a flat list of values is rejected once the field has data. - $this->assertAllowedValuesInput( "Zero\nOne", 'invalid input', 'Unkeyed lists are rejected once the field has data.'); - - // Check that values can be added but values in use cannot be removed. - $string = "0|Zero\n1|One\n2|Two"; - $array = array('0' => 'Zero', '1' => 'One', '2' => 'Two'); - $this->assertAllowedValuesInput($string, $array, 'Values can be added.'); - $string = "0|Zero\n1|One"; - $array = array('0' => 'Zero', '1' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.'); - $this->assertAllowedValuesInput("0|Zero", 'some values are being removed while currently in use', 'Values in use cannot be removed.'); - - // Delete the node, remove the value. - node_delete($node->nid); - $string = "0|Zero"; - $array = array('0' => 'Zero'); - $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.'); - } - - /** - * List (float) : test 'allowed values' input. - */ - function testListAllowedValuesFloat() { - $this->field_name = 'field_list_float'; - $this->createListField('list_float'); - - // Flat list of textual values. - $string = "Zero\nOne"; - $array = array('0' => 'Zero', '1' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are accepted.'); - // Explicit numeric keys. - $string = "0|Zero\n.5|Point five"; - $array = array('0' => 'Zero', '0.5' => 'Point five'); - $this->assertAllowedValuesInput($string, $array, 'Integer keys are accepted.'); - // Check that values can be added and removed. - $string = "0|Zero\n.5|Point five\n1.0|One"; - $array = array('0' => 'Zero', '0.5' => 'Point five', '1' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Values can be added and removed.'); - // Non-numeric keys. - $this->assertAllowedValuesInput("abc|abc\n", 'each key must be a valid integer or decimal', 'Non numeric keys are rejected.'); - // Mixed list of keyed and unkeyed values. - $this->assertAllowedValuesInput("Zero\n1|One\n", 'invalid input', 'Mixed lists are rejected.'); - - // Create a node with actual data for the field. - $settings = array( - 'type' => $this->type, - $this->field_name => array(LANGUAGE_NONE => array(array('value' => .5))), - ); - $node = $this->drupalCreateNode($settings); - - // Check that a flat list of values is rejected once the field has data. - $this->assertAllowedValuesInput("Zero\nOne", 'invalid input', 'Unkeyed lists are rejected once the field has data.'); - - // Check that values can be added but values in use cannot be removed. - $string = "0|Zero\n.5|Point five\n2|Two"; - $array = array('0' => 'Zero', '0.5' => 'Point five', '2' => 'Two'); - $this->assertAllowedValuesInput($string, $array, 'Values can be added.'); - $string = "0|Zero\n.5|Point five"; - $array = array('0' => 'Zero', '0.5' => 'Point five'); - $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.'); - $this->assertAllowedValuesInput("0|Zero", 'some values are being removed while currently in use', 'Values in use cannot be removed.'); - - // Delete the node, remove the value. - node_delete($node->nid); - $string = "0|Zero"; - $array = array('0' => 'Zero'); - $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.'); - } - - /** - * List (text) : test 'allowed values' input. - */ - function testListAllowedValuesText() { - $this->field_name = 'field_list_text'; - $this->createListField('list_text'); - - // Flat list of textual values. - $string = "Zero\nOne"; - $array = array('Zero' => 'Zero', 'One' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are accepted.'); - // Explicit keys. - $string = "zero|Zero\none|One"; - $array = array('zero' => 'Zero', 'one' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Explicit keys are accepted.'); - // Check that values can be added and removed. - $string = "zero|Zero\ntwo|Two"; - $array = array('zero' => 'Zero', 'two' => 'Two'); - $this->assertAllowedValuesInput($string, $array, 'Values can be added and removed.'); - // Mixed list of keyed and unkeyed values. - $string = "zero|Zero\nOne\n"; - $array = array('zero' => 'Zero', 'One' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Mixed lists are accepted.'); - // Overly long keys. - $this->assertAllowedValuesInput("zero|Zero\n" . $this->randomName(256) . "|One", 'each key must be a string at most 255 characters long', 'Overly long keys are rejected.'); - - // Create a node with actual data for the field. - $settings = array( - 'type' => $this->type, - $this->field_name => array(LANGUAGE_NONE => array(array('value' => 'One'))), - ); - $node = $this->drupalCreateNode($settings); - - // Check that flat lists of values are still accepted once the field has - // data. - $string = "Zero\nOne"; - $array = array('Zero' => 'Zero', 'One' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are still accepted once the field has data.'); - - // Check that values can be added but values in use cannot be removed. - $string = "Zero\nOne\nTwo"; - $array = array('Zero' => 'Zero', 'One' => 'One', 'Two' => 'Two'); - $this->assertAllowedValuesInput($string, $array, 'Values can be added.'); - $string = "Zero\nOne"; - $array = array('Zero' => 'Zero', 'One' => 'One'); - $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.'); - $this->assertAllowedValuesInput("Zero", 'some values are being removed while currently in use', 'Values in use cannot be removed.'); - - // Delete the node, remove the value. - node_delete($node->nid); - $string = "Zero"; - $array = array('Zero' => 'Zero'); - $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.'); - } - - /** - * List (boolen) : test 'On/Off' values input. - */ - function testListAllowedValuesBoolean() { - $this->field_name = 'field_list_boolean'; - $this->createListField('list_boolean'); - - // Check that the separate 'On' and 'Off' form fields work. - $on = $this->randomName(); - $off = $this->randomName(); - $allowed_values = array(1 => $on, 0 => $off); - $edit = array( - 'on' => $on, - 'off' => $off, - ); - $this->drupalPost($this->admin_path, $edit, t('Save settings')); - $this->assertText("Saved field_list_boolean configuration.", "The 'On' and 'Off' form fields work for boolean fields."); - // Test the allowed_values on the field settings form. - $this->drupalGet($this->admin_path); - $this->assertFieldByName('on', $on, "The 'On' value is stored correctly."); - $this->assertFieldByName('off', $off, "The 'Off' value is stored correctly."); - $field = field_info_field($this->field_name); - $this->assertEqual($field['settings']['allowed_values'], $allowed_values, 'The allowed value is correct'); - $this->assertFalse(isset($field['settings']['on']), 'The on value is not saved into settings'); - $this->assertFalse(isset($field['settings']['off']), 'The off value is not saved into settings'); - } - - /** - * Helper function to create list field of a given type. - * - * @param string $type - * 'list_integer', 'list_float', 'list_text' or 'list_boolean' - */ - protected function createListField($type) { - // Create a test field and instance. - $field = array( - 'field_name' => $this->field_name, - 'type' => $type, - ); - field_create_field($field); - $instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'node', - 'bundle' => $this->type, - ); - field_create_instance($instance); - - $this->admin_path = 'admin/structure/types/manage/' . $this->hyphen_type . '/fields/' . $this->field_name; - } - - /** - * Tests a string input for the 'allowed values' form element. - * - * @param $input_string - * The input string, in the pipe-linefeed format expected by the form - * element. - * @param $result - * Either an expected resulting array in - * $field['settings']['allowed_values'], or an expected error message. - * @param $message - * Message to display. - */ - function assertAllowedValuesInput($input_string, $result, $message) { - $edit = array('field[settings][allowed_values]' => $input_string); - $this->drupalPost($this->admin_path, $edit, t('Save settings')); - - if (is_string($result)) { - $this->assertText($result, $message); - } - else { - field_info_cache_clear(); - $field = field_info_field($this->field_name); - $this->assertIdentical($field['settings']['allowed_values'], $result, $message); - } - } -} diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info deleted file mode 100644 index 83ae747..0000000 --- a/modules/field/modules/list/tests/list_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "List test" -description = "Support module for the List module tests." -core = 7.x -package = Testing -version = VERSION -hidden = TRUE diff --git a/modules/field/modules/list/tests/list_test.module b/modules/field/modules/list/tests/list_test.module deleted file mode 100644 index aa53337..0000000 --- a/modules/field/modules/list/tests/list_test.module +++ /dev/null @@ -1,32 +0,0 @@ - array( - 0 => 'Zero', - ), - 1 => 'One', - 'Group 2' => array( - 2 => 'Some & unescaped markup', - ), - ); - - return $values; -} - -/** - * An entity-bound allowed values callback. - */ -function list_test_dynamic_values_callback($field, $instance, $entity_type, $entity, &$cacheable) { - $cacheable = FALSE; - // We need the values of the entity as keys. - return drupal_map_assoc(array_merge(array($entity->ftlabel), entity_extract_ids($entity_type, $entity))); -} diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info deleted file mode 100644 index 203d85d..0000000 --- a/modules/field/modules/number/number.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Number -description = Defines numeric field types. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -files[] = number.test diff --git a/modules/field/modules/number/number.install b/modules/field/modules/number/number.install deleted file mode 100644 index 02c7a30..0000000 --- a/modules/field/modules/number/number.install +++ /dev/null @@ -1,45 +0,0 @@ - array( - 'type' => 'int', - 'not null' => FALSE - ), - ); - break; - - case 'number_float' : - $columns = array( - 'value' => array( - 'type' => 'float', - 'not null' => FALSE - ), - ); - break; - - case 'number_decimal' : - $columns = array( - 'value' => array( - 'type' => 'numeric', - 'precision' => $field['settings']['precision'], - 'scale' => $field['settings']['scale'], - 'not null' => FALSE - ), - ); - break; - } - return array( - 'columns' => $columns, - ); -} diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module deleted file mode 100644 index 6046544..0000000 --- a/modules/field/modules/number/number.module +++ /dev/null @@ -1,419 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Number module defines various numeric field types for the Field module. Numbers can be in integer, decimal, or floating-point form, and they can be formatted when displayed. Number fields can be limited to a specific set of input values or to a range of values. See the Field module help page for more information about fields.', array('@field-help' => url('admin/help/field'))) . '
'; - return $output; - } -} - -/** - * Implements hook_field_info(). - */ -function number_field_info() { - return array( - 'number_integer' => array( - 'label' => t('Integer'), - 'description' => t('This field stores a number in the database as an integer.'), - 'instance_settings' => array('min' => '', 'max' => '', 'prefix' => '', 'suffix' => ''), - 'default_widget' => 'number', - 'default_formatter' => 'number_integer', - ), - 'number_decimal' => array( - 'label' => t('Decimal'), - 'description' => t('This field stores a number in the database in a fixed decimal format.'), - 'settings' => array('precision' => 10, 'scale' => 2, 'decimal_separator' => '.'), - 'instance_settings' => array('min' => '', 'max' => '', 'prefix' => '', 'suffix' => ''), - 'default_widget' => 'number', - 'default_formatter' => 'number_decimal', - ), - 'number_float' => array( - 'label' => t('Float'), - 'description' => t('This field stores a number in the database in a floating point format.'), - 'settings' => array('decimal_separator' => '.'), - 'instance_settings' => array('min' => '', 'max' => '', 'prefix' => '', 'suffix' => ''), - 'default_widget' => 'number', - 'default_formatter' => 'number_decimal', - ), - ); -} - -/** - * Implements hook_field_settings_form(). - */ -function number_field_settings_form($field, $instance, $has_data) { - $settings = $field['settings']; - $form = array(); - - if ($field['type'] == 'number_decimal') { - $form['precision'] = array( - '#type' => 'select', - '#title' => t('Precision'), - '#options' => drupal_map_assoc(range(10, 32)), - '#default_value' => $settings['precision'], - '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'), - '#disabled' => $has_data, - ); - $form['scale'] = array( - '#type' => 'select', - '#title' => t('Scale'), - '#options' => drupal_map_assoc(range(0, 10)), - '#default_value' => $settings['scale'], - '#description' => t('The number of digits to the right of the decimal.'), - '#disabled' => $has_data, - ); - } - if ($field['type'] == 'number_decimal' || $field['type'] == 'number_float') { - $form['decimal_separator'] = array( - '#type' => 'select', - '#title' => t('Decimal marker'), - '#options' => array('.' => t('Decimal point'), ',' => t('Comma')), - '#default_value' => $settings['decimal_separator'], - '#description' => t('The character users will input to mark the decimal point in forms.'), - ); - } - - return $form; -} - -/** - * Implements hook_field_instance_settings_form(). - */ -function number_field_instance_settings_form($field, $instance) { - $settings = $instance['settings']; - - $form['min'] = array( - '#type' => 'textfield', - '#title' => t('Minimum'), - '#default_value' => $settings['min'], - '#description' => t('The minimum value that should be allowed in this field. Leave blank for no minimum.'), - '#element_validate' => array('element_validate_number'), - ); - $form['max'] = array( - '#type' => 'textfield', - '#title' => t('Maximum'), - '#default_value' => $settings['max'], - '#description' => t('The maximum value that should be allowed in this field. Leave blank for no maximum.'), - '#element_validate' => array('element_validate_number'), - ); - $form['prefix'] = array( - '#type' => 'textfield', - '#title' => t('Prefix'), - '#default_value' => $settings['prefix'], - '#size' => 60, - '#description' => t("Define a string that should be prefixed to the value, like '$ ' or '€ '. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."), - ); - $form['suffix'] = array( - '#type' => 'textfield', - '#title' => t('Suffix'), - '#default_value' => $settings['suffix'], - '#size' => 60, - '#description' => t("Define a string that should be suffixed to the value, like ' m', ' kb/s'. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."), - ); - - return $form; -} - -/** - * Implements hook_field_validate(). - * - * Possible error codes: - * - 'number_min': The value is less than the allowed minimum value. - * - 'number_max': The value is greater than the allowed maximum value. - */ -function number_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { - foreach ($items as $delta => $item) { - if ($item['value'] != '') { - if (is_numeric($instance['settings']['min']) && $item['value'] < $instance['settings']['min']) { - $errors[$field['field_name']][$langcode][$delta][] = array( - 'error' => 'number_min', - 'message' => t('%name: the value may be no less than %min.', array('%name' => $instance['label'], '%min' => $instance['settings']['min'])), - ); - } - if (is_numeric($instance['settings']['max']) && $item['value'] > $instance['settings']['max']) { - $errors[$field['field_name']][$langcode][$delta][] = array( - 'error' => 'number_max', - 'message' => t('%name: the value may be no greater than %max.', array('%name' => $instance['label'], '%max' => $instance['settings']['max'])), - ); - } - } - } -} - -/** - * Implements hook_field_presave(). - */ -function number_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) { - if ($field['type'] == 'number_decimal') { - // Let PHP round the value to ensure consistent behavior across storage - // backends. - foreach ($items as $delta => $item) { - if (isset($item['value'])) { - $items[$delta]['value'] = round($item['value'], $field['settings']['scale']); - } - } - } -} - -/** - * Implements hook_field_is_empty(). - */ -function number_field_is_empty($item, $field) { - if (empty($item['value']) && (string) $item['value'] !== '0') { - return TRUE; - } - return FALSE; -} - -/** - * Implements hook_field_formatter_info(). - */ -function number_field_formatter_info() { - return array( - // The 'Default' formatter is different for integer fields on the one hand, - // and for decimal and float fields on the other hand, in order to be able - // to use different default values for the settings. - 'number_integer' => array( - 'label' => t('Default'), - 'field types' => array('number_integer'), - 'settings' => array( - 'thousand_separator' => ' ', - // The 'decimal_separator' and 'scale' settings are not configurable - // through the UI, and will therefore keep their default values. They - // are only present so that the 'number_integer' and 'number_decimal' - // formatters can use the same code. - 'decimal_separator' => '.', - 'scale' => 0, - 'prefix_suffix' => TRUE, - ), - ), - 'number_decimal' => array( - 'label' => t('Default'), - 'field types' => array('number_decimal', 'number_float'), - 'settings' => array( - 'thousand_separator' => ' ', - 'decimal_separator' => '.', - 'scale' => 2, - 'prefix_suffix' => TRUE, - ), - ), - 'number_unformatted' => array( - 'label' => t('Unformatted'), - 'field types' => array('number_integer', 'number_decimal', 'number_float'), - ), - ); -} - -/** - * Implements hook_field_formatter_settings_form(). - */ -function number_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) { - $display = $instance['display'][$view_mode]; - $settings = $display['settings']; - - if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') { - $options = array( - '' => t(''), - '.' => t('Decimal point'), - ',' => t('Comma'), - ' ' => t('Space'), - ); - $element['thousand_separator'] = array( - '#type' => 'select', - '#title' => t('Thousand marker'), - '#options' => $options, - '#default_value' => $settings['thousand_separator'], - ); - - if ($display['type'] == 'number_decimal') { - $element['decimal_separator'] = array( - '#type' => 'select', - '#title' => t('Decimal marker'), - '#options' => array('.' => t('Decimal point'), ',' => t('Comma')), - '#default_value' => $settings['decimal_separator'], - ); - $element['scale'] = array( - '#type' => 'select', - '#title' => t('Scale'), - '#options' => drupal_map_assoc(range(0, 10)), - '#default_value' => $settings['scale'], - '#description' => t('The number of digits to the right of the decimal.'), - ); - } - - $element['prefix_suffix'] = array( - '#type' => 'checkbox', - '#title' => t('Display prefix and suffix.'), - '#default_value' => $settings['prefix_suffix'], - ); - } - - return $element; -} - -/** - * Implements hook_field_formatter_settings_summary(). - */ -function number_field_formatter_settings_summary($field, $instance, $view_mode) { - $display = $instance['display'][$view_mode]; - $settings = $display['settings']; - - $summary = array(); - if ($display['type'] == 'number_decimal' || $display['type'] == 'number_integer') { - $summary[] = number_format(1234.1234567890, $settings['scale'], $settings['decimal_separator'], $settings['thousand_separator']); - if ($settings['prefix_suffix']) { - $summary[] = t('Display with prefix and suffix.'); - } - } - - return implode('
', $summary); -} - -/** - * Implements hook_field_formatter_view(). - */ -function number_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { - $element = array(); - $settings = $display['settings']; - - switch ($display['type']) { - case 'number_integer': - case 'number_decimal': - foreach ($items as $delta => $item) { - $output = number_format($item['value'], $settings['scale'], $settings['decimal_separator'], $settings['thousand_separator']); - if ($settings['prefix_suffix']) { - $prefixes = isset($instance['settings']['prefix']) ? array_map('field_filter_xss', explode('|', $instance['settings']['prefix'])) : array(''); - $suffixes = isset($instance['settings']['suffix']) ? array_map('field_filter_xss', explode('|', $instance['settings']['suffix'])) : array(''); - $prefix = (count($prefixes) > 1) ? format_plural($item['value'], $prefixes[0], $prefixes[1]) : $prefixes[0]; - $suffix = (count($suffixes) > 1) ? format_plural($item['value'], $suffixes[0], $suffixes[1]) : $suffixes[0]; - $output = $prefix . $output . $suffix; - } - $element[$delta] = array('#markup' => $output); - } - break; - - case 'number_unformatted': - foreach ($items as $delta => $item) { - $element[$delta] = array('#markup' => $item['value']); - } - break; - } - - return $element; -} - -/** - * Implements hook_field_widget_info(). - */ -function number_field_widget_info() { - return array( - 'number' => array( - 'label' => t('Text field'), - 'field types' => array('number_integer', 'number_decimal', 'number_float'), - ), - ); -} - -/** - * Implements hook_field_widget_form(). - */ -function number_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { - $value = isset($items[$delta]['value']) ? $items[$delta]['value'] : ''; - // Substitute the decimal separator. - if ($field['type'] == 'number_decimal' || $field['type'] == 'number_float') { - $value = strtr($value, '.', $field['settings']['decimal_separator']); - } - - $element += array( - '#type' => 'textfield', - '#default_value' => $value, - // Allow a slightly larger size that the field length to allow for some - // configurations where all characters won't fit in input field. - '#size' => $field['type'] == 'number_decimal' ? $field['settings']['precision'] + 4 : 12, - // Allow two extra characters for signed values and decimal separator. - '#maxlength' => $field['type'] == 'number_decimal' ? $field['settings']['precision'] + 2 : 10, - // Extract the number type from the field type name for easier validation. - '#number_type' => str_replace('number_', '', $field['type']), - ); - - // Add prefix and suffix. - if (!empty($instance['settings']['prefix'])) { - $prefixes = explode('|', $instance['settings']['prefix']); - $element['#field_prefix'] = field_filter_xss(array_pop($prefixes)); - } - if (!empty($instance['settings']['suffix'])) { - $suffixes = explode('|', $instance['settings']['suffix']); - $element['#field_suffix'] = field_filter_xss(array_pop($suffixes)); - } - - $element['#element_validate'][] = 'number_field_widget_validate'; - - return array('value' => $element); -} - -/** - * FAPI validation of an individual number element. - */ -function number_field_widget_validate($element, &$form_state) { - $field = field_widget_field($element, $form_state); - $instance = field_widget_instance($element, $form_state); - - $type = $element['#number_type']; - $value = $element['#value']; - - // Reject invalid characters. - if (!empty($value)) { - switch ($type) { - case 'float': - case 'decimal': - $regexp = '@([^-0-9\\' . $field['settings']['decimal_separator'] . '])|(.-)@'; - $message = t('Only numbers and the decimal separator (@separator) allowed in %field.', array('%field' => $instance['label'], '@separator' => $field['settings']['decimal_separator'])); - break; - - case 'integer': - $regexp = '@([^-0-9])|(.-)@'; - $message = t('Only numbers are allowed in %field.', array('%field' => $instance['label'])); - break; - } - if ($value != preg_replace($regexp, '', $value)) { - form_error($element, $message); - } - else { - if ($type == 'decimal' || $type == 'float') { - // Verify that only one decimal separator exists in the field. - if (substr_count($value, $field['settings']['decimal_separator']) > 1) { - $message = t('%field: There should only be one decimal separator (@separator).', - array( - '%field' => t($instance['label']), - '@separator' => $field['settings']['decimal_separator'], - ) - ); - form_error($element, $message); - } - else { - // Substitute the decimal separator; things should be fine. - $value = strtr($value, $field['settings']['decimal_separator'], '.'); - } - } - form_set_value($element, $value, $form_state); - } - } -} - -/** - * Implements hook_field_widget_error(). - */ -function number_field_widget_error($element, $error, $form, &$form_state) { - form_error($element['value'], $error['message']); -} diff --git a/modules/field/modules/number/number.test b/modules/field/modules/number/number.test deleted file mode 100644 index 88029cd..0000000 --- a/modules/field/modules/number/number.test +++ /dev/null @@ -1,155 +0,0 @@ - 'Number field', - 'description' => 'Test the creation of number fields.', - 'group' => 'Field types' - ); - } - - function setUp() { - parent::setUp('field_test'); - $this->web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content', 'administer content types')); - $this->drupalLogin($this->web_user); - } - - /** - * Test number_decimal field. - */ - function testNumberDecimalField() { - // Create a field with settings to validate. - $this->field = array( - 'field_name' => drupal_strtolower($this->randomName()), - 'type' => 'number_decimal', - 'settings' => array( - 'precision' => 8, 'scale' => 4, 'decimal_separator' => '.', - ) - ); - field_create_field($this->field); - $this->instance = array( - 'field_name' => $this->field['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'widget' => array( - 'type' => 'number', - ), - 'display' => array( - 'default' => array( - 'type' => 'number_decimal', - ), - ), - ); - field_create_instance($this->instance); - - // Display creation form. - $this->drupalGet('test-entity/add/test-bundle'); - $langcode = LANGUAGE_NONE; - $this->assertFieldByName("{$this->field['field_name']}[$langcode][0][value]", '', 'Widget is displayed'); - - // Submit a signed decimal value within the allowed precision and scale. - $value = '-1234.5678'; - $edit = array( - "{$this->field['field_name']}[$langcode][0][value]" => $value, - ); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $this->assertRaw(round($value, 2), 'Value is displayed.'); - - // Try to create entries with more than one decimal separator; assert fail. - $wrong_entries = array( - '3.14.159', - '0..45469', - '..4589', - '6.459.52', - '6.3..25', - ); - - foreach ($wrong_entries as $wrong_entry) { - $this->drupalGet('test-entity/add/test-bundle'); - $edit = array( - "{$this->field['field_name']}[$langcode][0][value]" => $wrong_entry, - ); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertText( - t('There should only be one decimal separator (@separator)', - array('@separator' => $this->field['settings']['decimal_separator'])), - 'Correctly failed to save decimal value with more than one decimal point.' - ); - } - - // Try to create entries with minus sign not in the first position. - $wrong_entries = array( - '3-3', - '4-', - '1.3-', - '1.2-4', - '-10-10', - ); - - foreach ($wrong_entries as $wrong_entry) { - $this->drupalGet('test-entity/add/test-bundle'); - $edit = array( - "{$this->field['field_name']}[$langcode][0][value]" => $wrong_entry, - ); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertText( - t('Only numbers and the decimal separator (@separator) allowed in ', - array('@separator' => $this->field['settings']['decimal_separator'])), - 'Correctly failed to save decimal value with minus sign in the wrong position.' - ); - } - } - - /** - * Test number_integer field. - */ - function testNumberIntegerField() { - // Display the "Add content type" form. - $this->drupalGet('admin/structure/types/add'); - - // Add a content type. - $name = $this->randomName(); - $type = drupal_strtolower($name); - $edit = array('name' => $name, 'type' => $type); - $this->drupalPost(NULL, $edit, t('Save and add fields')); - - // Add an integer field to the newly-created type. - $label = $this->randomName(); - $field_name = drupal_strtolower($label); - $edit = array( - 'fields[_add_new_field][label]'=> $label, - 'fields[_add_new_field][field_name]' => $field_name, - 'fields[_add_new_field][type]' => 'number_integer', - 'fields[_add_new_field][widget_type]' => 'number', - ); - $this->drupalPost(NULL, $edit, t('Save')); - - // Set the formatter to "number_integer" and to "unformatted", and just - // check that the settings summary does not generate warnings. - $this->drupalGet("admin/structure/types/manage/$type/display"); - $edit = array( - "fields[field_$field_name][type]" => 'number_integer', - ); - $this->drupalPost(NULL, $edit, t('Save')); - $edit = array( - "fields[field_$field_name][type]" => 'number_unformatted', - ); - $this->drupalPost(NULL, $edit, t('Save')); - } -} diff --git a/modules/field/modules/options/options.api.php b/modules/field/modules/options/options.api.php deleted file mode 100644 index 86f2b12..0000000 --- a/modules/field/modules/options/options.api.php +++ /dev/null @@ -1,74 +0,0 @@ - t('Zero'), - 1 => t('One'), - 2 => t('Two'), - 3 => t('Three'), - ); - - // Sample structure with groups. Only one level of nesting is allowed. This - // is only supported by the 'options_select' widget. Other widgets will - // flatten the array. - $options = array( - t('First group') => array( - 0 => t('Zero'), - ), - t('Second group') => array( - 1 => t('One'), - 2 => t('Two'), - ), - 3 => t('Three'), - ); - - // In actual implementations, the array of options will most probably depend - // on properties of the field. Example from taxonomy.module: - $options = array(); - foreach ($field['settings']['allowed_values'] as $tree) { - $terms = taxonomy_get_tree($tree['vid'], $tree['parent']); - if ($terms) { - foreach ($terms as $term) { - $options[$term->tid] = str_repeat('-', $term->depth) . $term->name; - } - } - } - - return $options; -} diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info deleted file mode 100644 index 985a74c..0000000 --- a/modules/field/modules/options/options.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Options -description = Defines selection, check box and radio button widgets for text and numeric fields. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -files[] = options.test diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module deleted file mode 100644 index 3862ba7..0000000 --- a/modules/field/modules/options/options.module +++ /dev/null @@ -1,417 +0,0 @@ -' . t('About') . ''; - $output .= '' . t('The Options module defines checkbox, selection, and other input widgets for the Field module. See the Field module help page for more information about fields.', array('@field-help' => url('admin/help/field'))) . '
'; - return $output; - } -} - -/** - * Implements hook_theme(). - */ -function options_theme() { - return array( - 'options_none' => array( - 'variables' => array('instance' => NULL, 'option' => NULL), - ), - ); -} - -/** - * Implements hook_field_widget_info(). - * - * Field type modules willing to use those widgets should: - * - Use hook_field_widget_info_alter() to append their field own types to the - * list of types supported by the widgets, - * - Implement hook_options_list() to provide the list of options. - * See list.module. - */ -function options_field_widget_info() { - return array( - 'options_select' => array( - 'label' => t('Select list'), - 'field types' => array(), - 'behaviors' => array( - 'multiple values' => FIELD_BEHAVIOR_CUSTOM, - ), - ), - 'options_buttons' => array( - 'label' => t('Check boxes/radio buttons'), - 'field types' => array(), - 'behaviors' => array( - 'multiple values' => FIELD_BEHAVIOR_CUSTOM, - ), - ), - 'options_onoff' => array( - 'label' => t('Single on/off checkbox'), - 'field types' => array(), - 'behaviors' => array( - 'multiple values' => FIELD_BEHAVIOR_CUSTOM, - ), - 'settings' => array('display_label' => 0), - ), - ); -} - -/** - * Implements hook_field_widget_form(). - */ -function options_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { - // Abstract over the actual field columns, to allow different field types to - // reuse those widgets. - $value_key = key($field['columns']); - - $type = str_replace('options_', '', $instance['widget']['type']); - $multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED; - $required = $element['#required']; - $has_value = isset($items[0][$value_key]); - $properties = _options_properties($type, $multiple, $required, $has_value); - - $entity_type = $element['#entity_type']; - $entity = $element['#entity']; - - // Prepare the list of options. - $options = _options_get_options($field, $instance, $properties, $entity_type, $entity); - - // Put current field values in shape. - $default_value = _options_storage_to_form($items, $options, $value_key, $properties); - - switch ($type) { - case 'select': - $element += array( - '#type' => 'select', - '#default_value' => $default_value, - // Do not display a 'multiple' select box if there is only one option. - '#multiple' => $multiple && count($options) > 1, - '#options' => $options, - ); - break; - - case 'buttons': - // If required and there is one single option, preselect it. - if ($required && count($options) == 1) { - reset($options); - $default_value = array(key($options)); - } - - // If this is a single-value field, take the first default value, or - // default to NULL so that the form element is properly recognized as - // not having a default value. - if (!$multiple) { - $default_value = $default_value ? reset($default_value) : NULL; - } - - $element += array( - '#type' => $multiple ? 'checkboxes' : 'radios', - // Radio buttons need a scalar value. - '#default_value' => $default_value, - '#options' => $options, - ); - break; - - case 'onoff': - $keys = array_keys($options); - $off_value = array_shift($keys); - $on_value = array_shift($keys); - $element += array( - '#type' => 'checkbox', - '#default_value' => (isset($default_value[0]) && $default_value[0] == $on_value) ? 1 : 0, - '#on_value' => $on_value, - '#off_value' => $off_value, - ); - // Override the title from the incoming $element. - $element['#title'] = isset($options[$on_value]) ? $options[$on_value] : ''; - - if ($instance['widget']['settings']['display_label']) { - $element['#title'] = $instance['label']; - } - break; - } - - $element += array( - '#value_key' => $value_key, - '#element_validate' => array('options_field_widget_validate'), - '#properties' => $properties, - ); - - return $element; -} - -/** - * Implements hook_field_widget_settings_form(). - */ -function options_field_widget_settings_form($field, $instance) { - $form = array(); - if ($instance['widget']['type'] == 'options_onoff') { - $form['display_label'] = array( - '#type' => 'checkbox', - '#title' => t('Use field label instead of the "On value" as label'), - '#default_value' => $instance['widget']['settings']['display_label'], - '#weight' => -1, - ); - } - return $form; -} - -/** - * Form element validation handler for options element. - */ -function options_field_widget_validate($element, &$form_state) { - if ($element['#required'] && $element['#value'] == '_none') { - form_error($element, t('!name field is required.', array('!name' => $element['#title']))); - } - // Transpose selections from field => delta to delta => field, turning - // multiple selected options into multiple parent elements. - $items = _options_form_to_storage($element); - form_set_value($element, $items, $form_state); -} - -/** - * Describes the preparation steps required by each widget. - */ -function _options_properties($type, $multiple, $required, $has_value) { - $base = array( - 'filter_xss' => FALSE, - 'strip_tags' => FALSE, - 'empty_option' => FALSE, - 'optgroups' => FALSE, - ); - - $properties = array(); - - switch ($type) { - case 'select': - $properties = array( - // Select boxes do not support any HTML tag. - 'strip_tags' => TRUE, - 'optgroups' => TRUE, - ); - if ($multiple) { - // Multiple select: add a 'none' option for non-required fields. - if (!$required) { - $properties['empty_option'] = 'option_none'; - } - } - else { - // Single select: add a 'none' option for non-required fields, - // and a 'select a value' option for required fields that do not come - // with a value selected. - if (!$required) { - $properties['empty_option'] = 'option_none'; - } - elseif (!$has_value) { - $properties['empty_option'] = 'option_select'; - } - } - break; - - case 'buttons': - $properties = array( - 'filter_xss' => TRUE, - ); - // Add a 'none' option for non-required radio buttons. - if (!$required && !$multiple) { - $properties['empty_option'] = 'option_none'; - } - break; - - case 'onoff': - $properties = array( - 'filter_xss' => TRUE, - ); - break; - } - - return $properties + $base; -} - -/** - * Collects the options for a field. - */ -function _options_get_options($field, $instance, $properties, $entity_type, $entity) { - // Get the list of options. - $options = (array) module_invoke($field['module'], 'options_list', $field, $instance, $entity_type, $entity); - - // Sanitize the options. - _options_prepare_options($options, $properties); - - if (!$properties['optgroups']) { - $options = options_array_flatten($options); - } - - if ($properties['empty_option']) { - $label = theme('options_none', array('instance' => $instance, 'option' => $properties['empty_option'])); - $options = array('_none' => $label) + $options; - } - - return $options; -} - -/** - * Sanitizes the options. - * - * The function is recursive to support optgroups. - */ -function _options_prepare_options(&$options, $properties) { - foreach ($options as $value => $label) { - // Recurse for optgroups. - if (is_array($label)) { - _options_prepare_options($options[$value], $properties); - } - else { - if ($properties['strip_tags']) { - $options[$value] = strip_tags($label); - } - if ($properties['filter_xss']) { - $options[$value] = field_filter_xss($label); - } - } - } -} - -/** - * Transforms stored field values into the format the widgets need. - */ -function _options_storage_to_form($items, $options, $column, $properties) { - $items_transposed = options_array_transpose($items); - $values = (isset($items_transposed[$column]) && is_array($items_transposed[$column])) ? $items_transposed[$column] : array(); - - // Discard values that are not in the current list of options. Flatten the - // array if needed. - if ($properties['optgroups']) { - $options = options_array_flatten($options); - } - $values = array_values(array_intersect($values, array_keys($options))); - return $values; -} - -/** - * Transforms submitted form values into field storage format. - */ -function _options_form_to_storage($element) { - $values = array_values((array) $element['#value']); - $properties = $element['#properties']; - - // On/off checkbox: transform '0 / 1' into the 'on / off' values. - if ($element['#type'] == 'checkbox') { - $values = array($values[0] ? $element['#on_value'] : $element['#off_value']); - } - - // Filter out the 'none' option. Use a strict comparison, because - // 0 == 'any string'. - if ($properties['empty_option']) { - $index = array_search('_none', $values, TRUE); - if ($index !== FALSE) { - unset($values[$index]); - } - } - - // Make sure we populate at least an empty value. - if (empty($values)) { - $values = array(NULL); - } - - $result = options_array_transpose(array($element['#value_key'] => $values)); - return $result; -} - -/** - * Manipulates a 2D array to reverse rows and columns. - * - * The default data storage for fields is delta first, column names second. - * This is sometimes inconvenient for field modules, so this function can be - * used to present the data in an alternate format. - * - * @param $array - * The array to be transposed. It must be at least two-dimensional, and - * the subarrays must all have the same keys or behavior is undefined. - * @return - * The transposed array. - */ -function options_array_transpose($array) { - $result = array(); - if (is_array($array)) { - foreach ($array as $key1 => $value1) { - if (is_array($value1)) { - foreach ($value1 as $key2 => $value2) { - if (!isset($result[$key2])) { - $result[$key2] = array(); - } - $result[$key2][$key1] = $value2; - } - } - } - } - return $result; -} - -/** - * Flattens an array of allowed values. - * - * @param $array - * A single or multidimensional array. - * @return - * A flattened array. - */ -function options_array_flatten($array) { - $result = array(); - if (is_array($array)) { - foreach ($array as $key => $value) { - if (is_array($value)) { - $result += options_array_flatten($value); - } - else { - $result[$key] = $value; - } - } - } - return $result; -} - -/** - * Implements hook_field_widget_error(). - */ -function options_field_widget_error($element, $error, $form, &$form_state) { - form_error($element, $error['message']); -} - -/** - * Returns HTML for the label for the empty value for options that are not required. - * - * The default theme will display N/A for a radio list and '- None -' for a select. - * - * @param $variables - * An associative array containing: - * - instance: An array representing the widget requesting the options. - * - * @ingroup themeable - */ -function theme_options_none($variables) { - $instance = $variables['instance']; - $option = $variables['option']; - - $output = ''; - switch ($instance['widget']['type']) { - case 'options_buttons': - $output = t('N/A'); - break; - - case 'options_select': - $output = ($option == 'option_none' ? t('- None -') : t('- Select a value -')); - break; - } - - return $output; -} diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info deleted file mode 100644 index 976e299..0000000 --- a/modules/field/modules/text/text.info +++ /dev/null @@ -1,8 +0,0 @@ -name = Text -description = Defines simple text field types. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -files[] = text.test -required = TRUE diff --git a/modules/field/modules/text/text.install b/modules/field/modules/text/text.install deleted file mode 100644 index 61be748..0000000 --- a/modules/field/modules/text/text.install +++ /dev/null @@ -1,95 +0,0 @@ - array( - 'type' => 'varchar', - 'length' => $field['settings']['max_length'], - 'not null' => FALSE, - ), - ); - break; - - case 'text_long': - $columns = array( - 'value' => array( - 'type' => 'text', - 'size' => 'big', - 'not null' => FALSE, - ), - ); - break; - - case 'text_with_summary': - $columns = array( - 'value' => array( - 'type' => 'text', - 'size' => 'big', - 'not null' => FALSE, - ), - 'summary' => array( - 'type' => 'text', - 'size' => 'big', - 'not null' => FALSE, - ), - ); - break; - } - $columns += array( - 'format' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - ), - ); - return array( - 'columns' => $columns, - 'indexes' => array( - 'format' => array('format'), - ), - 'foreign keys' => array( - 'format' => array( - 'table' => 'filter_format', - 'columns' => array('format' => 'format'), - ), - ), - ); -} - -/** - * Change text field 'format' columns into varchar. - */ -function text_update_7000() { - $spec = array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => FALSE, - ); - $fields = _update_7000_field_read_fields(array( - 'module' => 'text', - 'storage_type' => 'field_sql_storage', - )); - foreach ($fields as $field) { - if ($field['deleted']) { - $table = "field_deleted_data_{$field['id']}"; - $revision_table = "field_deleted_revision_{$field['id']}"; - } - else { - $table = "field_data_{$field['field_name']}"; - $revision_table = "field_revision_{$field['field_name']}"; - } - $column = $field['field_name'] . '_' . 'format'; - db_change_field($table, $column, $column, $spec); - db_change_field($revision_table, $column, $column, $spec); - } -} diff --git a/modules/field/modules/text/text.js b/modules/field/modules/text/text.js deleted file mode 100644 index f3ae894..0000000 --- a/modules/field/modules/text/text.js +++ /dev/null @@ -1,49 +0,0 @@ - -(function ($) { - -/** - * Auto-hide summary textarea if empty and show hide and unhide links. - */ -Drupal.behaviors.textSummary = { - attach: function (context, settings) { - $('.text-summary', context).once('text-summary', function () { - var $widget = $(this).closest('div.field-type-text-with-summary'); - var $summaries = $widget.find('div.text-summary-wrapper'); - - $summaries.once('text-summary-wrapper').each(function(index) { - var $summary = $(this); - var $summaryLabel = $summary.find('label'); - var $full = $widget.find('.text-full').eq(index).closest('.form-item'); - var $fullLabel = $full.find('label'); - - // Create a placeholder label when the field cardinality is - // unlimited or greater than 1. - if ($fullLabel.length == 0) { - $fullLabel = $('').prependTo($full); - } - - // Setup the edit/hide summary link. - var $link = $('(' + Drupal.t('Hide summary') + ')').toggle( - function () { - $summary.hide(); - $(this).find('a').html(Drupal.t('Edit summary')).end().appendTo($fullLabel); - return false; - }, - function () { - $summary.show(); - $(this).find('a').html(Drupal.t('Hide summary')).end().appendTo($summaryLabel); - return false; - } - ).appendTo($summaryLabel); - - // If no summary is set, hide the summary field. - if ($(this).find('.text-summary').val() == '') { - $link.click(); - } - return; - }); - }); - } -}; - -})(jQuery); diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module deleted file mode 100644 index d73814f..0000000 --- a/modules/field/modules/text/text.module +++ /dev/null @@ -1,611 +0,0 @@ -' . t('About') . ''; - $output .= '' . t("The Text module defines various text field types for the Field module. A text field may contain plain text only, or optionally, may use Drupal's text filters to securely manage HTML output. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, the field can be validated, so that it is limited to a set of allowed values. See the Field module help page for more information about fields.", array('@field-help' => url('admin/help/field'), '@filter-help' => url('admin/help/filter'))) . '
'; - return $output; - } -} - -/** - * Implements hook_field_info(). - * - * Field settings: - * - max_length: the maximum length for a varchar field. - * Instance settings: - * - text_processing: whether text input filters should be used. - * - display_summary: whether the summary field should be displayed. - * When empty and not displayed the summary will take its value from the - * trimmed value of the main text field. - */ -function text_field_info() { - return array( - 'text' => array( - 'label' => t('Text'), - 'description' => t('This field stores varchar text in the database.'), - 'settings' => array('max_length' => 255), - 'instance_settings' => array('text_processing' => 0), - 'default_widget' => 'text_textfield', - 'default_formatter' => 'text_default', - ), - 'text_long' => array( - 'label' => t('Long text'), - 'description' => t('This field stores long text in the database.'), - 'instance_settings' => array('text_processing' => 0), - 'default_widget' => 'text_textarea', - 'default_formatter' => 'text_default', - ), - 'text_with_summary' => array( - 'label' => t('Long text and summary'), - 'description' => t('This field stores long text in the database along with optional summary text.'), - 'instance_settings' => array('text_processing' => 1, 'display_summary' => 0), - 'default_widget' => 'text_textarea_with_summary', - 'default_formatter' => 'text_default', - ), - ); -} - -/** - * Implements hook_field_settings_form(). - */ -function text_field_settings_form($field, $instance, $has_data) { - $settings = $field['settings']; - - $form = array(); - - if ($field['type'] == 'text') { - $form['max_length'] = array( - '#type' => 'textfield', - '#title' => t('Maximum length'), - '#default_value' => $settings['max_length'], - '#required' => TRUE, - '#description' => t('The maximum length of the field in characters.'), - '#element_validate' => array('element_validate_integer_positive'), - // @todo: If $has_data, add a validate handler that only allows - // max_length to increase. - '#disabled' => $has_data, - ); - } - - return $form; -} - -/** - * Implements hook_field_instance_settings_form(). - */ -function text_field_instance_settings_form($field, $instance) { - $settings = $instance['settings']; - - $form['text_processing'] = array( - '#type' => 'radios', - '#title' => t('Text processing'), - '#default_value' => $settings['text_processing'], - '#options' => array( - t('Plain text'), - t('Filtered text (user selects text format)'), - ), - ); - if ($field['type'] == 'text_with_summary') { - $form['display_summary'] = array( - '#type' => 'checkbox', - '#title' => t('Summary input'), - '#default_value' => $settings['display_summary'], - '#description' => t('This allows authors to input an explicit summary, to be displayed instead of the automatically trimmed text when using the "Summary or trimmed" display type.'), - ); - } - - return $form; -} - -/** - * Implements hook_field_validate(). - * - * Possible error codes: - * - 'text_value_max_length': The value exceeds the maximum length. - * - 'text_summary_max_length': The summary exceeds the maximum length. - */ -function text_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { - foreach ($items as $delta => $item) { - // @todo Length is counted separately for summary and value, so the maximum - // length can be exceeded very easily. - foreach (array('value', 'summary') as $column) { - if (!empty($item[$column])) { - if (!empty($field['settings']['max_length']) && drupal_strlen($item[$column]) > $field['settings']['max_length']) { - switch ($column) { - case 'value': - $message = t('%name: the text may not be longer than %max characters.', array('%name' => $instance['label'], '%max' => $field['settings']['max_length'])); - break; - - case 'summary': - $message = t('%name: the summary may not be longer than %max characters.', array('%name' => $instance['label'], '%max' => $field['settings']['max_length'])); - break; - } - $errors[$field['field_name']][$langcode][$delta][] = array( - 'error' => "text_{$column}_length", - 'message' => $message, - ); - } - } - } - } -} - -/** - * Implements hook_field_load(). - * - * Where possible, generate the sanitized version of each field early so that - * it is cached in the field cache. This avoids looking up from the filter cache - * separately. - * - * @see text_field_formatter_view() - */ -function text_field_load($entity_type, $entities, $field, $instances, $langcode, &$items) { - foreach ($entities as $id => $entity) { - foreach ($items[$id] as $delta => $item) { - // Only process items with a cacheable format, the rest will be handled - // by formatters if needed. - if (empty($instances[$id]['settings']['text_processing']) || filter_format_allowcache($item['format'])) { - $items[$id][$delta]['safe_value'] = isset($item['value']) ? _text_sanitize($instances[$id], $langcode, $item, 'value') : ''; - if ($field['type'] == 'text_with_summary') { - $items[$id][$delta]['safe_summary'] = isset($item['summary']) ? _text_sanitize($instances[$id], $langcode, $item, 'summary') : ''; - } - } - } - } -} - -/** - * Implements hook_field_is_empty(). - */ -function text_field_is_empty($item, $field) { - if (!isset($item['value']) || $item['value'] === '') { - return !isset($item['summary']) || $item['summary'] === ''; - } - return FALSE; -} - -/** - * Implements hook_field_formatter_info(). - */ -function text_field_formatter_info() { - return array( - 'text_default' => array( - 'label' => t('Default'), - 'field types' => array('text', 'text_long', 'text_with_summary'), - ), - 'text_plain' => array( - 'label' => t('Plain text'), - 'field types' => array('text', 'text_long', 'text_with_summary'), - ), - - // The text_trimmed formatter displays the trimmed version of the - // full element of the field. It is intended to be used with text - // and text_long fields. It also works with text_with_summary - // fields though the text_summary_or_trimmed formatter makes more - // sense for that field type. - 'text_trimmed' => array( - 'label' => t('Trimmed'), - 'field types' => array('text', 'text_long', 'text_with_summary'), - 'settings' => array('trim_length' => 600), - ), - - // The 'summary or trimmed' field formatter for text_with_summary - // fields displays returns the summary element of the field or, if - // the summary is empty, the trimmed version of the full element - // of the field. - 'text_summary_or_trimmed' => array( - 'label' => t('Summary or trimmed'), - 'field types' => array('text_with_summary'), - 'settings' => array('trim_length' => 600), - ), - ); -} - -/** - * Implements hook_field_formatter_settings_form(). - */ -function text_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) { - $display = $instance['display'][$view_mode]; - $settings = $display['settings']; - - $element = array(); - - if (strpos($display['type'], '_trimmed') !== FALSE) { - $element['trim_length'] = array( - '#title' => t('Trim length'), - '#type' => 'textfield', - '#size' => 10, - '#default_value' => $settings['trim_length'], - '#element_validate' => array('element_validate_integer_positive'), - '#required' => TRUE, - ); - } - - return $element; -} - -/** - * Implements hook_field_formatter_settings_summary(). - */ -function text_field_formatter_settings_summary($field, $instance, $view_mode) { - $display = $instance['display'][$view_mode]; - $settings = $display['settings']; - - $summary = ''; - - if (strpos($display['type'], '_trimmed') !== FALSE) { - $summary = t('Trim length') . ': ' . $settings['trim_length']; - } - - return $summary; -} - -/** - * Implements hook_field_formatter_view(). - */ -function text_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { - $element = array(); - - switch ($display['type']) { - case 'text_default': - case 'text_trimmed': - foreach ($items as $delta => $item) { - $output = _text_sanitize($instance, $langcode, $item, 'value'); - if ($display['type'] == 'text_trimmed') { - $output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL, $display['settings']['trim_length']); - } - $element[$delta] = array('#markup' => $output); - } - break; - - case 'text_summary_or_trimmed': - foreach ($items as $delta => $item) { - if (!empty($item['summary'])) { - $output = _text_sanitize($instance, $langcode, $item, 'summary'); - } - else { - $output = _text_sanitize($instance, $langcode, $item, 'value'); - $output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL, $display['settings']['trim_length']); - } - $element[$delta] = array('#markup' => $output); - } - break; - - case 'text_plain': - foreach ($items as $delta => $item) { - $element[$delta] = array('#markup' => strip_tags($item['value'])); - } - break; - } - - return $element; -} - -/** - * Sanitizes the 'value' or 'summary' data of a text value. - * - * Depending on whether the field instance uses text processing, data is run - * through check_plain() or check_markup(). - * - * @param $instance - * The instance definition. - * @param $langcode - * The language associated to $item. - * @param $item - * The field value to sanitize. - * @param $column - * The column to sanitize (either 'value' or 'summary'). - * - * @return - * The sanitized string. - */ -function _text_sanitize($instance, $langcode, $item, $column) { - // If the value uses a cacheable text format, text_field_load() precomputes - // the sanitized string. - if (isset($item["safe_$column"])) { - return $item["safe_$column"]; - } - return $instance['settings']['text_processing'] ? check_markup($item[$column], $item['format'], $langcode) : check_plain($item[$column]); -} - -/** - * Generate a trimmed, formatted version of a text field value. - * - * If the end of the summary is not indicated using the delimiter - * then we generate the summary automatically, trying to end it at a sensible - * place such as the end of a paragraph, a line break, or the end of a - * sentence (in that order of preference). - * - * @param $text - * The content for which a summary will be generated. - * @param $format - * The format of the content. - * If the PHP filter is present and $text contains PHP code, we do not - * split it up to prevent parse errors. - * If the line break filter is present then we treat newlines embedded in - * $text as line breaks. - * If the htmlcorrector filter is present, it will be run on the generated - * summary (if different from the incoming $text). - * @param $size - * The desired character length of the summary. If omitted, the default - * value will be used. Ignored if the special delimiter is present - * in $text. - * @return - * The generated summary. - */ -function text_summary($text, $format = NULL, $size = NULL) { - - if (!isset($size)) { - // What used to be called 'teaser' is now called 'summary', but - // the variable 'teaser_length' is preserved for backwards compatibility. - $size = variable_get('teaser_length', 600); - } - - // Find where the delimiter is in the body - $delimiter = strpos($text, ''); - - // If the size is zero, and there is no delimiter, the entire body is the summary. - if ($size == 0 && $delimiter === FALSE) { - return $text; - } - - // If a valid delimiter has been specified, use it to chop off the summary. - if ($delimiter !== FALSE) { - return substr($text, 0, $delimiter); - } - - // We check for the presence of the PHP evaluator filter in the current - // format. If the body contains PHP code, we do not split it up to prevent - // parse errors. - if (isset($format)) { - $filters = filter_list_format($format); - if (isset($filters['php_code']) && $filters['php_code']->status && strpos($text, '' => 0); - - // If no complete paragraph then treat line breaks as paragraphs. - $line_breaks = array('
' => 6, '
' => 4); - // Newline only indicates a line break if line break converter - // filter is present. - if (isset($filters['filter_autop'])) { - $line_breaks["\n"] = 1; - } - $break_points[] = $line_breaks; - - // If the first paragraph is too long, split at the end of a sentence. - $break_points[] = array('. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1); - - // Iterate over the groups of break points until a break point is found. - foreach ($break_points as $points) { - // Look for each break point, starting at the end of the summary. - foreach ($points as $point => $offset) { - // The summary is already reversed, but the break point isn't. - $rpos = strpos($reversed, strrev($point)); - if ($rpos !== FALSE) { - $min_rpos = min($rpos + $offset, $min_rpos); - } - } - - // If a break point was found in this group, slice and stop searching. - if ($min_rpos !== $max_rpos) { - // Don't slice with length 0. Length must be <0 to slice from RHS. - $summary = ($min_rpos === 0) ? $summary : substr($summary, 0, 0 - $min_rpos); - break; - } - } - - // If the htmlcorrector filter is present, apply it to the generated summary. - if (isset($filters['filter_htmlcorrector'])) { - $summary = _filter_htmlcorrector($summary); - } - - return $summary; -} - -/** - * Implements hook_field_widget_info(). - */ -function text_field_widget_info() { - return array( - 'text_textfield' => array( - 'label' => t('Text field'), - 'field types' => array('text'), - 'settings' => array('size' => 60), - ), - 'text_textarea' => array( - 'label' => t('Text area (multiple rows)'), - 'field types' => array('text_long'), - 'settings' => array('rows' => 5), - ), - 'text_textarea_with_summary' => array( - 'label' => t('Text area with a summary'), - 'field types' => array('text_with_summary'), - 'settings' => array('rows' => 20, 'summary_rows' => 5), - ), - ); -} - -/** - * Implements hook_field_widget_settings_form(). - */ -function text_field_widget_settings_form($field, $instance) { - $widget = $instance['widget']; - $settings = $widget['settings']; - - if ($widget['type'] == 'text_textfield') { - $form['size'] = array( - '#type' => 'textfield', - '#title' => t('Size of textfield'), - '#default_value' => $settings['size'], - '#required' => TRUE, - '#element_validate' => array('element_validate_integer_positive'), - ); - } - else { - $form['rows'] = array( - '#type' => 'textfield', - '#title' => t('Rows'), - '#default_value' => $settings['rows'], - '#required' => TRUE, - '#element_validate' => array('element_validate_integer_positive'), - ); - } - - return $form; -} - -/** - * Implements hook_field_widget_form(). - */ -function text_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { - $summary_widget = array(); - $main_widget = array(); - - switch ($instance['widget']['type']) { - case 'text_textfield': - $main_widget = $element + array( - '#type' => 'textfield', - '#default_value' => isset($items[$delta]['value']) ? $items[$delta]['value'] : NULL, - '#size' => $instance['widget']['settings']['size'], - '#maxlength' => $field['settings']['max_length'], - '#attributes' => array('class' => array('text-full')), - ); - break; - - case 'text_textarea_with_summary': - $display = !empty($items[$delta]['summary']) || !empty($instance['settings']['display_summary']); - $summary_widget = array( - '#type' => $display ? 'textarea' : 'value', - '#default_value' => isset($items[$delta]['summary']) ? $items[$delta]['summary'] : NULL, - '#title' => t('Summary'), - '#rows' => $instance['widget']['settings']['summary_rows'], - '#description' => t('Leave blank to use trimmed value of full text as the summary.'), - '#attached' => array( - 'js' => array(drupal_get_path('module', 'text') . '/text.js'), - ), - '#attributes' => array('class' => array('text-summary')), - '#prefix' => '', - '#suffix' => '', - '#weight' => -10, - ); - // Fall through to the next case. - - case 'text_textarea': - $main_widget = $element + array( - '#type' => 'textarea', - '#default_value' => isset($items[$delta]['value']) ? $items[$delta]['value'] : NULL, - '#rows' => $instance['widget']['settings']['rows'], - '#attributes' => array('class' => array('text-full')), - ); - break; - } - - if ($main_widget) { - // Conditionally alter the form element's type if text processing is enabled. - if ($instance['settings']['text_processing']) { - $element = $main_widget; - $element['#type'] = 'text_format'; - $element['#format'] = isset($items[$delta]['format']) ? $items[$delta]['format'] : NULL; - $element['#base_type'] = $main_widget['#type']; - } - else { - $element['value'] = $main_widget; - } - } - if ($summary_widget) { - $element['summary'] = $summary_widget; - } - - return $element; -} - -/** - * Implements hook_field_widget_error(). - */ -function text_field_widget_error($element, $error, $form, &$form_state) { - switch ($error['error']) { - case 'text_summary_max_length': - $error_element = $element[$element['#columns'][1]]; - break; - - default: - $error_element = $element[$element['#columns'][0]]; - break; - } - - form_error($error_element, $error['message']); -} - -/** - * Implements hook_field_prepare_translation(). - */ -function text_field_prepare_translation($entity_type, $entity, $field, $instance, $langcode, &$items, $source_entity, $source_langcode) { - // If the translating user is not permitted to use the assigned text format, - // we must not expose the source values. - $field_name = $field['field_name']; - if (!empty($source_entity->{$field_name}[$source_langcode])) { - $formats = filter_formats(); - foreach ($source_entity->{$field_name}[$source_langcode] as $delta => $item) { - $format_id = $item['format']; - if (!empty($format_id) && !filter_access($formats[$format_id])) { - unset($items[$delta]); - } - } - } -} - -/** - * Implements hook_filter_format_update(). - */ -function text_filter_format_update($format) { - field_cache_clear(); -} - -/** - * Implements hook_filter_format_disable(). - */ -function text_filter_format_disable($format) { - field_cache_clear(); -} diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test deleted file mode 100644 index 2f14738..0000000 --- a/modules/field/modules/text/text.test +++ /dev/null @@ -1,517 +0,0 @@ - 'Text field', - 'description' => "Test the creation of text fields.", - 'group' => 'Field types' - ); - } - - function setUp() { - parent::setUp('field_test'); - - $this->admin_user = $this->drupalCreateUser(array('administer filters')); - $this->web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content')); - $this->drupalLogin($this->web_user); - } - - // Test fields. - - /** - * Test text field validation. - */ - function testTextFieldValidation() { - // Create a field with settings to validate. - $max_length = 3; - $this->field = array( - 'field_name' => drupal_strtolower($this->randomName()), - 'type' => 'text', - 'settings' => array( - 'max_length' => $max_length, - ) - ); - field_create_field($this->field); - $this->instance = array( - 'field_name' => $this->field['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'widget' => array( - 'type' => 'text_textfield', - ), - 'display' => array( - 'default' => array( - 'type' => 'text_default', - ), - ), - ); - field_create_instance($this->instance); - // Test valid and invalid values with field_attach_validate(). - $entity = field_test_create_stub_entity(); - $langcode = LANGUAGE_NONE; - for ($i = 0; $i <= $max_length + 2; $i++) { - $entity->{$this->field['field_name']}[$langcode][0]['value'] = str_repeat('x', $i); - try { - field_attach_validate('test_entity', $entity); - $this->assertTrue($i <= $max_length, "Length $i does not cause validation error when max_length is $max_length"); - } - catch (FieldValidationException $e) { - $this->assertTrue($i > $max_length, "Length $i causes validation error when max_length is $max_length"); - } - } - } - - /** - * Test widgets. - */ - function testTextfieldWidgets() { - $this->_testTextfieldWidgets('text', 'text_textfield'); - $this->_testTextfieldWidgets('text_long', 'text_textarea'); - } - - /** - * Helper function for testTextfieldWidgets(). - */ - function _testTextfieldWidgets($field_type, $widget_type) { - // Setup a field and instance - $entity_type = 'test_entity'; - $this->field_name = drupal_strtolower($this->randomName()); - $this->field = array('field_name' => $this->field_name, 'type' => $field_type); - field_create_field($this->field); - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'label' => $this->randomName() . '_label', - 'settings' => array( - 'text_processing' => TRUE, - ), - 'widget' => array( - 'type' => $widget_type, - ), - 'display' => array( - 'full' => array( - 'type' => 'text_default', - ), - ), - ); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Display creation form. - $this->drupalGet('test-entity/add/test-bundle'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget is displayed'); - $this->assertNoFieldByName("{$this->field_name}[$langcode][0][format]", '1', 'Format selector is not displayed'); - - // Submit with some value. - $value = $this->randomName(); - $edit = array( - "{$this->field_name}[$langcode][0][value]" => $value, - ); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - - // Display the entity. - $entity = field_test_entity_test_load($id); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $this->content = drupal_render($entity->content); - $this->assertText($value, 'Filtered tags are not displayed'); - } - - /** - * Test widgets + 'formatted_text' setting. - */ - function testTextfieldWidgetsFormatted() { - $this->_testTextfieldWidgetsFormatted('text', 'text_textfield'); - $this->_testTextfieldWidgetsFormatted('text_long', 'text_textarea'); - } - - /** - * Helper function for testTextfieldWidgetsFormatted(). - */ - function _testTextfieldWidgetsFormatted($field_type, $widget_type) { - // Setup a field and instance - $entity_type = 'test_entity'; - $this->field_name = drupal_strtolower($this->randomName()); - $this->field = array('field_name' => $this->field_name, 'type' => $field_type); - field_create_field($this->field); - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'label' => $this->randomName() . '_label', - 'settings' => array( - 'text_processing' => TRUE, - ), - 'widget' => array( - 'type' => $widget_type, - ), - 'display' => array( - 'full' => array( - 'type' => 'text_default', - ), - ), - ); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Disable all text formats besides the plain text fallback format. - $this->drupalLogin($this->admin_user); - foreach (filter_formats() as $format) { - if ($format->format != filter_fallback_format()) { - $this->drupalPost('admin/config/content/formats/' . $format->format . '/disable', array(), t('Disable')); - } - } - $this->drupalLogin($this->web_user); - - // Display the creation form. Since the user only has access to one format, - // no format selector will be displayed. - $this->drupalGet('test-entity/add/test-bundle'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget is displayed'); - $this->assertNoFieldByName("{$this->field_name}[$langcode][0][format]", '', 'Format selector is not displayed'); - - // Submit with data that should be filtered. - $value = '' . $this->randomName() . ''; - $edit = array( - "{$this->field_name}[$langcode][0][value]" => $value, - ); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - - // Display the entity. - $entity = field_test_entity_test_load($id); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $this->content = drupal_render($entity->content); - $this->assertNoRaw($value, 'HTML tags are not displayed.'); - $this->assertRaw(check_plain($value), 'Escaped HTML is displayed correctly.'); - - // Create a new text format that does not escape HTML, and grant the user - // access to it. - $this->drupalLogin($this->admin_user); - $edit = array( - 'format' => drupal_strtolower($this->randomName()), - 'name' => $this->randomName(), - ); - $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration')); - filter_formats_reset(); - $this->checkPermissions(array(), TRUE); - $format = filter_format_load($edit['format']); - $format_id = $format->format; - $permission = filter_permission_name($format); - $rid = max(array_keys($this->web_user->roles)); - user_role_grant_permissions($rid, array($permission)); - $this->drupalLogin($this->web_user); - - // Display edition form. - // We should now have a 'text format' selector. - $this->drupalGet('test-entity/manage/' . $id . '/edit'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", NULL, 'Widget is displayed'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][format]", NULL, 'Format selector is displayed'); - - // Edit and change the text format to the new one that was created. - $edit = array( - "{$this->field_name}[$langcode][0][format]" => $format_id, - ); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), 'Entity was updated'); - - // Display the entity. - $entity = field_test_entity_test_load($id); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $this->content = drupal_render($entity->content); - $this->assertRaw($value, 'Value is displayed unfiltered'); - } -} - -class TextSummaryTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Text summary', - 'description' => 'Test text_summary() with different strings and lengths.', - 'group' => 'Field types', - ); - } - - function setUp() { - parent::setUp(); - $this->article_creator = $this->drupalCreateUser(array('create article content', 'edit own article content')); - } - - /** - * Tests an edge case where the first sentence is a question and - * subsequent sentences are not. This edge case is documented at - * http://drupal.org/node/180425. - */ - function testFirstSentenceQuestion() { - $text = 'A question? A sentence. Another sentence.'; - $expected = 'A question? A sentence.'; - $this->callTextSummary($text, $expected, NULL, 30); - } - - /** - * Test summary with long example. - */ - function testLongSentence() { - $text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' . // 125 - 'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ' . // 108 - 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. ' . // 103 - 'Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'; // 110 - $expected = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' . - 'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ' . - 'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.'; - // First three sentences add up to: 336, so add one for space and then 3 to get half-way into next word. - $this->callTextSummary($text, $expected, NULL, 340); - } - - /** - * Test various summary length edge cases. - */ - function testLength() { - // This string tests a number of edge cases. - $text = "\nHi\n
\n\nfolks\n
"; - - // The summaries we expect text_summary() to return when $size is the index - // of each array item. - // Using no text format: - $expected = array( - "
\n!\n\nHi\n
\n\nfolks\n
", - "<", - "
\n!\n\n", - "
\nH", - "
\nHi", - "
\nHi\n", - "
\nHi\n<", - "
\nHi\n\nHi\n
\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
\n\nfolks\n
", - "
\n!\n\nHi\n
\n\nfolks\n
", - "
\n!\n\nHi\n
\n\nfolks\n
", - ); - - // And using a text format WITH the line-break and htmlcorrector filters. - $expected_lb = array( - "
\n!\n\nHi\n
\n\nfolks\n
", - "", - "", - "", - "", - "", - "", - "
\n!\n\nHi
", - "\nHi
", - "\nHi
", - "\nHi
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
", - "\nHi\n
\n\nfolks\n
", - "
\n!\n\nHi\n
\n\nfolks\n
", - "
\n!\n\nHi\n
\n\nfolks\n
", - ); - - // Test text_summary() for different sizes. - for ($i = 0; $i <= 37; $i++) { - $this->callTextSummary($text, $expected[$i], NULL, $i); - $this->callTextSummary($text, $expected_lb[$i], 'plain_text', $i); - $this->callTextSummary($text, $expected_lb[$i], 'filtered_html', $i); - } - } - - /** - * Calls text_summary() and asserts that the expected teaser is returned. - */ - function callTextSummary($text, $expected, $format = NULL, $size = NULL) { - $summary = text_summary($text, $format, $size); - $this->assertIdentical($summary, $expected, format_string('Generated summary "@summary" matches expected "@expected".', array('@summary' => $summary, '@expected' => $expected))); - } - - /** - * Test sending only summary. - */ - function testOnlyTextSummary() { - // Login as article creator. - $this->drupalLogin($this->article_creator); - // Create article with summary but empty body. - $summary = $this->randomName(); - $edit = array( - "title" => $this->randomName(), - "body[und][0][summary]" => $summary, - ); - $this->drupalPost('node/add/article', $edit, t('Save')); - $node = $this->drupalGetNodeByTitle($edit['title']); - - $this->assertIdentical($node->body['und'][0]['summary'], $summary, 'Article with with summary and no body has been submitted.'); - } -} - -class TextTranslationTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Text translation', - 'description' => 'Check if the text field is correctly prepared for translation.', - 'group' => 'Field types', - ); - } - - function setUp() { - parent::setUp('locale', 'translation'); - - $full_html_format = filter_format_load('full_html'); - $this->format = $full_html_format->format; - $this->admin = $this->drupalCreateUser(array( - 'administer languages', - 'administer content types', - 'access administration pages', - 'bypass node access', - filter_permission_name($full_html_format), - )); - $this->translator = $this->drupalCreateUser(array('create article content', 'edit own article content', 'translate content')); - - // Enable an additional language. - $this->drupalLogin($this->admin); - $edit = array('langcode' => 'fr'); - $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language')); - - // Set "Article" content type to use multilingual support with translation. - $edit = array('language_content_type' => 2); - $this->drupalPost('admin/structure/types/manage/article', $edit, t('Save content type')); - $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Article')), 'Article content type has been updated.'); - } - - /** - * Test that a plaintext textfield widget is correctly populated. - */ - function testTextField() { - // Disable text processing for body. - $edit = array('instance[settings][text_processing]' => 0); - $this->drupalPost('admin/structure/types/manage/article/fields/body', $edit, t('Save settings')); - - // Login as translator. - $this->drupalLogin($this->translator); - - // Create content. - $langcode = LANGUAGE_NONE; - $body = $this->randomName(); - $edit = array( - "title" => $this->randomName(), - "language" => 'en', - "body[$langcode][0][value]" => $body, - ); - - // Translate the article in french. - $this->drupalPost('node/add/article', $edit, t('Save')); - $node = $this->drupalGetNodeByTitle($edit['title']); - $this->drupalGet("node/$node->nid/translate"); - $this->clickLink(t('add translation')); - $this->assertFieldByXPath("//textarea[@name='body[$langcode][0][value]']", $body, 'The textfield widget is populated.'); - } - - /** - * Check that user that does not have access the field format cannot see the - * source value when creating a translation. - */ - function testTextFieldFormatted() { - // Make node body multiple. - $edit = array('field[cardinality]' => -1); - $this->drupalPost('admin/structure/types/manage/article/fields/body', $edit, t('Save settings')); - $this->drupalGet('node/add/article'); - $this->assertFieldByXPath("//input[@name='body_add_more']", t('Add another item'), 'Body field cardinality set to multiple.'); - - $body = array( - $this->randomName(), - $this->randomName(), - ); - - // Create an article with the first body input format set to "Full HTML". - $title = $this->randomName(); - $edit = array( - 'title' => $title, - 'language' => 'en', - ); - $this->drupalPost('node/add/article', $edit, t('Save')); - - // Populate the body field: the first item gets the "Full HTML" input - // format, the second one "Filtered HTML". - $formats = array('full_html', 'filtered_html'); - $langcode = LANGUAGE_NONE; - foreach ($body as $delta => $value) { - $edit = array( - "body[$langcode][$delta][value]" => $value, - "body[$langcode][$delta][format]" => array_shift($formats), - ); - $this->drupalPost('node/1/edit', $edit, t('Save')); - $this->assertText($body[$delta], format_string('The body field with delta @delta has been saved.', array('@delta' => $delta))); - } - - // Login as translator. - $this->drupalLogin($this->translator); - - // Translate the article in french. - $node = $this->drupalGetNodeByTitle($title); - $this->drupalGet("node/$node->nid/translate"); - $this->clickLink(t('add translation')); - $this->assertNoText($body[0], format_string('The body field with delta @delta is hidden.', array('@delta' => 0))); - $this->assertText($body[1], format_string('The body field with delta @delta is shown.', array('@delta' => 1))); - } -} diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test deleted file mode 100644 index 1e59315..0000000 --- a/modules/field/tests/field.test +++ /dev/null @@ -1,3709 +0,0 @@ -default_storage); - } - - /** - * Generate random values for a field_test field. - * - * @param $cardinality - * Number of values to generate. - * @return - * An array of random values, in the format expected for field values. - */ - function _generateTestFieldValues($cardinality) { - $values = array(); - for ($i = 0; $i < $cardinality; $i++) { - // field_test fields treat 0 as 'empty value'. - $values[$i]['value'] = mt_rand(1, 127); - } - return $values; - } - - /** - * Assert that a field has the expected values in an entity. - * - * This function only checks a single column in the field values. - * - * @param $entity - * The entity to test. - * @param $field_name - * The name of the field to test - * @param $langcode - * The language code for the values. - * @param $expected_values - * The array of expected values. - * @param $column - * (Optional) the name of the column to check. - */ - function assertFieldValues($entity, $field_name, $langcode, $expected_values, $column = 'value') { - $e = clone $entity; - field_attach_load('test_entity', array($e->ftid => $e)); - $values = isset($e->{$field_name}[$langcode]) ? $e->{$field_name}[$langcode] : array(); - $this->assertEqual(count($values), count($expected_values), 'Expected number of values were saved.'); - foreach ($expected_values as $key => $value) { - $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', array('@value' => $value))); - } - } -} - -class FieldAttachTestCase extends FieldTestCase { - function setUp() { - // Since this is a base class for many test cases, support the same - // flexibility that DrupalWebTestCase::setUp() has for the modules to be - // passed in as either an array or a variable number of string arguments. - $modules = func_get_args(); - if (isset($modules[0]) && is_array($modules[0])) { - $modules = $modules[0]; - } - if (!in_array('field_test', $modules)) { - $modules[] = 'field_test'; - } - parent::setUp($modules); - - $this->createFieldWithInstance(); - } - - /** - * Create a field and an instance of it. - * - * @param string $suffix - * (optional) A string that should only contain characters that are valid in - * PHP variable names as well. - */ - function createFieldWithInstance($suffix = '') { - $field_name = 'field_name' . $suffix; - $field = 'field' . $suffix; - $field_id = 'field_id' . $suffix; - $instance = 'instance' . $suffix; - - $this->$field_name = drupal_strtolower($this->randomName() . '_field_name' . $suffix); - $this->$field = array('field_name' => $this->$field_name, 'type' => 'test_field', 'cardinality' => 4); - $this->$field = field_create_field($this->$field); - $this->$field_id = $this->{$field}['id']; - $this->$instance = array( - 'field_name' => $this->$field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'label' => $this->randomName() . '_label', - 'description' => $this->randomName() . '_description', - 'weight' => mt_rand(0, 127), - 'settings' => array( - 'test_instance_setting' => $this->randomName(), - ), - 'widget' => array( - 'type' => 'test_field_widget', - 'label' => 'Test Field', - 'settings' => array( - 'test_widget_setting' => $this->randomName(), - ) - ) - ); - field_create_instance($this->$instance); - } -} - -/** - * Unit test class for storage-related field_attach_* functions. - * - * All field_attach_* test work with all field_storage plugins and - * all hook_field_attach_pre_{load,insert,update}() hooks. - */ -class FieldAttachStorageTestCase extends FieldAttachTestCase { - public static function getInfo() { - return array( - 'name' => 'Field attach tests (storage-related)', - 'description' => 'Test storage-related Field Attach API functions.', - 'group' => 'Field API', - ); - } - - /** - * Check field values insert, update and load. - * - * Works independently of the underlying field storage backend. Inserts or - * updates random field data and then loads and verifies the data. - */ - function testFieldAttachSaveLoad() { - // Configure the instance so that we test hook_field_load() (see - // field_test_field_load() in field_test.module). - $this->instance['settings']['test_hook_field_load'] = TRUE; - field_update_instance($this->instance); - $langcode = LANGUAGE_NONE; - - $entity_type = 'test_entity'; - $values = array(); - - // TODO : test empty values filtering and "compression" (store consecutive deltas). - - // Preparation: create three revisions and store them in $revision array. - for ($revision_id = 0; $revision_id < 3; $revision_id++) { - $revision[$revision_id] = field_test_create_stub_entity(0, $revision_id, $this->instance['bundle']); - // Note: we try to insert one extra value. - $values[$revision_id] = $this->_generateTestFieldValues($this->field['cardinality'] + 1); - $current_revision = $revision_id; - // If this is the first revision do an insert. - if (!$revision_id) { - $revision[$revision_id]->{$this->field_name}[$langcode] = $values[$revision_id]; - field_attach_insert($entity_type, $revision[$revision_id]); - } - else { - // Otherwise do an update. - $revision[$revision_id]->{$this->field_name}[$langcode] = $values[$revision_id]; - field_attach_update($entity_type, $revision[$revision_id]); - } - } - - // Confirm current revision loads the correct data. - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - field_attach_load($entity_type, array(0 => $entity)); - // Number of values per field loaded equals the field cardinality. - $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], 'Current revision: expected number of values'); - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - // The field value loaded matches the one inserted or updated. - $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['value'] , $values[$current_revision][$delta]['value'], format_string('Current revision: expected value %delta was found.', array('%delta' => $delta))); - // The value added in hook_field_load() is found. - $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['additional_key'], 'additional_value', format_string('Current revision: extra information for value %delta was found', array('%delta' => $delta))); - } - - // Confirm each revision loads the correct data. - foreach (array_keys($revision) as $revision_id) { - $entity = field_test_create_stub_entity(0, $revision_id, $this->instance['bundle']); - field_attach_load_revision($entity_type, array(0 => $entity)); - // Number of values per field loaded equals the field cardinality. - $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $revision_id))); - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - // The field value loaded matches the one inserted or updated. - $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['value'], $values[$revision_id][$delta]['value'], format_string('Revision %revision_id: expected value %delta was found.', array('%revision_id' => $revision_id, '%delta' => $delta))); - // The value added in hook_field_load() is found. - $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['additional_key'], 'additional_value', format_string('Revision %revision_id: extra information for value %delta was found', array('%revision_id' => $revision_id, '%delta' => $delta))); - } - } - } - - /** - * Test the 'multiple' load feature. - */ - function testFieldAttachLoadMultiple() { - $entity_type = 'test_entity'; - $langcode = LANGUAGE_NONE; - - // Define 2 bundles. - $bundles = array( - 1 => 'test_bundle_1', - 2 => 'test_bundle_2', - ); - field_test_create_bundle($bundles[1]); - field_test_create_bundle($bundles[2]); - // Define 3 fields: - // - field_1 is in bundle_1 and bundle_2, - // - field_2 is in bundle_1, - // - field_3 is in bundle_2. - $field_bundles_map = array( - 1 => array(1, 2), - 2 => array(1), - 3 => array(2), - ); - for ($i = 1; $i <= 3; $i++) { - $field_names[$i] = 'field_' . $i; - $field = array('field_name' => $field_names[$i], 'type' => 'test_field'); - $field = field_create_field($field); - $field_ids[$i] = $field['id']; - foreach ($field_bundles_map[$i] as $bundle) { - $instance = array( - 'field_name' => $field_names[$i], - 'entity_type' => 'test_entity', - 'bundle' => $bundles[$bundle], - 'settings' => array( - // Configure the instance so that we test hook_field_load() - // (see field_test_field_load() in field_test.module). - 'test_hook_field_load' => TRUE, - ), - ); - field_create_instance($instance); - } - } - - // Create one test entity per bundle, with random values. - foreach ($bundles as $index => $bundle) { - $entities[$index] = field_test_create_stub_entity($index, $index, $bundle); - $entity = clone($entities[$index]); - $instances = field_info_instances('test_entity', $bundle); - foreach ($instances as $field_name => $instance) { - $values[$index][$field_name] = mt_rand(1, 127); - $entity->$field_name = array($langcode => array(array('value' => $values[$index][$field_name]))); - } - field_attach_insert($entity_type, $entity); - } - - // Check that a single load correctly loads field values for both entities. - field_attach_load($entity_type, $entities); - foreach ($entities as $index => $entity) { - $instances = field_info_instances($entity_type, $bundles[$index]); - foreach ($instances as $field_name => $instance) { - // The field value loaded matches the one inserted. - $this->assertEqual($entity->{$field_name}[$langcode][0]['value'], $values[$index][$field_name], format_string('Entity %index: expected value was found.', array('%index' => $index))); - // The value added in hook_field_load() is found. - $this->assertEqual($entity->{$field_name}[$langcode][0]['additional_key'], 'additional_value', format_string('Entity %index: extra information was found', array('%index' => $index))); - } - } - - // Check that the single-field load option works. - $entity = field_test_create_stub_entity(1, 1, $bundles[1]); - field_attach_load($entity_type, array(1 => $entity), FIELD_LOAD_CURRENT, array('field_id' => $field_ids[1])); - $this->assertEqual($entity->{$field_names[1]}[$langcode][0]['value'], $values[1][$field_names[1]], format_string('Entity %index: expected value was found.', array('%index' => 1))); - $this->assertEqual($entity->{$field_names[1]}[$langcode][0]['additional_key'], 'additional_value', format_string('Entity %index: extra information was found', array('%index' => 1))); - $this->assert(!isset($entity->{$field_names[2]}), format_string('Entity %index: field %field_name is not loaded.', array('%index' => 2, '%field_name' => $field_names[2]))); - $this->assert(!isset($entity->{$field_names[3]}), format_string('Entity %index: field %field_name is not loaded.', array('%index' => 3, '%field_name' => $field_names[3]))); - } - - /** - * Test saving and loading fields using different storage backends. - */ - function testFieldAttachSaveLoadDifferentStorage() { - $entity_type = 'test_entity'; - $langcode = LANGUAGE_NONE; - - // Create two fields using different storage backends, and their instances. - $fields = array( - array( - 'field_name' => 'field_1', - 'type' => 'test_field', - 'cardinality' => 4, - 'storage' => array('type' => 'field_sql_storage') - ), - array( - 'field_name' => 'field_2', - 'type' => 'test_field', - 'cardinality' => 4, - 'storage' => array('type' => 'field_test_storage') - ), - ); - foreach ($fields as $field) { - field_create_field($field); - $instance = array( - 'field_name' => $field['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ); - field_create_instance($instance); - } - - $entity_init = field_test_create_stub_entity(); - - // Create entity and insert random values. - $entity = clone($entity_init); - $values = array(); - foreach ($fields as $field) { - $values[$field['field_name']] = $this->_generateTestFieldValues($this->field['cardinality']); - $entity->{$field['field_name']}[$langcode] = $values[$field['field_name']]; - } - field_attach_insert($entity_type, $entity); - - // Check that values are loaded as expected. - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - foreach ($fields as $field) { - $this->assertEqual($values[$field['field_name']], $entity->{$field['field_name']}[$langcode], format_string('%storage storage: expected values were found.', array('%storage' => $field['storage']['type']))); - } - } - - /** - * Test storage details alteration. - * - * @see field_test_storage_details_alter() - */ - function testFieldStorageDetailsAlter() { - $field_name = 'field_test_change_my_details'; - $field = array( - 'field_name' => $field_name, - 'type' => 'test_field', - 'cardinality' => 4, - 'storage' => array('type' => 'field_test_storage'), - ); - $field = field_create_field($field); - $instance = array( - 'field_name' => $field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ); - field_create_instance($instance); - - $field = field_info_field($instance['field_name']); - $instance = field_info_instance($instance['entity_type'], $instance['field_name'], $instance['bundle']); - - // The storage details are indexed by a storage engine type. - $this->assertTrue(array_key_exists('drupal_variables', $field['storage']['details']), 'The storage type is Drupal variables.'); - - $details = $field['storage']['details']['drupal_variables']; - - // The field_test storage details are indexed by variable name. The details - // are altered, so moon and mars are correct for this test. - $this->assertTrue(array_key_exists('moon', $details[FIELD_LOAD_CURRENT]), 'Moon is available in the instance array.'); - $this->assertTrue(array_key_exists('mars', $details[FIELD_LOAD_REVISION]), 'Mars is available in the instance array.'); - - // Test current and revision storage details together because the columns - // are the same. - foreach ((array) $field['columns'] as $column_name => $attributes) { - $this->assertEqual($details[FIELD_LOAD_CURRENT]['moon'][$column_name], $column_name, format_string('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => 'moon[FIELD_LOAD_CURRENT]'))); - $this->assertEqual($details[FIELD_LOAD_REVISION]['mars'][$column_name], $column_name, format_string('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => 'mars[FIELD_LOAD_REVISION]'))); - } - } - - /** - * Tests insert and update with missing or NULL fields. - */ - function testFieldAttachSaveMissingData() { - $entity_type = 'test_entity'; - $entity_init = field_test_create_stub_entity(); - $langcode = LANGUAGE_NONE; - - // Insert: Field is missing. - $entity = clone($entity_init); - field_attach_insert($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertTrue(empty($entity->{$this->field_name}), 'Insert: missing field results in no value saved'); - - // Insert: Field is NULL. - field_cache_clear(); - $entity = clone($entity_init); - $entity->{$this->field_name} = NULL; - field_attach_insert($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertTrue(empty($entity->{$this->field_name}), 'Insert: NULL field results in no value saved'); - - // Add some real data. - field_cache_clear(); - $entity = clone($entity_init); - $values = $this->_generateTestFieldValues(1); - $entity->{$this->field_name}[$langcode] = $values; - field_attach_insert($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertEqual($entity->{$this->field_name}[$langcode], $values, 'Field data saved'); - - // Update: Field is missing. Data should survive. - field_cache_clear(); - $entity = clone($entity_init); - field_attach_update($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertEqual($entity->{$this->field_name}[$langcode], $values, 'Update: missing field leaves existing values in place'); - - // Update: Field is NULL. Data should be wiped. - field_cache_clear(); - $entity = clone($entity_init); - $entity->{$this->field_name} = NULL; - field_attach_update($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertTrue(empty($entity->{$this->field_name}), 'Update: NULL field removes existing values'); - - // Re-add some data. - field_cache_clear(); - $entity = clone($entity_init); - $values = $this->_generateTestFieldValues(1); - $entity->{$this->field_name}[$langcode] = $values; - field_attach_update($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertEqual($entity->{$this->field_name}[$langcode], $values, 'Field data saved'); - - // Update: Field is empty array. Data should be wiped. - field_cache_clear(); - $entity = clone($entity_init); - $entity->{$this->field_name} = array(); - field_attach_update($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertTrue(empty($entity->{$this->field_name}), 'Update: empty array removes existing values'); - } - - /** - * Test insert with missing or NULL fields, with default value. - */ - function testFieldAttachSaveMissingDataDefaultValue() { - // Add a default value function. - $this->instance['default_value_function'] = 'field_test_default_value'; - field_update_instance($this->instance); - - $entity_type = 'test_entity'; - $entity_init = field_test_create_stub_entity(); - $langcode = LANGUAGE_NONE; - - // Insert: Field is NULL. - $entity = clone($entity_init); - $entity->{$this->field_name}[$langcode] = NULL; - field_attach_insert($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertTrue(empty($entity->{$this->field_name}[$langcode]), 'Insert: NULL field results in no value saved'); - - // Insert: Field is missing. - field_cache_clear(); - $entity = clone($entity_init); - field_attach_insert($entity_type, $entity); - - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $values = field_test_default_value($entity_type, $entity, $this->field, $this->instance); - $this->assertEqual($entity->{$this->field_name}[$langcode], $values, 'Insert: missing field results in default value saved'); - } - - /** - * Test field_attach_delete(). - */ - function testFieldAttachDelete() { - $entity_type = 'test_entity'; - $langcode = LANGUAGE_NONE; - $rev[0] = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - - // Create revision 0 - $values = $this->_generateTestFieldValues($this->field['cardinality']); - $rev[0]->{$this->field_name}[$langcode] = $values; - field_attach_insert($entity_type, $rev[0]); - - // Create revision 1 - $rev[1] = field_test_create_stub_entity(0, 1, $this->instance['bundle']); - $rev[1]->{$this->field_name}[$langcode] = $values; - field_attach_update($entity_type, $rev[1]); - - // Create revision 2 - $rev[2] = field_test_create_stub_entity(0, 2, $this->instance['bundle']); - $rev[2]->{$this->field_name}[$langcode] = $values; - field_attach_update($entity_type, $rev[2]); - - // Confirm each revision loads - foreach (array_keys($rev) as $vid) { - $read = field_test_create_stub_entity(0, $vid, $this->instance['bundle']); - field_attach_load_revision($entity_type, array(0 => $read)); - $this->assertEqual(count($read->{$this->field_name}[$langcode]), $this->field['cardinality'], "The test entity revision $vid has {$this->field['cardinality']} values."); - } - - // Delete revision 1, confirm the other two still load. - field_attach_delete_revision($entity_type, $rev[1]); - foreach (array(0, 2) as $vid) { - $read = field_test_create_stub_entity(0, $vid, $this->instance['bundle']); - field_attach_load_revision($entity_type, array(0 => $read)); - $this->assertEqual(count($read->{$this->field_name}[$langcode]), $this->field['cardinality'], "The test entity revision $vid has {$this->field['cardinality']} values."); - } - - // Confirm the current revision still loads - $read = field_test_create_stub_entity(0, 2, $this->instance['bundle']); - field_attach_load($entity_type, array(0 => $read)); - $this->assertEqual(count($read->{$this->field_name}[$langcode]), $this->field['cardinality'], "The test entity current revision has {$this->field['cardinality']} values."); - - // Delete all field data, confirm nothing loads - field_attach_delete($entity_type, $rev[2]); - foreach (array(0, 1, 2) as $vid) { - $read = field_test_create_stub_entity(0, $vid, $this->instance['bundle']); - field_attach_load_revision($entity_type, array(0 => $read)); - $this->assertIdentical($read->{$this->field_name}, array(), "The test entity revision $vid is deleted."); - } - $read = field_test_create_stub_entity(0, 2, $this->instance['bundle']); - field_attach_load($entity_type, array(0 => $read)); - $this->assertIdentical($read->{$this->field_name}, array(), 'The test entity current revision is deleted.'); - } - - /** - * Test field_attach_create_bundle() and field_attach_rename_bundle(). - */ - function testFieldAttachCreateRenameBundle() { - // Create a new bundle. This has to be initiated by the module so that its - // hook_entity_info() is consistent. - $new_bundle = 'test_bundle_' . drupal_strtolower($this->randomName()); - field_test_create_bundle($new_bundle); - - // Add an instance to that bundle. - $this->instance['bundle'] = $new_bundle; - field_create_instance($this->instance); - - // Save an entity with data in the field. - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - $values = $this->_generateTestFieldValues($this->field['cardinality']); - $entity->{$this->field_name}[$langcode] = $values; - $entity_type = 'test_entity'; - field_attach_insert($entity_type, $entity); - - // Verify the field data is present on load. - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - field_attach_load($entity_type, array(0 => $entity)); - $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], "Data is retrieved for the new bundle"); - - // Rename the bundle. This has to be initiated by the module so that its - // hook_entity_info() is consistent. - $new_bundle = 'test_bundle_' . drupal_strtolower($this->randomName()); - field_test_rename_bundle($this->instance['bundle'], $new_bundle); - - // Check that the instance definition has been updated. - $this->instance = field_info_instance($entity_type, $this->field_name, $new_bundle); - $this->assertIdentical($this->instance['bundle'], $new_bundle, "Bundle name has been updated in the instance."); - - // Verify the field data is present on load. - $entity = field_test_create_stub_entity(0, 0, $new_bundle); - field_attach_load($entity_type, array(0 => $entity)); - $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], "Bundle name has been updated in the field storage"); - } - - /** - * Test field_attach_delete_bundle(). - */ - function testFieldAttachDeleteBundle() { - // Create a new bundle. This has to be initiated by the module so that its - // hook_entity_info() is consistent. - $new_bundle = 'test_bundle_' . drupal_strtolower($this->randomName()); - field_test_create_bundle($new_bundle); - - // Add an instance to that bundle. - $this->instance['bundle'] = $new_bundle; - field_create_instance($this->instance); - - // Create a second field for the test bundle - $field_name = drupal_strtolower($this->randomName() . '_field_name'); - $field = array('field_name' => $field_name, 'type' => 'test_field', 'cardinality' => 1); - field_create_field($field); - $instance = array( - 'field_name' => $field_name, - 'entity_type' => 'test_entity', - 'bundle' => $this->instance['bundle'], - 'label' => $this->randomName() . '_label', - 'description' => $this->randomName() . '_description', - 'weight' => mt_rand(0, 127), - // test_field has no instance settings - 'widget' => array( - 'type' => 'test_field_widget', - 'settings' => array( - 'size' => mt_rand(0, 255)))); - field_create_instance($instance); - - // Save an entity with data for both fields - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - $values = $this->_generateTestFieldValues($this->field['cardinality']); - $entity->{$this->field_name}[$langcode] = $values; - $entity->{$field_name}[$langcode] = $this->_generateTestFieldValues(1); - field_attach_insert('test_entity', $entity); - - // Verify the fields are present on load - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - field_attach_load('test_entity', array(0 => $entity)); - $this->assertEqual(count($entity->{$this->field_name}[$langcode]), 4, 'First field got loaded'); - $this->assertEqual(count($entity->{$field_name}[$langcode]), 1, 'Second field got loaded'); - - // Delete the bundle. This has to be initiated by the module so that its - // hook_entity_info() is consistent. - field_test_delete_bundle($this->instance['bundle']); - - // Verify no data gets loaded - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - field_attach_load('test_entity', array(0 => $entity)); - $this->assertFalse(isset($entity->{$this->field_name}[$langcode]), 'No data for first field'); - $this->assertFalse(isset($entity->{$field_name}[$langcode]), 'No data for second field'); - - // Verify that the instances are gone - $this->assertFalse(field_read_instance('test_entity', $this->field_name, $this->instance['bundle']), "First field is deleted"); - $this->assertFalse(field_read_instance('test_entity', $field_name, $instance['bundle']), "Second field is deleted"); - } -} - -/** - * Unit test class for non-storage related field_attach_* functions. - */ -class FieldAttachOtherTestCase extends FieldAttachTestCase { - public static function getInfo() { - return array( - 'name' => 'Field attach tests (other)', - 'description' => 'Test other Field Attach API functions.', - 'group' => 'Field API', - ); - } - - /** - * Test field_attach_view() and field_attach_prepare_view(). - */ - function testFieldAttachView() { - $this->createFieldWithInstance('_2'); - - $entity_type = 'test_entity'; - $entity_init = field_test_create_stub_entity(); - $langcode = LANGUAGE_NONE; - $options = array('field_name' => $this->field_name_2); - - // Populate values to be displayed. - $values = $this->_generateTestFieldValues($this->field['cardinality']); - $entity_init->{$this->field_name}[$langcode] = $values; - $values_2 = $this->_generateTestFieldValues($this->field_2['cardinality']); - $entity_init->{$this->field_name_2}[$langcode] = $values_2; - - // Simple formatter, label displayed. - $entity = clone($entity_init); - $formatter_setting = $this->randomName(); - $this->instance['display'] = array( - 'full' => array( - 'label' => 'above', - 'type' => 'field_test_default', - 'settings' => array( - 'test_formatter_setting' => $formatter_setting, - ) - ), - ); - field_update_instance($this->instance); - $formatter_setting_2 = $this->randomName(); - $this->instance_2['display'] = array( - 'full' => array( - 'label' => 'above', - 'type' => 'field_test_default', - 'settings' => array( - 'test_formatter_setting' => $formatter_setting_2, - ) - ), - ); - field_update_instance($this->instance_2); - // View all fields. - field_attach_prepare_view($entity_type, array($entity->ftid => $entity), 'full'); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $output = drupal_render($entity->content); - $this->content = $output; - $this->assertRaw($this->instance['label'], "First field's label is displayed."); - foreach ($values as $delta => $value) { - $this->content = $output; - $this->assertRaw("$formatter_setting|{$value['value']}", "Value $delta is displayed, formatter settings are applied."); - } - $this->assertRaw($this->instance_2['label'], "Second field's label is displayed."); - foreach ($values_2 as $delta => $value) { - $this->content = $output; - $this->assertRaw("$formatter_setting_2|{$value['value']}", "Value $delta is displayed, formatter settings are applied."); - } - // View single field (the second field). - field_attach_prepare_view($entity_type, array($entity->ftid => $entity), 'full', $langcode, $options); - $entity->content = field_attach_view($entity_type, $entity, 'full', $langcode, $options); - $output = drupal_render($entity->content); - $this->content = $output; - $this->assertNoRaw($this->instance['label'], "First field's label is not displayed."); - foreach ($values as $delta => $value) { - $this->content = $output; - $this->assertNoRaw("$formatter_setting|{$value['value']}", "Value $delta is displayed, formatter settings are applied."); - } - $this->assertRaw($this->instance_2['label'], "Second field's label is displayed."); - foreach ($values_2 as $delta => $value) { - $this->content = $output; - $this->assertRaw("$formatter_setting_2|{$value['value']}", "Value $delta is displayed, formatter settings are applied."); - } - - // Label hidden. - $entity = clone($entity_init); - $this->instance['display']['full']['label'] = 'hidden'; - field_update_instance($this->instance); - field_attach_prepare_view($entity_type, array($entity->ftid => $entity), 'full'); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $output = drupal_render($entity->content); - $this->content = $output; - $this->assertNoRaw($this->instance['label'], "Hidden label: label is not displayed."); - - // Field hidden. - $entity = clone($entity_init); - $this->instance['display'] = array( - 'full' => array( - 'label' => 'above', - 'type' => 'hidden', - ), - ); - field_update_instance($this->instance); - field_attach_prepare_view($entity_type, array($entity->ftid => $entity), 'full'); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $output = drupal_render($entity->content); - $this->content = $output; - $this->assertNoRaw($this->instance['label'], "Hidden field: label is not displayed."); - foreach ($values as $delta => $value) { - $this->assertNoRaw("$formatter_setting|{$value['value']}", "Hidden field: value $delta is not displayed."); - } - - // Multiple formatter. - $entity = clone($entity_init); - $formatter_setting = $this->randomName(); - $this->instance['display'] = array( - 'full' => array( - 'label' => 'above', - 'type' => 'field_test_multiple', - 'settings' => array( - 'test_formatter_setting_multiple' => $formatter_setting, - ) - ), - ); - field_update_instance($this->instance); - field_attach_prepare_view($entity_type, array($entity->ftid => $entity), 'full'); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $output = drupal_render($entity->content); - $display = $formatter_setting; - foreach ($values as $delta => $value) { - $display .= "|$delta:{$value['value']}"; - } - $this->content = $output; - $this->assertRaw($display, "Multiple formatter: all values are displayed, formatter settings are applied."); - - // Test a formatter that uses hook_field_formatter_prepare_view(). - $entity = clone($entity_init); - $formatter_setting = $this->randomName(); - $this->instance['display'] = array( - 'full' => array( - 'label' => 'above', - 'type' => 'field_test_with_prepare_view', - 'settings' => array( - 'test_formatter_setting_additional' => $formatter_setting, - ) - ), - ); - field_update_instance($this->instance); - field_attach_prepare_view($entity_type, array($entity->ftid => $entity), 'full'); - $entity->content = field_attach_view($entity_type, $entity, 'full'); - $output = drupal_render($entity->content); - $this->content = $output; - foreach ($values as $delta => $value) { - $this->content = $output; - $expected = $formatter_setting . '|' . $value['value'] . '|' . ($value['value'] + 1); - $this->assertRaw($expected, "Value $delta is displayed, formatter settings are applied."); - } - - // TODO: - // - check display order with several fields - - // Preprocess template. - $variables = array(); - field_attach_preprocess($entity_type, $entity, $entity->content, $variables); - $result = TRUE; - foreach ($values as $delta => $item) { - if ($variables[$this->field_name][$delta]['value'] !== $item['value']) { - $result = FALSE; - break; - } - } - $this->assertTrue($result, format_string('Variable $@field_name correctly populated.', array('@field_name' => $this->field_name))); - } - - /** - * Tests the 'multiple entity' behavior of field_attach_prepare_view(). - */ - function testFieldAttachPrepareViewMultiple() { - $entity_type = 'test_entity'; - $langcode = LANGUAGE_NONE; - - // Set the instance to be hidden. - $this->instance['display']['full']['type'] = 'hidden'; - field_update_instance($this->instance); - - // Set up a second instance on another bundle, with a formatter that uses - // hook_field_formatter_prepare_view(). - field_test_create_bundle('test_bundle_2'); - $formatter_setting = $this->randomName(); - $this->instance2 = $this->instance; - $this->instance2['bundle'] = 'test_bundle_2'; - $this->instance2['display']['full'] = array( - 'type' => 'field_test_with_prepare_view', - 'settings' => array( - 'test_formatter_setting_additional' => $formatter_setting, - ) - ); - field_create_instance($this->instance2); - - // Create one entity in each bundle. - $entity1_init = field_test_create_stub_entity(1, 1, 'test_bundle'); - $values1 = $this->_generateTestFieldValues($this->field['cardinality']); - $entity1_init->{$this->field_name}[$langcode] = $values1; - - $entity2_init = field_test_create_stub_entity(2, 2, 'test_bundle_2'); - $values2 = $this->_generateTestFieldValues($this->field['cardinality']); - $entity2_init->{$this->field_name}[$langcode] = $values2; - - // Run prepare_view, and check that the entities come out as expected. - $entity1 = clone($entity1_init); - $entity2 = clone($entity2_init); - field_attach_prepare_view($entity_type, array($entity1->ftid => $entity1, $entity2->ftid => $entity2), 'full'); - $this->assertFalse(isset($entity1->{$this->field_name}[$langcode][0]['additional_formatter_value']), 'Entity 1 did not run through the prepare_view hook.'); - $this->assertTrue(isset($entity2->{$this->field_name}[$langcode][0]['additional_formatter_value']), 'Entity 2 ran through the prepare_view hook.'); - - // Same thing, reversed order. - $entity1 = clone($entity1_init); - $entity2 = clone($entity2_init); - field_attach_prepare_view($entity_type, array($entity2->ftid => $entity2, $entity1->ftid => $entity1), 'full'); - $this->assertFalse(isset($entity1->{$this->field_name}[$langcode][0]['additional_formatter_value']), 'Entity 1 did not run through the prepare_view hook.'); - $this->assertTrue(isset($entity2->{$this->field_name}[$langcode][0]['additional_formatter_value']), 'Entity 2 ran through the prepare_view hook.'); - } - - /** - * Test field cache. - */ - function testFieldAttachCache() { - // Initialize random values and a test entity. - $entity_init = field_test_create_stub_entity(1, 1, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - $values = $this->_generateTestFieldValues($this->field['cardinality']); - - // Non-cacheable entity type. - $entity_type = 'test_entity'; - $cid = "field:$entity_type:{$entity_init->ftid}"; - - // Check that no initial cache entry is present. - $this->assertFalse(cache_get($cid, 'cache_field'), 'Non-cached: no initial cache entry'); - - // Save, and check that no cache entry is present. - $entity = clone($entity_init); - $entity->{$this->field_name}[$langcode] = $values; - field_attach_insert($entity_type, $entity); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Non-cached: no cache entry on insert'); - - // Load, and check that no cache entry is present. - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Non-cached: no cache entry on load'); - - - // Cacheable entity type. - $entity_type = 'test_cacheable_entity'; - $cid = "field:$entity_type:{$entity_init->ftid}"; - $instance = $this->instance; - $instance['entity_type'] = $entity_type; - field_create_instance($instance); - - // Check that no initial cache entry is present. - $this->assertFalse(cache_get($cid, 'cache_field'), 'Cached: no initial cache entry'); - - // Save, and check that no cache entry is present. - $entity = clone($entity_init); - $entity->{$this->field_name}[$langcode] = $values; - field_attach_insert($entity_type, $entity); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Cached: no cache entry on insert'); - - // Load a single field, and check that no cache entry is present. - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity), FIELD_LOAD_CURRENT, array('field_id' => $this->field_id)); - $cache = cache_get($cid, 'cache_field'); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Cached: no cache entry on loading a single field'); - - // Load, and check that a cache entry is present with the expected values. - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $cache = cache_get($cid, 'cache_field'); - $this->assertEqual($cache->data[$this->field_name][$langcode], $values, 'Cached: correct cache entry on load'); - - // Update with different values, and check that the cache entry is wiped. - $values = $this->_generateTestFieldValues($this->field['cardinality']); - $entity = clone($entity_init); - $entity->{$this->field_name}[$langcode] = $values; - field_attach_update($entity_type, $entity); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Cached: no cache entry on update'); - - // Load, and check that a cache entry is present with the expected values. - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $cache = cache_get($cid, 'cache_field'); - $this->assertEqual($cache->data[$this->field_name][$langcode], $values, 'Cached: correct cache entry on load'); - - // Create a new revision, and check that the cache entry is wiped. - $entity_init = field_test_create_stub_entity(1, 2, $this->instance['bundle']); - $values = $this->_generateTestFieldValues($this->field['cardinality']); - $entity = clone($entity_init); - $entity->{$this->field_name}[$langcode] = $values; - field_attach_update($entity_type, $entity); - $cache = cache_get($cid, 'cache_field'); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Cached: no cache entry on new revision creation'); - - // Load, and check that a cache entry is present with the expected values. - $entity = clone($entity_init); - field_attach_load($entity_type, array($entity->ftid => $entity)); - $cache = cache_get($cid, 'cache_field'); - $this->assertEqual($cache->data[$this->field_name][$langcode], $values, 'Cached: correct cache entry on load'); - - // Delete, and check that the cache entry is wiped. - field_attach_delete($entity_type, $entity); - $this->assertFalse(cache_get($cid, 'cache_field'), 'Cached: no cache entry after delete'); - } - - /** - * Test field_attach_validate(). - * - * Verify that field_attach_validate() invokes the correct - * hook_field_validate. - */ - function testFieldAttachValidate() { - $this->createFieldWithInstance('_2'); - - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - - // Set up all but one values of the first field to generate errors. - $values = array(); - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - $values[$delta]['value'] = -1; - } - // Arrange for item 1 not to generate an error - $values[1]['value'] = 1; - $entity->{$this->field_name}[$langcode] = $values; - - // Set up all values of the second field to generate errors. - $values_2 = array(); - for ($delta = 0; $delta < $this->field_2['cardinality']; $delta++) { - $values_2[$delta]['value'] = -1; - } - $entity->{$this->field_name_2}[$langcode] = $values_2; - - // Validate all fields. - try { - field_attach_validate($entity_type, $entity); - } - catch (FieldValidationException $e) { - $errors = $e->errors; - } - - foreach ($values as $delta => $value) { - if ($value['value'] != 1) { - $this->assertIdentical($errors[$this->field_name][$langcode][$delta][0]['error'], 'field_test_invalid', "Error set on first field's value $delta"); - $this->assertEqual(count($errors[$this->field_name][$langcode][$delta]), 1, "Only one error set on first field's value $delta"); - unset($errors[$this->field_name][$langcode][$delta]); - } - else { - $this->assertFalse(isset($errors[$this->field_name][$langcode][$delta]), "No error set on first field's value $delta"); - } - } - foreach ($values_2 as $delta => $value) { - $this->assertIdentical($errors[$this->field_name_2][$langcode][$delta][0]['error'], 'field_test_invalid', "Error set on second field's value $delta"); - $this->assertEqual(count($errors[$this->field_name_2][$langcode][$delta]), 1, "Only one error set on second field's value $delta"); - unset($errors[$this->field_name_2][$langcode][$delta]); - } - $this->assertEqual(count($errors[$this->field_name][$langcode]), 0, 'No extraneous errors set for first field'); - $this->assertEqual(count($errors[$this->field_name_2][$langcode]), 0, 'No extraneous errors set for second field'); - - // Validate a single field. - $options = array('field_name' => $this->field_name_2); - try { - field_attach_validate($entity_type, $entity, $options); - } - catch (FieldValidationException $e) { - $errors = $e->errors; - } - - foreach ($values_2 as $delta => $value) { - $this->assertIdentical($errors[$this->field_name_2][$langcode][$delta][0]['error'], 'field_test_invalid', "Error set on second field's value $delta"); - $this->assertEqual(count($errors[$this->field_name_2][$langcode][$delta]), 1, "Only one error set on second field's value $delta"); - unset($errors[$this->field_name_2][$langcode][$delta]); - } - $this->assertFalse(isset($errors[$this->field_name]), 'No validation errors are set for the first field, despite it having errors'); - $this->assertEqual(count($errors[$this->field_name_2][$langcode]), 0, 'No extraneous errors set for second field'); - - // Check that cardinality is validated. - $entity->{$this->field_name_2}[$langcode] = $this->_generateTestFieldValues($this->field_2['cardinality'] + 1); - // When validating all fields. - try { - field_attach_validate($entity_type, $entity); - } - catch (FieldValidationException $e) { - $errors = $e->errors; - } - $this->assertEqual($errors[$this->field_name_2][$langcode][0][0]['error'], 'field_cardinality', 'Cardinality validation failed.'); - // When validating a single field (the second field). - try { - field_attach_validate($entity_type, $entity, $options); - } - catch (FieldValidationException $e) { - $errors = $e->errors; - } - $this->assertEqual($errors[$this->field_name_2][$langcode][0][0]['error'], 'field_cardinality', 'Cardinality validation failed.'); - } - - /** - * Test field_attach_form(). - * - * This could be much more thorough, but it does verify that the correct - * widgets show up. - */ - function testFieldAttachForm() { - $this->createFieldWithInstance('_2'); - - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - - // When generating form for all fields. - $form = array(); - $form_state = form_state_defaults(); - field_attach_form($entity_type, $entity, $form, $form_state); - - $this->assertEqual($form[$this->field_name][$langcode]['#title'], $this->instance['label'], "First field's form title is {$this->instance['label']}"); - $this->assertEqual($form[$this->field_name_2][$langcode]['#title'], $this->instance_2['label'], "Second field's form title is {$this->instance_2['label']}"); - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - // field_test_widget uses 'textfield' - $this->assertEqual($form[$this->field_name][$langcode][$delta]['value']['#type'], 'textfield', "First field's form delta $delta widget is textfield"); - } - for ($delta = 0; $delta < $this->field_2['cardinality']; $delta++) { - // field_test_widget uses 'textfield' - $this->assertEqual($form[$this->field_name_2][$langcode][$delta]['value']['#type'], 'textfield', "Second field's form delta $delta widget is textfield"); - } - - // When generating form for a single field (the second field). - $options = array('field_name' => $this->field_name_2); - $form = array(); - $form_state = form_state_defaults(); - field_attach_form($entity_type, $entity, $form, $form_state, NULL, $options); - - $this->assertFalse(isset($form[$this->field_name]), 'The first field does not exist in the form'); - $this->assertEqual($form[$this->field_name_2][$langcode]['#title'], $this->instance_2['label'], "Second field's form title is {$this->instance_2['label']}"); - for ($delta = 0; $delta < $this->field_2['cardinality']; $delta++) { - // field_test_widget uses 'textfield' - $this->assertEqual($form[$this->field_name_2][$langcode][$delta]['value']['#type'], 'textfield', "Second field's form delta $delta widget is textfield"); - } - } - - /** - * Test field_attach_submit(). - */ - function testFieldAttachSubmit() { - $this->createFieldWithInstance('_2'); - - $entity_type = 'test_entity'; - $entity_init = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - $langcode = LANGUAGE_NONE; - - // Build the form for all fields. - $form = array(); - $form_state = form_state_defaults(); - field_attach_form($entity_type, $entity_init, $form, $form_state); - - // Simulate incoming values. - // First field. - $values = array(); - $weights = array(); - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - $values[$delta]['value'] = mt_rand(1, 127); - // Assign random weight. - do { - $weight = mt_rand(0, $this->field['cardinality']); - } while (in_array($weight, $weights)); - $weights[$delta] = $weight; - $values[$delta]['_weight'] = $weight; - } - // Leave an empty value. 'field_test' fields are empty if empty(). - $values[1]['value'] = 0; - // Second field. - $values_2 = array(); - $weights_2 = array(); - for ($delta = 0; $delta < $this->field_2['cardinality']; $delta++) { - $values_2[$delta]['value'] = mt_rand(1, 127); - // Assign random weight. - do { - $weight = mt_rand(0, $this->field_2['cardinality']); - } while (in_array($weight, $weights_2)); - $weights_2[$delta] = $weight; - $values_2[$delta]['_weight'] = $weight; - } - // Leave an empty value. 'field_test' fields are empty if empty(). - $values_2[1]['value'] = 0; - // Pretend the form has been built. - drupal_prepare_form('field_test_entity_form', $form, $form_state); - drupal_process_form('field_test_entity_form', $form, $form_state); - $form_state['values'][$this->field_name][$langcode] = $values; - $form_state['values'][$this->field_name_2][$langcode] = $values_2; - - // Call field_attach_submit() for all fields. - $entity = clone($entity_init); - field_attach_submit($entity_type, $entity, $form, $form_state); - - asort($weights); - asort($weights_2); - $expected_values = array(); - $expected_values_2 = array(); - foreach ($weights as $key => $value) { - if ($key != 1) { - $expected_values[] = array('value' => $values[$key]['value']); - } - } - $this->assertIdentical($entity->{$this->field_name}[$langcode], $expected_values, 'Submit filters empty values'); - foreach ($weights_2 as $key => $value) { - if ($key != 1) { - $expected_values_2[] = array('value' => $values_2[$key]['value']); - } - } - $this->assertIdentical($entity->{$this->field_name_2}[$langcode], $expected_values_2, 'Submit filters empty values'); - - // Call field_attach_submit() for a single field (the second field). - $options = array('field_name' => $this->field_name_2); - $entity = clone($entity_init); - field_attach_submit($entity_type, $entity, $form, $form_state, $options); - $expected_values_2 = array(); - foreach ($weights_2 as $key => $value) { - if ($key != 1) { - $expected_values_2[] = array('value' => $values_2[$key]['value']); - } - } - $this->assertFalse(isset($entity->{$this->field_name}), 'The first field does not exist in the entity object'); - $this->assertIdentical($entity->{$this->field_name_2}[$langcode], $expected_values_2, 'Submit filters empty values'); - } -} - -class FieldInfoTestCase extends FieldTestCase { - - public static function getInfo() { - return array( - 'name' => 'Field info tests', - 'description' => 'Get information about existing fields, instances and bundles.', - 'group' => 'Field API', - ); - } - - function setUp() { - parent::setUp('field_test'); - } - - /** - * Test that field types and field definitions are correcly cached. - */ - function testFieldInfo() { - // Test that field_test module's fields, widgets, and formatters show up. - - $field_test_info = field_test_field_info(); - // We need to account for the existence of user_field_info_alter(). - foreach (array_keys($field_test_info) as $name) { - $field_test_info[$name]['instance_settings']['user_register_form'] = FALSE; - } - $info = field_info_field_types(); - foreach ($field_test_info as $t_key => $field_type) { - foreach ($field_type as $key => $val) { - $this->assertEqual($info[$t_key][$key], $val, format_string('Field type %t_key key %key is %value', array('%t_key' => $t_key, '%key' => $key, '%value' => print_r($val, TRUE)))); - } - $this->assertEqual($info[$t_key]['module'], 'field_test', "Field type field_test module appears"); - } - - $formatter_info = field_test_field_formatter_info(); - $info = field_info_formatter_types(); - foreach ($formatter_info as $f_key => $formatter) { - foreach ($formatter as $key => $val) { - $this->assertEqual($info[$f_key][$key], $val, format_string('Formatter type %f_key key %key is %value', array('%f_key' => $f_key, '%key' => $key, '%value' => print_r($val, TRUE)))); - } - $this->assertEqual($info[$f_key]['module'], 'field_test', "Formatter type field_test module appears"); - } - - $widget_info = field_test_field_widget_info(); - $info = field_info_widget_types(); - foreach ($widget_info as $w_key => $widget) { - foreach ($widget as $key => $val) { - $this->assertEqual($info[$w_key][$key], $val, format_string('Widget type %w_key key %key is %value', array('%w_key' => $w_key, '%key' => $key, '%value' => print_r($val, TRUE)))); - } - $this->assertEqual($info[$w_key]['module'], 'field_test', "Widget type field_test module appears"); - } - - $storage_info = field_test_field_storage_info(); - $info = field_info_storage_types(); - foreach ($storage_info as $s_key => $storage) { - foreach ($storage as $key => $val) { - $this->assertEqual($info[$s_key][$key], $val, format_string('Storage type %s_key key %key is %value', array('%s_key' => $s_key, '%key' => $key, '%value' => print_r($val, TRUE)))); - } - $this->assertEqual($info[$s_key]['module'], 'field_test', "Storage type field_test module appears"); - } - - // Verify that no unexpected instances exist. - $instances = field_info_instances('test_entity'); - $expected = array('test_bundle' => array()); - $this->assertIdentical($instances, $expected, format_string("field_info_instances('test_entity') returns %expected.", array('%expected' => var_export($expected, TRUE)))); - $instances = field_info_instances('test_entity', 'test_bundle'); - $this->assertIdentical($instances, array(), "field_info_instances('test_entity', 'test_bundle') returns an empty array."); - - // Create a field, verify it shows up. - $core_fields = field_info_fields(); - $field = array( - 'field_name' => drupal_strtolower($this->randomName()), - 'type' => 'test_field', - ); - field_create_field($field); - $fields = field_info_fields(); - $this->assertEqual(count($fields), count($core_fields) + 1, 'One new field exists'); - $this->assertEqual($fields[$field['field_name']]['field_name'], $field['field_name'], 'info fields contains field name'); - $this->assertEqual($fields[$field['field_name']]['type'], $field['type'], 'info fields contains field type'); - $this->assertEqual($fields[$field['field_name']]['module'], 'field_test', 'info fields contains field module'); - $settings = array('test_field_setting' => 'dummy test string'); - foreach ($settings as $key => $val) { - $this->assertEqual($fields[$field['field_name']]['settings'][$key], $val, format_string('Field setting %key has correct default value %value', array('%key' => $key, '%value' => $val))); - } - $this->assertEqual($fields[$field['field_name']]['cardinality'], 1, 'info fields contains cardinality 1'); - $this->assertEqual($fields[$field['field_name']]['active'], 1, 'info fields contains active 1'); - - // Create an instance, verify that it shows up - $instance = array( - 'field_name' => $field['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'label' => $this->randomName(), - 'description' => $this->randomName(), - 'weight' => mt_rand(0, 127), - // test_field has no instance settings - 'widget' => array( - 'type' => 'test_field_widget', - 'settings' => array( - 'test_setting' => 999))); - field_create_instance($instance); - - $info = entity_get_info('test_entity'); - $instances = field_info_instances('test_entity', $instance['bundle']); - $this->assertEqual(count($instances), 1, format_string('One instance shows up in info when attached to a bundle on a @label.', array( - '@label' => $info['label'] - ))); - $this->assertTrue($instance < $instances[$instance['field_name']], 'Instance appears in info correctly'); - - // Test a valid entity type but an invalid bundle. - $instances = field_info_instances('test_entity', 'invalid_bundle'); - $this->assertIdentical($instances, array(), "field_info_instances('test_entity', 'invalid_bundle') returns an empty array."); - - // Test invalid entity type and bundle. - $instances = field_info_instances('invalid_entity', $instance['bundle']); - $this->assertIdentical($instances, array(), "field_info_instances('invalid_entity', 'test_bundle') returns an empty array."); - - // Test invalid entity type, no bundle provided. - $instances = field_info_instances('invalid_entity'); - $this->assertIdentical($instances, array(), "field_info_instances('invalid_entity') returns an empty array."); - - // Test with an entity type that has no bundles. - $instances = field_info_instances('user'); - $expected = array('user' => array()); - $this->assertIdentical($instances, $expected, format_string("field_info_instances('user') returns %expected.", array('%expected' => var_export($expected, TRUE)))); - $instances = field_info_instances('user', 'user'); - $this->assertIdentical($instances, array(), "field_info_instances('user', 'user') returns an empty array."); - - // Test that querying for invalid entity types does not add entries in the - // list returned by field_info_instances(). - field_info_cache_clear(); - field_info_instances('invalid_entity', 'invalid_bundle'); - // Simulate new request by clearing static caches. - drupal_static_reset(); - field_info_instances('invalid_entity', 'invalid_bundle'); - $instances = field_info_instances(); - $this->assertFalse(isset($instances['invalid_entity']), 'field_info_instances() does not contain entries for the invalid entity type that was queried before'); - } - - /** - * Test that cached field definitions are ready for current runtime context. - */ - function testFieldPrepare() { - $field_definition = array( - 'field_name' => 'field', - 'type' => 'test_field', - ); - field_create_field($field_definition); - - // Simulate a stored field definition missing a field setting (e.g. a - // third-party module adding a new field setting has been enabled, and - // existing fields do not know the setting yet). - $data = db_query('SELECT data FROM {field_config} WHERE field_name = :field_name', array(':field_name' => $field_definition['field_name']))->fetchField(); - $data = unserialize($data); - $data['settings'] = array(); - db_update('field_config') - ->fields(array('data' => serialize($data))) - ->condition('field_name', $field_definition['field_name']) - ->execute(); - - field_cache_clear(); - - // Read the field back. - $field = field_info_field($field_definition['field_name']); - - // Check that all expected settings are in place. - $field_type = field_info_field_types($field_definition['type']); - $this->assertIdentical($field['settings'], $field_type['settings'], 'All expected default field settings are present.'); - } - - /** - * Test that cached instance definitions are ready for current runtime context. - */ - function testInstancePrepare() { - $field_definition = array( - 'field_name' => 'field', - 'type' => 'test_field', - ); - field_create_field($field_definition); - $instance_definition = array( - 'field_name' => $field_definition['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ); - field_create_instance($instance_definition); - - // Simulate a stored instance definition missing various settings (e.g. a - // third-party module adding instance, widget or display settings has been - // enabled, but existing instances do not know the new settings). - $data = db_query('SELECT data FROM {field_config_instance} WHERE field_name = :field_name AND bundle = :bundle', array(':field_name' => $instance_definition['field_name'], ':bundle' => $instance_definition['bundle']))->fetchField(); - $data = unserialize($data); - $data['settings'] = array(); - $data['widget']['settings'] = 'unavailable_widget'; - $data['widget']['settings'] = array(); - $data['display']['default']['type'] = 'unavailable_formatter'; - $data['display']['default']['settings'] = array(); - db_update('field_config_instance') - ->fields(array('data' => serialize($data))) - ->condition('field_name', $instance_definition['field_name']) - ->condition('bundle', $instance_definition['bundle']) - ->execute(); - - field_cache_clear(); - - // Read the instance back. - $instance = field_info_instance($instance_definition['entity_type'], $instance_definition['field_name'], $instance_definition['bundle']); - - // Check that all expected instance settings are in place. - $field_type = field_info_field_types($field_definition['type']); - $this->assertIdentical($instance['settings'], $field_type['instance_settings'] , 'All expected instance settings are present.'); - - // Check that the default widget is used and expected settings are in place. - $this->assertIdentical($instance['widget']['type'], $field_type['default_widget'], 'Unavailable widget replaced with default widget.'); - $widget_type = field_info_widget_types($instance['widget']['type']); - $this->assertIdentical($instance['widget']['settings'], $widget_type['settings'] , 'All expected widget settings are present.'); - - // Check that display settings are set for the 'default' mode. - $display = $instance['display']['default']; - $this->assertIdentical($display['type'], $field_type['default_formatter'], "Formatter is set for the 'default' view mode"); - $formatter_type = field_info_formatter_types($display['type']); - $this->assertIdentical($display['settings'], $formatter_type['settings'] , "Formatter settings are set for the 'default' view mode"); - } - - /** - * Test that instances on disabled entity types are filtered out. - */ - function testInstanceDisabledEntityType() { - // For this test the field type and the entity type must be exposed by - // different modules. - $field_definition = array( - 'field_name' => 'field', - 'type' => 'test_field', - ); - field_create_field($field_definition); - $instance_definition = array( - 'field_name' => 'field', - 'entity_type' => 'comment', - 'bundle' => 'comment_node_article', - ); - field_create_instance($instance_definition); - - // Disable coment module. This clears field_info cache. - module_disable(array('comment')); - $this->assertNull(field_info_instance('comment', 'field', 'comment_node_article'), 'No instances are returned on disabled entity types.'); - } - - /** - * Test field_info_field_map(). - */ - function testFieldMap() { - // We will overlook fields created by the 'standard' install profile. - $exclude = field_info_field_map(); - - // Create a new bundle for 'test_entity' entity type. - field_test_create_bundle('test_bundle_2'); - - // Create a couple fields. - $fields = array( - array( - 'field_name' => 'field_1', - 'type' => 'test_field', - ), - array( - 'field_name' => 'field_2', - 'type' => 'hidden_test_field', - ), - ); - foreach ($fields as $field) { - field_create_field($field); - } - - // Create a couple instances. - $instances = array( - array( - 'field_name' => 'field_1', - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ), - array( - 'field_name' => 'field_1', - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle_2', - ), - array( - 'field_name' => 'field_2', - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ), - array( - 'field_name' => 'field_2', - 'entity_type' => 'test_cacheable_entity', - 'bundle' => 'test_bundle', - ), - ); - foreach ($instances as $instance) { - field_create_instance($instance); - } - - $expected = array( - 'field_1' => array( - 'type' => 'test_field', - 'bundles' => array( - 'test_entity' => array('test_bundle', 'test_bundle_2'), - ), - ), - 'field_2' => array( - 'type' => 'hidden_test_field', - 'bundles' => array( - 'test_entity' => array('test_bundle'), - 'test_cacheable_entity' => array('test_bundle'), - ), - ), - ); - - // Check that the field map is correct. - $map = field_info_field_map(); - $map = array_diff_key($map, $exclude); - $this->assertEqual($map, $expected); - } - - /** - * Test that the field_info settings convenience functions work. - */ - function testSettingsInfo() { - $info = field_test_field_info(); - // We need to account for the existence of user_field_info_alter(). - foreach (array_keys($info) as $name) { - $info[$name]['instance_settings']['user_register_form'] = FALSE; - } - foreach ($info as $type => $data) { - $this->assertIdentical(field_info_field_settings($type), $data['settings'], format_string("field_info_field_settings returns %type's field settings", array('%type' => $type))); - $this->assertIdentical(field_info_instance_settings($type), $data['instance_settings'], format_string("field_info_field_settings returns %type's field instance settings", array('%type' => $type))); - } - - $info = field_test_field_widget_info(); - foreach ($info as $type => $data) { - $this->assertIdentical(field_info_widget_settings($type), $data['settings'], format_string("field_info_widget_settings returns %type's widget settings", array('%type' => $type))); - } - - $info = field_test_field_formatter_info(); - foreach ($info as $type => $data) { - $this->assertIdentical(field_info_formatter_settings($type), $data['settings'], format_string("field_info_formatter_settings returns %type's formatter settings", array('%type' => $type))); - } - } - - /** - * Tests that the field info cache can be built correctly. - */ - function testFieldInfoCache() { - // Create a test field and ensure it's in the array returned by - // field_info_fields(). - $field_name = drupal_strtolower($this->randomName()); - $field = array( - 'field_name' => $field_name, - 'type' => 'test_field', - ); - field_create_field($field); - $fields = field_info_fields(); - $this->assertTrue(isset($fields[$field_name]), 'The test field is initially found in the array returned by field_info_fields().'); - - // Now rebuild the field info cache, and set a variable which will cause - // the cache to be cleared while it's being rebuilt; see - // field_test_entity_info(). Ensure the test field is still in the returned - // array. - field_info_cache_clear(); - variable_set('field_test_clear_info_cache_in_hook_entity_info', TRUE); - $fields = field_info_fields(); - $this->assertTrue(isset($fields[$field_name]), 'The test field is found in the array returned by field_info_fields() even if its cache is cleared while being rebuilt.'); - } -} - -class FieldFormTestCase extends FieldTestCase { - public static function getInfo() { - return array( - 'name' => 'Field form tests', - 'description' => 'Test Field form handling.', - 'group' => 'Field API', - ); - } - - function setUp() { - parent::setUp('field_test'); - - $web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content')); - $this->drupalLogin($web_user); - - $this->field_single = array('field_name' => 'field_single', 'type' => 'test_field'); - $this->field_multiple = array('field_name' => 'field_multiple', 'type' => 'test_field', 'cardinality' => 4); - $this->field_unlimited = array('field_name' => 'field_unlimited', 'type' => 'test_field', 'cardinality' => FIELD_CARDINALITY_UNLIMITED); - - $this->instance = array( - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'label' => $this->randomName() . '_label', - 'description' => $this->randomName() . '_description', - 'weight' => mt_rand(0, 127), - 'settings' => array( - 'test_instance_setting' => $this->randomName(), - ), - 'widget' => array( - 'type' => 'test_field_widget', - 'label' => 'Test Field', - 'settings' => array( - 'test_widget_setting' => $this->randomName(), - ) - ) - ); - } - - function testFieldFormSingle() { - $this->field = $this->field_single; - $this->field_name = $this->field['field_name']; - $this->instance['field_name'] = $this->field_name; - field_create_field($this->field); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Display creation form. - $this->drupalGet('test-entity/add/test-bundle'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget is displayed'); - $this->assertNoField("{$this->field_name}[$langcode][1][value]", 'No extraneous widget is displayed'); - // TODO : check that the widget is populated with default value ? - - // Submit with invalid value (field-level validation). - $edit = array("{$this->field_name}[$langcode][0][value]" => -1); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertRaw(t('%name does not accept the value -1.', array('%name' => $this->instance['label'])), 'Field validation fails with invalid input.'); - // TODO : check that the correct field is flagged for error. - - // Create an entity - $value = mt_rand(1, 127); - $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $entity = field_test_entity_test_load($id); - $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was saved'); - - // Display edit form. - $this->drupalGet('test-entity/manage/' . $id . '/edit'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", $value, 'Widget is displayed with the correct default value'); - $this->assertNoField("{$this->field_name}[$langcode][1][value]", 'No extraneous widget is displayed'); - - // Update the entity. - $value = mt_rand(1, 127); - $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), 'Entity was updated'); - $entity = field_test_entity_test_load($id); - $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was updated'); - - // Empty the field. - $value = ''; - $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost('test-entity/manage/' . $id . '/edit', $edit, t('Save')); - $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), 'Entity was updated'); - $entity = field_test_entity_test_load($id); - $this->assertIdentical($entity->{$this->field_name}, array(), 'Field was emptied'); - - } - - function testFieldFormSingleRequired() { - $this->field = $this->field_single; - $this->field_name = $this->field['field_name']; - $this->instance['field_name'] = $this->field_name; - $this->instance['required'] = TRUE; - field_create_field($this->field); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Submit with missing required value. - $edit = array(); - $this->drupalPost('test-entity/add/test-bundle', $edit, t('Save')); - $this->assertRaw(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation'); - - // Create an entity - $value = mt_rand(1, 127); - $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $entity = field_test_entity_test_load($id); - $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], $value, 'Field value was saved'); - - // Edit with missing required value. - $value = ''; - $edit = array("{$this->field_name}[$langcode][0][value]" => $value); - $this->drupalPost('test-entity/manage/' . $id . '/edit', $edit, t('Save')); - $this->assertRaw(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation'); - } - -// function testFieldFormMultiple() { -// $this->field = $this->field_multiple; -// $this->field_name = $this->field['field_name']; -// $this->instance['field_name'] = $this->field_name; -// field_create_field($this->field); -// field_create_instance($this->instance); -// } - - function testFieldFormUnlimited() { - $this->field = $this->field_unlimited; - $this->field_name = $this->field['field_name']; - $this->instance['field_name'] = $this->field_name; - field_create_field($this->field); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Display creation form -> 1 widget. - $this->drupalGet('test-entity/add/test-bundle'); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget 1 is displayed'); - $this->assertNoField("{$this->field_name}[$langcode][1][value]", 'No extraneous widget is displayed'); - - // Press 'add more' button -> 2 widgets. - $this->drupalPost(NULL, array(), t('Add another item')); - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget 1 is displayed'); - $this->assertFieldByName("{$this->field_name}[$langcode][1][value]", '', 'New widget is displayed'); - $this->assertNoField("{$this->field_name}[$langcode][2][value]", 'No extraneous widget is displayed'); - // TODO : check that non-field inpurs are preserved ('title')... - - // Yet another time so that we can play with more values -> 3 widgets. - $this->drupalPost(NULL, array(), t('Add another item')); - - // Prepare values and weights. - $count = 3; - $delta_range = $count - 1; - $values = $weights = $pattern = $expected_values = $edit = array(); - for ($delta = 0; $delta <= $delta_range; $delta++) { - // Assign unique random values and weights. - do { - $value = mt_rand(1, 127); - } while (in_array($value, $values)); - do { - $weight = mt_rand(-$delta_range, $delta_range); - } while (in_array($weight, $weights)); - $edit["$this->field_name[$langcode][$delta][value]"] = $value; - $edit["$this->field_name[$langcode][$delta][_weight]"] = $weight; - // We'll need three slightly different formats to check the values. - $values[$delta] = $value; - $weights[$delta] = $weight; - $field_values[$weight]['value'] = (string) $value; - $pattern[$weight] = "]*value=\"$value\" [^>]*"; - } - - // Press 'add more' button -> 4 widgets - $this->drupalPost(NULL, $edit, t('Add another item')); - for ($delta = 0; $delta <= $delta_range; $delta++) { - $this->assertFieldByName("$this->field_name[$langcode][$delta][value]", $values[$delta], "Widget $delta is displayed and has the right value"); - $this->assertFieldByName("$this->field_name[$langcode][$delta][_weight]", $weights[$delta], "Widget $delta has the right weight"); - } - ksort($pattern); - $pattern = implode('.*', array_values($pattern)); - $this->assertPattern("|$pattern|s", 'Widgets are displayed in the correct order'); - $this->assertFieldByName("$this->field_name[$langcode][$delta][value]", '', "New widget is displayed"); - $this->assertFieldByName("$this->field_name[$langcode][$delta][_weight]", $delta, "New widget has the right weight"); - $this->assertNoField("$this->field_name[$langcode][" . ($delta + 1) . '][value]', 'No extraneous widget is displayed'); - - // Submit the form and create the entity. - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created'); - $entity = field_test_entity_test_load($id); - ksort($field_values); - $field_values = array_values($field_values); - $this->assertIdentical($entity->{$this->field_name}[$langcode], $field_values, 'Field values were saved in the correct order'); - - // Display edit form: check that the expected number of widgets is - // displayed, with correct values change values, reorder, leave an empty - // value in the middle. - // Submit: check that the entity is updated with correct values - // Re-submit: check that the field can be emptied. - - // Test with several multiple fields in a form - } - - /** - * Tests widget handling of multiple required radios. - */ - function testFieldFormMultivalueWithRequiredRadio() { - // Create a multivalue test field. - $this->field = $this->field_unlimited; - $this->field_name = $this->field['field_name']; - $this->instance['field_name'] = $this->field_name; - field_create_field($this->field); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Add a required radio field. - field_create_field(array( - 'field_name' => 'required_radio_test', - 'type' => 'list_text', - 'settings' => array( - 'allowed_values' => array('yes' => 'yes', 'no' => 'no'), - ), - )); - field_create_instance(array( - 'field_name' => 'required_radio_test', - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'required' => TRUE, - 'widget' => array( - 'type' => 'options_buttons', - ), - )); - - // Display creation form. - $this->drupalGet('test-entity/add/test-bundle'); - - // Press the 'Add more' button. - $this->drupalPost(NULL, array(), t('Add another item')); - - // Verify that no error is thrown by the radio element. - $this->assertNoFieldByXpath('//div[contains(@class, "error")]', FALSE, 'No error message is displayed.'); - - // Verify that the widget is added. - $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget 1 is displayed'); - $this->assertFieldByName("{$this->field_name}[$langcode][1][value]", '', 'New widget is displayed'); - $this->assertNoField("{$this->field_name}[$langcode][2][value]", 'No extraneous widget is displayed'); - } - - function testFieldFormJSAddMore() { - $this->field = $this->field_unlimited; - $this->field_name = $this->field['field_name']; - $this->instance['field_name'] = $this->field_name; - field_create_field($this->field); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Display creation form -> 1 widget. - $this->drupalGet('test-entity/add/test-bundle'); - - // Press 'add more' button a couple times -> 3 widgets. - // drupalPostAJAX() will not work iteratively, so we add those through - // non-JS submission. - $this->drupalPost(NULL, array(), t('Add another item')); - $this->drupalPost(NULL, array(), t('Add another item')); - - // Prepare values and weights. - $count = 3; - $delta_range = $count - 1; - $values = $weights = $pattern = $expected_values = $edit = array(); - for ($delta = 0; $delta <= $delta_range; $delta++) { - // Assign unique random values and weights. - do { - $value = mt_rand(1, 127); - } while (in_array($value, $values)); - do { - $weight = mt_rand(-$delta_range, $delta_range); - } while (in_array($weight, $weights)); - $edit["$this->field_name[$langcode][$delta][value]"] = $value; - $edit["$this->field_name[$langcode][$delta][_weight]"] = $weight; - // We'll need three slightly different formats to check the values. - $values[$delta] = $value; - $weights[$delta] = $weight; - $field_values[$weight]['value'] = (string) $value; - $pattern[$weight] = "]*value=\"$value\" [^>]*"; - } - // Press 'add more' button through Ajax, and place the expected HTML result - // as the tested content. - $commands = $this->drupalPostAJAX(NULL, $edit, $this->field_name . '_add_more'); - $this->content = $commands[1]['data']; - - for ($delta = 0; $delta <= $delta_range; $delta++) { - $this->assertFieldByName("$this->field_name[$langcode][$delta][value]", $values[$delta], "Widget $delta is displayed and has the right value"); - $this->assertFieldByName("$this->field_name[$langcode][$delta][_weight]", $weights[$delta], "Widget $delta has the right weight"); - } - ksort($pattern); - $pattern = implode('.*', array_values($pattern)); - $this->assertPattern("|$pattern|s", 'Widgets are displayed in the correct order'); - $this->assertFieldByName("$this->field_name[$langcode][$delta][value]", '', "New widget is displayed"); - $this->assertFieldByName("$this->field_name[$langcode][$delta][_weight]", $delta, "New widget has the right weight"); - $this->assertNoField("$this->field_name[$langcode][" . ($delta + 1) . '][value]', 'No extraneous widget is displayed'); - } - - /** - * Tests widgets handling multiple values. - */ - function testFieldFormMultipleWidget() { - // Create a field with fixed cardinality and an instance using a multiple - // widget. - $this->field = $this->field_multiple; - $this->field_name = $this->field['field_name']; - $this->instance['field_name'] = $this->field_name; - $this->instance['widget']['type'] = 'test_field_widget_multiple'; - field_create_field($this->field); - field_create_instance($this->instance); - $langcode = LANGUAGE_NONE; - - // Display creation form. - $this->drupalGet('test-entity/add/test-bundle'); - $this->assertFieldByName("{$this->field_name}[$langcode]", '', 'Widget is displayed.'); - - // Create entity with three values. - $edit = array("{$this->field_name}[$langcode]" => '1, 2, 3'); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - - // Check that the values were saved. - $entity_init = field_test_create_stub_entity($id); - $this->assertFieldValues($entity_init, $this->field_name, $langcode, array(1, 2, 3)); - - // Display the form, check that the values are correctly filled in. - $this->drupalGet('test-entity/manage/' . $id . '/edit'); - $this->assertFieldByName("{$this->field_name}[$langcode]", '1, 2, 3', 'Widget is displayed.'); - - // Submit the form with more values than the field accepts. - $edit = array("{$this->field_name}[$langcode]" => '1, 2, 3, 4, 5'); - $this->drupalPost(NULL, $edit, t('Save')); - $this->assertRaw('this field cannot hold more than 4 values', 'Form validation failed.'); - // Check that the field values were not submitted. - $this->assertFieldValues($entity_init, $this->field_name, $langcode, array(1, 2, 3)); - } - - /** - * Tests fields with no 'edit' access. - */ - function testFieldFormAccess() { - // Create a "regular" field. - $field = $this->field_single; - $field_name = $field['field_name']; - $instance = $this->instance; - $instance['field_name'] = $field_name; - field_create_field($field); - field_create_instance($instance); - - // Create a field with no edit access - see field_test_field_access(). - $field_no_access = array( - 'field_name' => 'field_no_edit_access', - 'type' => 'test_field', - ); - $field_name_no_access = $field_no_access['field_name']; - $instance_no_access = array( - 'field_name' => $field_name_no_access, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'default_value' => array(0 => array('value' => 99)), - ); - field_create_field($field_no_access); - field_create_instance($instance_no_access); - - $langcode = LANGUAGE_NONE; - - // Test that the form structure includes full information for each delta - // apart from #access. - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - - $form = array(); - $form_state = form_state_defaults(); - field_attach_form($entity_type, $entity, $form, $form_state); - - $this->assertEqual($form[$field_name_no_access][$langcode][0]['value']['#entity_type'], $entity_type, 'The correct entity type is set in the field structure.'); - $this->assertFalse($form[$field_name_no_access]['#access'], 'Field #access is FALSE for the field without edit access.'); - - // Display creation form. - $this->drupalGet('test-entity/add/test-bundle'); - $this->assertNoFieldByName("{$field_name_no_access}[$langcode][0][value]", '', 'Widget is not displayed if field access is denied.'); - - // Create entity. - $edit = array("{$field_name}[$langcode][0][value]" => 1); - $this->drupalPost(NULL, $edit, t('Save')); - preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match); - $id = $match[1]; - - // Check that the default value was saved. - $entity = field_test_entity_test_load($id); - $this->assertEqual($entity->{$field_name_no_access}[$langcode][0]['value'], 99, 'Default value was saved for the field with no edit access.'); - $this->assertEqual($entity->{$field_name}[$langcode][0]['value'], 1, 'Entered value vas saved for the field with edit access.'); - - // Create a new revision. - $edit = array("{$field_name}[$langcode][0][value]" => 2, 'revision' => TRUE); - $this->drupalPost('test-entity/manage/' . $id . '/edit', $edit, t('Save')); - - // Check that the new revision has the expected values. - $entity = field_test_entity_test_load($id); - $this->assertEqual($entity->{$field_name_no_access}[$langcode][0]['value'], 99, 'New revision has the expected value for the field with no edit access.'); - $this->assertEqual($entity->{$field_name}[$langcode][0]['value'], 2, 'New revision has the expected value for the field with edit access.'); - - // Check that the revision is also saved in the revisions table. - $entity = field_test_entity_test_load($id, $entity->ftvid); - $this->assertEqual($entity->{$field_name_no_access}[$langcode][0]['value'], 99, 'New revision has the expected value for the field with no edit access.'); - $this->assertEqual($entity->{$field_name}[$langcode][0]['value'], 2, 'New revision has the expected value for the field with edit access.'); - } - - /** - * Tests Field API form integration within a subform. - */ - function testNestedFieldForm() { - // Add two instances on the 'test_bundle' - field_create_field($this->field_single); - field_create_field($this->field_unlimited); - $this->instance['field_name'] = 'field_single'; - $this->instance['label'] = 'Single field'; - field_create_instance($this->instance); - $this->instance['field_name'] = 'field_unlimited'; - $this->instance['label'] = 'Unlimited field'; - field_create_instance($this->instance); - - // Create two entities. - $entity_1 = field_test_create_stub_entity(1, 1); - $entity_1->is_new = TRUE; - $entity_1->field_single[LANGUAGE_NONE][] = array('value' => 0); - $entity_1->field_unlimited[LANGUAGE_NONE][] = array('value' => 1); - field_test_entity_save($entity_1); - - $entity_2 = field_test_create_stub_entity(2, 2); - $entity_2->is_new = TRUE; - $entity_2->field_single[LANGUAGE_NONE][] = array('value' => 10); - $entity_2->field_unlimited[LANGUAGE_NONE][] = array('value' => 11); - field_test_entity_save($entity_2); - - // Display the 'combined form'. - $this->drupalGet('test-entity/nested/1/2'); - $this->assertFieldByName('field_single[und][0][value]', 0, 'Entity 1: field_single value appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][0][value]', 1, 'Entity 1: field_unlimited value 0 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_single][und][0][value]', 10, 'Entity 2: field_single value appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][0][value]', 11, 'Entity 2: field_unlimited value 0 appears correctly is the form.'); - - // Submit the form and check that the entities are updated accordingly. - $edit = array( - 'field_single[und][0][value]' => 1, - 'field_unlimited[und][0][value]' => 2, - 'field_unlimited[und][1][value]' => 3, - 'entity_2[field_single][und][0][value]' => 11, - 'entity_2[field_unlimited][und][0][value]' => 12, - 'entity_2[field_unlimited][und][1][value]' => 13, - ); - $this->drupalPost(NULL, $edit, t('Save')); - field_cache_clear(); - $entity_1 = field_test_create_stub_entity(1); - $entity_2 = field_test_create_stub_entity(2); - $this->assertFieldValues($entity_1, 'field_single', LANGUAGE_NONE, array(1)); - $this->assertFieldValues($entity_1, 'field_unlimited', LANGUAGE_NONE, array(2, 3)); - $this->assertFieldValues($entity_2, 'field_single', LANGUAGE_NONE, array(11)); - $this->assertFieldValues($entity_2, 'field_unlimited', LANGUAGE_NONE, array(12, 13)); - - // Submit invalid values and check that errors are reported on the - // correct widgets. - $edit = array( - 'field_unlimited[und][1][value]' => -1, - ); - $this->drupalPost('test-entity/nested/1/2', $edit, t('Save')); - $this->assertRaw(t('%label does not accept the value -1', array('%label' => 'Unlimited field')), 'Entity 1: the field validation error was reported.'); - $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', array(':id' => 'edit-field-unlimited-und-1-value')); - $this->assertTrue($error_field, 'Entity 1: the error was flagged on the correct element.'); - $edit = array( - 'entity_2[field_unlimited][und][1][value]' => -1, - ); - $this->drupalPost('test-entity/nested/1/2', $edit, t('Save')); - $this->assertRaw(t('%label does not accept the value -1', array('%label' => 'Unlimited field')), 'Entity 2: the field validation error was reported.'); - $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', array(':id' => 'edit-entity-2-field-unlimited-und-1-value')); - $this->assertTrue($error_field, 'Entity 2: the error was flagged on the correct element.'); - - // Test that reordering works on both entities. - $edit = array( - 'field_unlimited[und][0][_weight]' => 0, - 'field_unlimited[und][1][_weight]' => -1, - 'entity_2[field_unlimited][und][0][_weight]' => 0, - 'entity_2[field_unlimited][und][1][_weight]' => -1, - ); - $this->drupalPost('test-entity/nested/1/2', $edit, t('Save')); - field_cache_clear(); - $this->assertFieldValues($entity_1, 'field_unlimited', LANGUAGE_NONE, array(3, 2)); - $this->assertFieldValues($entity_2, 'field_unlimited', LANGUAGE_NONE, array(13, 12)); - - // Test the 'add more' buttons. Only Ajax submission is tested, because - // the two 'add more' buttons present in the form have the same #value, - // which confuses drupalPost(). - // 'Add more' button in the first entity: - $this->drupalGet('test-entity/nested/1/2'); - $this->drupalPostAJAX(NULL, array(), 'field_unlimited_add_more'); - $this->assertFieldByName('field_unlimited[und][0][value]', 3, 'Entity 1: field_unlimited value 0 appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][1][value]', 2, 'Entity 1: field_unlimited value 1 appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][2][value]', '', 'Entity 1: field_unlimited value 2 appears correctly is the form.'); - $this->assertFieldByName('field_unlimited[und][3][value]', '', 'Entity 1: an empty widget was added for field_unlimited value 3.'); - // 'Add more' button in the first entity (changing field values): - $edit = array( - 'entity_2[field_unlimited][und][0][value]' => 13, - 'entity_2[field_unlimited][und][1][value]' => 14, - 'entity_2[field_unlimited][und][2][value]' => 15, - ); - $this->drupalPostAJAX(NULL, $edit, 'entity_2_field_unlimited_add_more'); - $this->assertFieldByName('entity_2[field_unlimited][und][0][value]', 13, 'Entity 2: field_unlimited value 0 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][1][value]', 14, 'Entity 2: field_unlimited value 1 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][2][value]', 15, 'Entity 2: field_unlimited value 2 appears correctly is the form.'); - $this->assertFieldByName('entity_2[field_unlimited][und][3][value]', '', 'Entity 2: an empty widget was added for field_unlimited value 3.'); - // Save the form and check values are saved correclty. - $this->drupalPost(NULL, array(), t('Save')); - field_cache_clear(); - $this->assertFieldValues($entity_1, 'field_unlimited', LANGUAGE_NONE, array(3, 2)); - $this->assertFieldValues($entity_2, 'field_unlimited', LANGUAGE_NONE, array(13, 14, 15)); - } -} - -class FieldDisplayAPITestCase extends FieldTestCase { - public static function getInfo() { - return array( - 'name' => 'Field Display API tests', - 'description' => 'Test the display API.', - 'group' => 'Field API', - ); - } - - function setUp() { - parent::setUp('field_test'); - - // Create a field and instance. - $this->field_name = 'test_field'; - $this->label = $this->randomName(); - $this->cardinality = 4; - - $this->field = array( - 'field_name' => $this->field_name, - 'type' => 'test_field', - 'cardinality' => $this->cardinality, - ); - $this->instance = array( - 'field_name' => $this->field_name, - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'label' => $this->label, - 'display' => array( - 'default' => array( - 'type' => 'field_test_default', - 'settings' => array( - 'test_formatter_setting' => $this->randomName(), - ), - ), - 'teaser' => array( - 'type' => 'field_test_default', - 'settings' => array( - 'test_formatter_setting' => $this->randomName(), - ), - ), - ), - ); - field_create_field($this->field); - field_create_instance($this->instance); - - // Create an entity with values. - $this->values = $this->_generateTestFieldValues($this->cardinality); - $this->entity = field_test_create_stub_entity(); - $this->is_new = TRUE; - $this->entity->{$this->field_name}[LANGUAGE_NONE] = $this->values; - field_test_entity_save($this->entity); - } - - /** - * Test the field_view_field() function. - */ - function testFieldViewField() { - // No display settings: check that default display settings are used. - $output = field_view_field('test_entity', $this->entity, $this->field_name); - $this->drupalSetContent(drupal_render($output)); - $settings = field_info_formatter_settings('field_test_default'); - $setting = $settings['test_formatter_setting']; - $this->assertText($this->label, 'Label was displayed.'); - foreach ($this->values as $delta => $value) { - $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // Check that explicit display settings are used. - $display = array( - 'label' => 'hidden', - 'type' => 'field_test_multiple', - 'settings' => array( - 'test_formatter_setting_multiple' => $this->randomName(), - 'alter' => TRUE, - ), - ); - $output = field_view_field('test_entity', $this->entity, $this->field_name, $display); - $this->drupalSetContent(drupal_render($output)); - $setting = $display['settings']['test_formatter_setting_multiple']; - $this->assertNoText($this->label, 'Label was not displayed.'); - $this->assertText('field_test_field_attach_view_alter', 'Alter fired, display passed.'); - $array = array(); - foreach ($this->values as $delta => $value) { - $array[] = $delta . ':' . $value['value']; - } - $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.'); - - // Check the prepare_view steps are invoked. - $display = array( - 'label' => 'hidden', - 'type' => 'field_test_with_prepare_view', - 'settings' => array( - 'test_formatter_setting_additional' => $this->randomName(), - ), - ); - $output = field_view_field('test_entity', $this->entity, $this->field_name, $display); - $view = drupal_render($output); - $this->drupalSetContent($view); - $setting = $display['settings']['test_formatter_setting_additional']; - $this->assertNoText($this->label, 'Label was not displayed.'); - $this->assertNoText('field_test_field_attach_view_alter', 'Alter not fired.'); - foreach ($this->values as $delta => $value) { - $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // View mode: check that display settings specified in the instance are - // used. - $output = field_view_field('test_entity', $this->entity, $this->field_name, 'teaser'); - $this->drupalSetContent(drupal_render($output)); - $setting = $this->instance['display']['teaser']['settings']['test_formatter_setting']; - $this->assertText($this->label, 'Label was displayed.'); - foreach ($this->values as $delta => $value) { - $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // Unknown view mode: check that display settings for 'default' view mode - // are used. - $output = field_view_field('test_entity', $this->entity, $this->field_name, 'unknown_view_mode'); - $this->drupalSetContent(drupal_render($output)); - $setting = $this->instance['display']['default']['settings']['test_formatter_setting']; - $this->assertText($this->label, 'Label was displayed.'); - foreach ($this->values as $delta => $value) { - $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - } - - /** - * Test the field_view_value() function. - */ - function testFieldViewValue() { - // No display settings: check that default display settings are used. - $settings = field_info_formatter_settings('field_test_default'); - $setting = $settings['test_formatter_setting']; - foreach ($this->values as $delta => $value) { - $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta]; - $output = field_view_value('test_entity', $this->entity, $this->field_name, $item); - $this->drupalSetContent(drupal_render($output)); - $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // Check that explicit display settings are used. - $display = array( - 'type' => 'field_test_multiple', - 'settings' => array( - 'test_formatter_setting_multiple' => $this->randomName(), - ), - ); - $setting = $display['settings']['test_formatter_setting_multiple']; - $array = array(); - foreach ($this->values as $delta => $value) { - $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta]; - $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, $display); - $this->drupalSetContent(drupal_render($output)); - $this->assertText($setting . '|0:' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // Check that prepare_view steps are invoked. - $display = array( - 'type' => 'field_test_with_prepare_view', - 'settings' => array( - 'test_formatter_setting_additional' => $this->randomName(), - ), - ); - $setting = $display['settings']['test_formatter_setting_additional']; - $array = array(); - foreach ($this->values as $delta => $value) { - $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta]; - $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, $display); - $this->drupalSetContent(drupal_render($output)); - $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // View mode: check that display settings specified in the instance are - // used. - $setting = $this->instance['display']['teaser']['settings']['test_formatter_setting']; - foreach ($this->values as $delta => $value) { - $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta]; - $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, 'teaser'); - $this->drupalSetContent(drupal_render($output)); - $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - - // Unknown view mode: check that display settings for 'default' view mode - // are used. - $setting = $this->instance['display']['default']['settings']['test_formatter_setting']; - foreach ($this->values as $delta => $value) { - $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta]; - $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, 'unknown_view_mode'); - $this->drupalSetContent(drupal_render($output)); - $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta))); - } - } -} - -class FieldCrudTestCase extends FieldTestCase { - public static function getInfo() { - return array( - 'name' => 'Field CRUD tests', - 'description' => 'Test field create, read, update, and delete.', - 'group' => 'Field API', - ); - } - - function setUp() { - // field_update_field() tests use number.module - parent::setUp('field_test', 'number'); - } - - // TODO : test creation with - // - a full fledged $field structure, check that all the values are there - // - a minimal $field structure, check all default values are set - // defer actual $field comparison to a helper function, used for the two cases above - - /** - * Test the creation of a field. - */ - function testCreateField() { - $field_definition = array( - 'field_name' => 'field_2', - 'type' => 'test_field', - ); - field_test_memorize(); - $field_definition = field_create_field($field_definition); - $mem = field_test_memorize(); - $this->assertIdentical($mem['field_test_field_create_field'][0][0], $field_definition, 'hook_field_create_field() called with correct arguments.'); - - // Read the raw record from the {field_config_instance} table. - $result = db_query('SELECT * FROM {field_config} WHERE field_name = :field_name', array(':field_name' => $field_definition['field_name'])); - $record = $result->fetchAssoc(); - $record['data'] = unserialize($record['data']); - - // Ensure that basic properties are preserved. - $this->assertEqual($record['field_name'], $field_definition['field_name'], 'The field name is properly saved.'); - $this->assertEqual($record['type'], $field_definition['type'], 'The field type is properly saved.'); - - // Ensure that cardinality defaults to 1. - $this->assertEqual($record['cardinality'], 1, 'Cardinality defaults to 1.'); - - // Ensure that default settings are present. - $field_type = field_info_field_types($field_definition['type']); - $this->assertIdentical($record['data']['settings'], $field_type['settings'], 'Default field settings have been written.'); - - // Ensure that default storage was set. - $this->assertEqual($record['storage_type'], variable_get('field_storage_default'), 'The field type is properly saved.'); - - // Guarantee that the name is unique. - try { - field_create_field($field_definition); - $this->fail(t('Cannot create two fields with the same name.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create two fields with the same name.')); - } - - // Check that field type is required. - try { - $field_definition = array( - 'field_name' => 'field_1', - ); - field_create_field($field_definition); - $this->fail(t('Cannot create a field with no type.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create a field with no type.')); - } - - // Check that field name is required. - try { - $field_definition = array( - 'type' => 'test_field' - ); - field_create_field($field_definition); - $this->fail(t('Cannot create an unnamed field.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create an unnamed field.')); - } - - // Check that field name must start with a letter or _. - try { - $field_definition = array( - 'field_name' => '2field_2', - 'type' => 'test_field', - ); - field_create_field($field_definition); - $this->fail(t('Cannot create a field with a name starting with a digit.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create a field with a name starting with a digit.')); - } - - // Check that field name must only contain lowercase alphanumeric or _. - try { - $field_definition = array( - 'field_name' => 'field#_3', - 'type' => 'test_field', - ); - field_create_field($field_definition); - $this->fail(t('Cannot create a field with a name containing an illegal character.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create a field with a name containing an illegal character.')); - } - - // Check that field name cannot be longer than 32 characters long. - try { - $field_definition = array( - 'field_name' => '_12345678901234567890123456789012', - 'type' => 'test_field', - ); - field_create_field($field_definition); - $this->fail(t('Cannot create a field with a name longer than 32 characters.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create a field with a name longer than 32 characters.')); - } - - // Check that field name can not be an entity key. - // "ftvid" is known as an entity key from the "test_entity" type. - try { - $field_definition = array( - 'type' => 'test_field', - 'field_name' => 'ftvid', - ); - $field = field_create_field($field_definition); - $this->fail(t('Cannot create a field bearing the name of an entity key.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create a field bearing the name of an entity key.')); - } - } - - /** - * Test failure to create a field. - */ - function testCreateFieldFail() { - $field_name = 'duplicate'; - $field_definition = array('field_name' => $field_name, 'type' => 'test_field', 'storage' => array('type' => 'field_test_storage_failure')); - $query = db_select('field_config')->condition('field_name', $field_name)->countQuery(); - - // The field does not appear in field_config. - $count = $query->execute()->fetchField(); - $this->assertEqual($count, 0, 'A field_config row for the field does not exist.'); - - // Try to create the field. - try { - $field = field_create_field($field_definition); - $this->assertTrue(FALSE, 'Field creation (correctly) fails.'); - } - catch (Exception $e) { - $this->assertTrue(TRUE, 'Field creation (correctly) fails.'); - } - - // The field does not appear in field_config. - $count = $query->execute()->fetchField(); - $this->assertEqual($count, 0, 'A field_config row for the field does not exist.'); - } - - /** - * Test reading back a field definition. - */ - function testReadField() { - $field_definition = array( - 'field_name' => 'field_1', - 'type' => 'test_field', - ); - field_create_field($field_definition); - - // Read the field back. - $field = field_read_field($field_definition['field_name']); - $this->assertTrue($field_definition < $field, 'The field was properly read.'); - } - - /** - * Tests reading field definitions. - */ - function testReadFields() { - $field_definition = array( - 'field_name' => 'field_1', - 'type' => 'test_field', - ); - field_create_field($field_definition); - - // Check that 'single column' criteria works. - $fields = field_read_fields(array('field_name' => $field_definition['field_name'])); - $this->assertTrue(count($fields) == 1 && isset($fields[$field_definition['field_name']]), 'The field was properly read.'); - - // Check that 'multi column' criteria works. - $fields = field_read_fields(array('field_name' => $field_definition['field_name'], 'type' => $field_definition['type'])); - $this->assertTrue(count($fields) == 1 && isset($fields[$field_definition['field_name']]), 'The field was properly read.'); - $fields = field_read_fields(array('field_name' => $field_definition['field_name'], 'type' => 'foo')); - $this->assertTrue(empty($fields), 'No field was found.'); - - // Create an instance of the field. - $instance_definition = array( - 'field_name' => $field_definition['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ); - field_create_instance($instance_definition); - - // Check that criteria spanning over the field_config_instance table work. - $fields = field_read_fields(array('entity_type' => $instance_definition['entity_type'], 'bundle' => $instance_definition['bundle'])); - $this->assertTrue(count($fields) == 1 && isset($fields[$field_definition['field_name']]), 'The field was properly read.'); - $fields = field_read_fields(array('entity_type' => $instance_definition['entity_type'], 'field_name' => $instance_definition['field_name'])); - $this->assertTrue(count($fields) == 1 && isset($fields[$field_definition['field_name']]), 'The field was properly read.'); - } - - /** - * Test creation of indexes on data column. - */ - function testFieldIndexes() { - // Check that indexes specified by the field type are used by default. - $field_definition = array( - 'field_name' => 'field_1', - 'type' => 'test_field', - ); - field_create_field($field_definition); - $field = field_read_field($field_definition['field_name']); - $expected_indexes = array('value' => array('value')); - $this->assertEqual($field['indexes'], $expected_indexes, 'Field type indexes saved by default'); - - // Check that indexes specified by the field definition override the field - // type indexes. - $field_definition = array( - 'field_name' => 'field_2', - 'type' => 'test_field', - 'indexes' => array( - 'value' => array(), - ), - ); - field_create_field($field_definition); - $field = field_read_field($field_definition['field_name']); - $expected_indexes = array('value' => array()); - $this->assertEqual($field['indexes'], $expected_indexes, 'Field definition indexes override field type indexes'); - - // Check that indexes specified by the field definition add to the field - // type indexes. - $field_definition = array( - 'field_name' => 'field_3', - 'type' => 'test_field', - 'indexes' => array( - 'value_2' => array('value'), - ), - ); - field_create_field($field_definition); - $field = field_read_field($field_definition['field_name']); - $expected_indexes = array('value' => array('value'), 'value_2' => array('value')); - $this->assertEqual($field['indexes'], $expected_indexes, 'Field definition indexes are merged with field type indexes'); - } - - /** - * Test the deletion of a field. - */ - function testDeleteField() { - // TODO: Also test deletion of the data stored in the field ? - - // Create two fields (so we can test that only one is deleted). - $this->field = array('field_name' => 'field_1', 'type' => 'test_field'); - field_create_field($this->field); - $this->another_field = array('field_name' => 'field_2', 'type' => 'test_field'); - field_create_field($this->another_field); - - // Create instances for each. - $this->instance_definition = array( - 'field_name' => $this->field['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - 'widget' => array( - 'type' => 'test_field_widget', - ), - ); - field_create_instance($this->instance_definition); - $this->another_instance_definition = $this->instance_definition; - $this->another_instance_definition['field_name'] = $this->another_field['field_name']; - field_create_instance($this->another_instance_definition); - - // Test that the first field is not deleted, and then delete it. - $field = field_read_field($this->field['field_name'], array('include_deleted' => TRUE)); - $this->assertTrue(!empty($field) && empty($field['deleted']), 'A new field is not marked for deletion.'); - field_delete_field($this->field['field_name']); - - // Make sure that the field is marked as deleted when it is specifically - // loaded. - $field = field_read_field($this->field['field_name'], array('include_deleted' => TRUE)); - $this->assertTrue(!empty($field['deleted']), 'A deleted field is marked for deletion.'); - - // Make sure that this field's instance is marked as deleted when it is - // specifically loaded. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle'], array('include_deleted' => TRUE)); - $this->assertTrue(!empty($instance['deleted']), 'An instance for a deleted field is marked for deletion.'); - - // Try to load the field normally and make sure it does not show up. - $field = field_read_field($this->field['field_name']); - $this->assertTrue(empty($field), 'A deleted field is not loaded by default.'); - - // Try to load the instance normally and make sure it does not show up. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertTrue(empty($instance), 'An instance for a deleted field is not loaded by default.'); - - // Make sure the other field (and its field instance) are not deleted. - $another_field = field_read_field($this->another_field['field_name']); - $this->assertTrue(!empty($another_field) && empty($another_field['deleted']), 'A non-deleted field is not marked for deletion.'); - $another_instance = field_read_instance('test_entity', $this->another_instance_definition['field_name'], $this->another_instance_definition['bundle']); - $this->assertTrue(!empty($another_instance) && empty($another_instance['deleted']), 'An instance of a non-deleted field is not marked for deletion.'); - - // Try to create a new field the same name as a deleted field and - // write data into it. - field_create_field($this->field); - field_create_instance($this->instance_definition); - $field = field_read_field($this->field['field_name']); - $this->assertTrue(!empty($field) && empty($field['deleted']), 'A new field with a previously used name is created.'); - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertTrue(!empty($instance) && empty($instance['deleted']), 'A new instance for a previously used field name is created.'); - - // Save an entity with data for the field - $entity = field_test_create_stub_entity(0, 0, $instance['bundle']); - $langcode = LANGUAGE_NONE; - $values[0]['value'] = mt_rand(1, 127); - $entity->{$field['field_name']}[$langcode] = $values; - $entity_type = 'test_entity'; - field_attach_insert('test_entity', $entity); - - // Verify the field is present on load - $entity = field_test_create_stub_entity(0, 0, $this->instance_definition['bundle']); - field_attach_load($entity_type, array(0 => $entity)); - $this->assertIdentical(count($entity->{$field['field_name']}[$langcode]), count($values), "Data in previously deleted field saves and loads correctly"); - foreach ($values as $delta => $value) { - $this->assertEqual($entity->{$field['field_name']}[$langcode][$delta]['value'], $values[$delta]['value'], "Data in previously deleted field saves and loads correctly"); - } - } - - function testUpdateNonExistentField() { - $test_field = array('field_name' => 'does_not_exist', 'type' => 'number_decimal'); - try { - field_update_field($test_field); - $this->fail(t('Cannot update a field that does not exist.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot update a field that does not exist.')); - } - } - - function testUpdateFieldType() { - $field = array('field_name' => 'field_type', 'type' => 'number_decimal'); - $field = field_create_field($field); - - $test_field = array('field_name' => 'field_type', 'type' => 'number_integer'); - try { - field_update_field($test_field); - $this->fail(t('Cannot update a field to a different type.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot update a field to a different type.')); - } - } - - /** - * Test updating a field. - */ - function testUpdateField() { - // Create a field with a defined cardinality, so that we can ensure it's - // respected. Since cardinality enforcement is consistent across database - // systems, it makes a good test case. - $cardinality = 4; - $field_definition = array( - 'field_name' => 'field_update', - 'type' => 'test_field', - 'cardinality' => $cardinality, - ); - $field_definition = field_create_field($field_definition); - $instance = array( - 'field_name' => 'field_update', - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ); - $instance = field_create_instance($instance); - - do { - // We need a unique ID for our entity. $cardinality will do. - $id = $cardinality; - $entity = field_test_create_stub_entity($id, $id, $instance['bundle']); - // Fill in the entity with more values than $cardinality. - for ($i = 0; $i < 20; $i++) { - $entity->field_update[LANGUAGE_NONE][$i]['value'] = $i; - } - // Save the entity. - field_attach_insert('test_entity', $entity); - // Load back and assert there are $cardinality number of values. - $entity = field_test_create_stub_entity($id, $id, $instance['bundle']); - field_attach_load('test_entity', array($id => $entity)); - $this->assertEqual(count($entity->field_update[LANGUAGE_NONE]), $field_definition['cardinality'], 'Cardinality is kept'); - // Now check the values themselves. - for ($delta = 0; $delta < $cardinality; $delta++) { - $this->assertEqual($entity->field_update[LANGUAGE_NONE][$delta]['value'], $delta, 'Value is kept'); - } - // Increase $cardinality and set the field cardinality to the new value. - $field_definition['cardinality'] = ++$cardinality; - field_update_field($field_definition); - } while ($cardinality < 6); - } - - /** - * Test field type modules forbidding an update. - */ - function testUpdateFieldForbid() { - $field = array('field_name' => 'forbidden', 'type' => 'test_field', 'settings' => array('changeable' => 0, 'unchangeable' => 0)); - $field = field_create_field($field); - $field['settings']['changeable']++; - try { - field_update_field($field); - $this->pass(t("A changeable setting can be updated.")); - } - catch (FieldException $e) { - $this->fail(t("An unchangeable setting cannot be updated.")); - } - $field['settings']['unchangeable']++; - try { - field_update_field($field); - $this->fail(t("An unchangeable setting can be updated.")); - } - catch (FieldException $e) { - $this->pass(t("An unchangeable setting cannot be updated.")); - } - } - - /** - * Test that fields are properly marked active or inactive. - */ - function testActive() { - $field_definition = array( - 'field_name' => 'field_1', - 'type' => 'test_field', - // For this test, we need a storage backend provided by a different - // module than field_test.module. - 'storage' => array( - 'type' => 'field_sql_storage', - ), - ); - field_create_field($field_definition); - - // Test disabling and enabling: - // - the field type module, - // - the storage module, - // - both. - $this->_testActiveHelper($field_definition, array('field_test')); - $this->_testActiveHelper($field_definition, array('field_sql_storage')); - $this->_testActiveHelper($field_definition, array('field_test', 'field_sql_storage')); - } - - /** - * Helper function for testActive(). - * - * Test dependency between a field and a set of modules. - * - * @param $field_definition - * A field definition. - * @param $modules - * An aray of module names. The field will be tested to be inactive as long - * as any of those modules is disabled. - */ - function _testActiveHelper($field_definition, $modules) { - $field_name = $field_definition['field_name']; - - // Read the field. - $field = field_read_field($field_name); - $this->assertTrue($field_definition <= $field, 'The field was properly read.'); - - module_disable($modules, FALSE); - - $fields = field_read_fields(array('field_name' => $field_name), array('include_inactive' => TRUE)); - $this->assertTrue(isset($fields[$field_name]) && $field_definition < $field, 'The field is properly read when explicitly fetching inactive fields.'); - - // Re-enable modules one by one, and check that the field is still inactive - // while some modules remain disabled. - while ($modules) { - $field = field_read_field($field_name); - $this->assertTrue(empty($field), format_string('%modules disabled. The field is marked inactive.', array('%modules' => implode(', ', $modules)))); - - $module = array_shift($modules); - module_enable(array($module), FALSE); - } - - // Check that the field is active again after all modules have been - // enabled. - $field = field_read_field($field_name); - $this->assertTrue($field_definition <= $field, 'The field was was marked active.'); - } -} - -class FieldInstanceCrudTestCase extends FieldTestCase { - protected $field; - - public static function getInfo() { - return array( - 'name' => 'Field instance CRUD tests', - 'description' => 'Create field entities by attaching fields to entities.', - 'group' => 'Field API', - ); - } - - function setUp() { - parent::setUp('field_test'); - - $this->field = array( - 'field_name' => drupal_strtolower($this->randomName()), - 'type' => 'test_field', - ); - field_create_field($this->field); - $this->instance_definition = array( - 'field_name' => $this->field['field_name'], - 'entity_type' => 'test_entity', - 'bundle' => 'test_bundle', - ); - } - - // TODO : test creation with - // - a full fledged $instance structure, check that all the values are there - // - a minimal $instance structure, check all default values are set - // defer actual $instance comparison to a helper function, used for the two cases above, - // and for testUpdateFieldInstance - - /** - * Test the creation of a field instance. - */ - function testCreateFieldInstance() { - field_create_instance($this->instance_definition); - - // Read the raw record from the {field_config_instance} table. - $result = db_query('SELECT * FROM {field_config_instance} WHERE field_name = :field_name AND bundle = :bundle', array(':field_name' => $this->instance_definition['field_name'], ':bundle' => $this->instance_definition['bundle'])); - $record = $result->fetchAssoc(); - $record['data'] = unserialize($record['data']); - - $field_type = field_info_field_types($this->field['type']); - $widget_type = field_info_widget_types($field_type['default_widget']); - $formatter_type = field_info_formatter_types($field_type['default_formatter']); - - // Check that default values are set. - $this->assertIdentical($record['data']['required'], FALSE, 'Required defaults to false.'); - $this->assertIdentical($record['data']['label'], $this->instance_definition['field_name'], 'Label defaults to field name.'); - $this->assertIdentical($record['data']['description'], '', 'Description defaults to empty string.'); - $this->assertIdentical($record['data']['widget']['type'], $field_type['default_widget'], 'Default widget has been written.'); - $this->assertTrue(isset($record['data']['display']['default']), 'Display for "full" view_mode has been written.'); - $this->assertIdentical($record['data']['display']['default']['type'], $field_type['default_formatter'], 'Default formatter for "full" view_mode has been written.'); - - // Check that default settings are set. - $this->assertIdentical($record['data']['settings'], $field_type['instance_settings'] , 'Default instance settings have been written.'); - $this->assertIdentical($record['data']['widget']['settings'], $widget_type['settings'] , 'Default widget settings have been written.'); - $this->assertIdentical($record['data']['display']['default']['settings'], $formatter_type['settings'], 'Default formatter settings for "full" view_mode have been written.'); - - // Guarantee that the field/bundle combination is unique. - try { - field_create_instance($this->instance_definition); - $this->fail(t('Cannot create two instances with the same field / bundle combination.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create two instances with the same field / bundle combination.')); - } - - // Check that the specified field exists. - try { - $this->instance_definition['field_name'] = $this->randomName(); - field_create_instance($this->instance_definition); - $this->fail(t('Cannot create an instance of a non-existing field.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create an instance of a non-existing field.')); - } - - // Create a field restricted to a specific entity type. - $field_restricted = array( - 'field_name' => drupal_strtolower($this->randomName()), - 'type' => 'test_field', - 'entity_types' => array('test_cacheable_entity'), - ); - field_create_field($field_restricted); - - // Check that an instance can be added to an entity type allowed - // by the field. - try { - $instance = $this->instance_definition; - $instance['field_name'] = $field_restricted['field_name']; - $instance['entity_type'] = 'test_cacheable_entity'; - field_create_instance($instance); - $this->pass(t('Can create an instance on an entity type allowed by the field.')); - } - catch (FieldException $e) { - $this->fail(t('Can create an instance on an entity type allowed by the field.')); - } - - // Check that an instance cannot be added to an entity type - // forbidden by the field. - try { - $instance = $this->instance_definition; - $instance['field_name'] = $field_restricted['field_name']; - field_create_instance($instance); - $this->fail(t('Cannot create an instance on an entity type forbidden by the field.')); - } - catch (FieldException $e) { - $this->pass(t('Cannot create an instance on an entity type forbidden by the field.')); - } - - // TODO: test other failures. - } - - /** - * Test reading back an instance definition. - */ - function testReadFieldInstance() { - field_create_instance($this->instance_definition); - - // Read the instance back. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertTrue($this->instance_definition < $instance, 'The field was properly read.'); - } - - /** - * Test the update of a field instance. - */ - function testUpdateFieldInstance() { - field_create_instance($this->instance_definition); - $field_type = field_info_field_types($this->field['type']); - - // Check that basic changes are saved. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $instance['required'] = !$instance['required']; - $instance['label'] = $this->randomName(); - $instance['description'] = $this->randomName(); - $instance['settings']['test_instance_setting'] = $this->randomName(); - $instance['widget']['settings']['test_widget_setting'] =$this->randomName(); - $instance['widget']['weight']++; - $instance['display']['default']['settings']['test_formatter_setting'] = $this->randomName(); - $instance['display']['default']['weight']++; - field_update_instance($instance); - - $instance_new = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertEqual($instance['required'], $instance_new['required'], '"required" change is saved'); - $this->assertEqual($instance['label'], $instance_new['label'], '"label" change is saved'); - $this->assertEqual($instance['description'], $instance_new['description'], '"description" change is saved'); - $this->assertEqual($instance['widget']['settings']['test_widget_setting'], $instance_new['widget']['settings']['test_widget_setting'], 'Widget setting change is saved'); - $this->assertEqual($instance['widget']['weight'], $instance_new['widget']['weight'], 'Widget weight change is saved'); - $this->assertEqual($instance['display']['default']['settings']['test_formatter_setting'], $instance_new['display']['default']['settings']['test_formatter_setting'], 'Formatter setting change is saved'); - $this->assertEqual($instance['display']['default']['weight'], $instance_new['display']['default']['weight'], 'Widget weight change is saved'); - - // Check that changing widget and formatter types updates the default settings. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $instance['widget']['type'] = 'test_field_widget_multiple'; - $instance['display']['default']['type'] = 'field_test_multiple'; - field_update_instance($instance); - - $instance_new = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertEqual($instance['widget']['type'], $instance_new['widget']['type'] , 'Widget type change is saved.'); - $settings = field_info_widget_settings($instance_new['widget']['type']); - $this->assertIdentical($settings, array_intersect_key($instance_new['widget']['settings'], $settings) , 'Widget type change updates default settings.'); - $this->assertEqual($instance['display']['default']['type'], $instance_new['display']['default']['type'] , 'Formatter type change is saved.'); - $info = field_info_formatter_types($instance_new['display']['default']['type']); - $settings = $info['settings']; - $this->assertIdentical($settings, array_intersect_key($instance_new['display']['default']['settings'], $settings) , 'Changing formatter type updates default settings.'); - - // Check that adding a new view mode is saved and gets default settings. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $instance['display']['teaser'] = array(); - field_update_instance($instance); - - $instance_new = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertTrue(isset($instance_new['display']['teaser']), 'Display for the new view_mode has been written.'); - $this->assertIdentical($instance_new['display']['teaser']['type'], $field_type['default_formatter'], 'Default formatter for the new view_mode has been written.'); - $info = field_info_formatter_types($instance_new['display']['teaser']['type']); - $settings = $info['settings']; - $this->assertIdentical($settings, $instance_new['display']['teaser']['settings'] , 'Default formatter settings for the new view_mode have been written.'); - - // TODO: test failures. - } - - /** - * Test the deletion of a field instance. - */ - function testDeleteFieldInstance() { - // TODO: Test deletion of the data stored in the field also. - // Need to check that data for a 'deleted' field / instance doesn't get loaded - // Need to check data marked deleted is cleaned on cron (not implemented yet...) - - // Create two instances for the same field so we can test that only one - // is deleted. - field_create_instance($this->instance_definition); - $this->another_instance_definition = $this->instance_definition; - $this->another_instance_definition['bundle'] .= '_another_bundle'; - $instance = field_create_instance($this->another_instance_definition); - - // Test that the first instance is not deleted, and then delete it. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle'], array('include_deleted' => TRUE)); - $this->assertTrue(!empty($instance) && empty($instance['deleted']), 'A new field instance is not marked for deletion.'); - field_delete_instance($instance); - - // Make sure the instance is marked as deleted when the instance is - // specifically loaded. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle'], array('include_deleted' => TRUE)); - $this->assertTrue(!empty($instance['deleted']), 'A deleted field instance is marked for deletion.'); - - // Try to load the instance normally and make sure it does not show up. - $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']); - $this->assertTrue(empty($instance), 'A deleted field instance is not loaded by default.'); - - // Make sure the other field instance is not deleted. - $another_instance = field_read_instance('test_entity', $this->another_instance_definition['field_name'], $this->another_instance_definition['bundle']); - $this->assertTrue(!empty($another_instance) && empty($another_instance['deleted']), 'A non-deleted field instance is not marked for deletion.'); - - // Make sure the field is deleted when its last instance is deleted. - field_delete_instance($another_instance); - $field = field_read_field($another_instance['field_name'], array('include_deleted' => TRUE)); - $this->assertTrue(!empty($field['deleted']), 'A deleted field is marked for deletion after all its instances have been marked for deletion.'); - } -} - -/** - * Unit test class for the multilanguage fields logic. - * - * The following tests will check the multilanguage logic of _field_invoke() and - * that only the correct values are returned by field_available_languages(). - */ -class FieldTranslationsTestCase extends FieldTestCase { - public static function getInfo() { - return array( - 'name' => 'Field translations tests', - 'description' => 'Test multilanguage fields logic.', - 'group' => 'Field API', - ); - } - - function setUp() { - parent::setUp('locale', 'field_test'); - - $this->field_name = drupal_strtolower($this->randomName() . '_field_name'); - - $this->entity_type = 'test_entity'; - - $field = array( - 'field_name' => $this->field_name, - 'type' => 'test_field', - 'cardinality' => 4, - 'translatable' => TRUE, - ); - field_create_field($field); - $this->field = field_read_field($this->field_name); - - $instance = array( - 'field_name' => $this->field_name, - 'entity_type' => $this->entity_type, - 'bundle' => 'test_bundle', - ); - field_create_instance($instance); - $this->instance = field_read_instance('test_entity', $this->field_name, 'test_bundle'); - - require_once DRUPAL_ROOT . '/includes/locale.inc'; - for ($i = 0; $i < 3; ++$i) { - locale_add_language('l' . $i, $this->randomString(), $this->randomString()); - } - } - - /** - * Ensures that only valid values are returned by field_available_languages(). - */ - function testFieldAvailableLanguages() { - // Test 'translatable' fieldable info. - field_test_entity_info_translatable('test_entity', FALSE); - $field = $this->field; - $field['field_name'] .= '_untranslatable'; - - // Enable field translations for the entity. - field_test_entity_info_translatable('test_entity', TRUE); - - // Test hook_field_languages() invocation on a translatable field. - variable_set('field_test_field_available_languages_alter', TRUE); - $enabled_languages = field_content_languages(); - $available_languages = field_available_languages($this->entity_type, $this->field); - foreach ($available_languages as $delta => $langcode) { - if ($langcode != 'xx' && $langcode != 'en') { - $this->assertTrue(in_array($langcode, $enabled_languages), format_string('%language is an enabled language.', array('%language' => $langcode))); - } - } - $this->assertTrue(in_array('xx', $available_languages), format_string('%language was made available.', array('%language' => 'xx'))); - $this->assertFalse(in_array('en', $available_languages), format_string('%language was made unavailable.', array('%language' => 'en'))); - - // Test field_available_languages() behavior for untranslatable fields. - $this->field['translatable'] = FALSE; - field_update_field($this->field); - $available_languages = field_available_languages($this->entity_type, $this->field); - $this->assertTrue(count($available_languages) == 1 && $available_languages[0] === LANGUAGE_NONE, 'For untranslatable fields only LANGUAGE_NONE is available.'); - } - - /** - * Test the multilanguage logic of _field_invoke(). - */ - function testFieldInvoke() { - // Enable field translations for the entity. - field_test_entity_info_translatable('test_entity', TRUE); - - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']); - - // Populate some extra languages to check if _field_invoke() correctly uses - // the result of field_available_languages(). - $values = array(); - $extra_languages = mt_rand(1, 4); - $languages = $available_languages = field_available_languages($this->entity_type, $this->field); - for ($i = 0; $i < $extra_languages; ++$i) { - $languages[] = $this->randomName(2); - } - - // For each given language provide some random values. - foreach ($languages as $langcode) { - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - $values[$langcode][$delta]['value'] = mt_rand(1, 127); - } - } - $entity->{$this->field_name} = $values; - - $results = _field_invoke('test_op', $entity_type, $entity); - foreach ($results as $langcode => $result) { - $hash = hash('sha256', serialize(array($entity_type, $entity, $this->field_name, $langcode, $values[$langcode]))); - // Check whether the parameters passed to _field_invoke() were correctly - // forwarded to the callback function. - $this->assertEqual($hash, $result, format_string('The result for %language is correctly stored.', array('%language' => $langcode))); - } - - $this->assertEqual(count($results), count($available_languages), 'No unavailable language has been processed.'); - } - - /** - * Test the multilanguage logic of _field_invoke_multiple(). - */ - function testFieldInvokeMultiple() { - // Enable field translations for the entity. - field_test_entity_info_translatable('test_entity', TRUE); - - $values = array(); - $options = array(); - $entities = array(); - $entity_type = 'test_entity'; - $entity_count = 5; - $available_languages = field_available_languages($this->entity_type, $this->field); - - for ($id = 1; $id <= $entity_count; ++$id) { - $entity = field_test_create_stub_entity($id, $id, $this->instance['bundle']); - $languages = $available_languages; - - // Populate some extra languages to check whether _field_invoke() - // correctly uses the result of field_available_languages(). - $extra_languages = mt_rand(1, 4); - for ($i = 0; $i < $extra_languages; ++$i) { - $languages[] = $this->randomName(2); - } - - // For each given language provide some random values. - $language_count = count($languages); - for ($i = 0; $i < $language_count; ++$i) { - $langcode = $languages[$i]; - // Avoid to populate at least one field translation to check that - // per-entity language suggestions work even when available field values - // are different for each language. - if ($i !== $id) { - for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { - $values[$id][$langcode][$delta]['value'] = mt_rand(1, 127); - } - } - // Ensure that a language for which there is no field translation is - // used as display language to prepare per-entity language suggestions. - elseif (!isset($display_language)) { - $display_language = $langcode; - } - } - - $entity->{$this->field_name} = $values[$id]; - $entities[$id] = $entity; - - // Store per-entity language suggestions. - $options['language'][$id] = field_language($entity_type, $entity, NULL, $display_language); - } - - $grouped_results = _field_invoke_multiple('test_op_multiple', $entity_type, $entities); - foreach ($grouped_results as $id => $results) { - foreach ($results as $langcode => $result) { - if (isset($values[$id][$langcode])) { - $hash = hash('sha256', serialize(array($entity_type, $entities[$id], $this->field_name, $langcode, $values[$id][$langcode]))); - // Check whether the parameters passed to _field_invoke_multiple() - // were correctly forwarded to the callback function. - $this->assertEqual($hash, $result, format_string('The result for entity %id/%language is correctly stored.', array('%id' => $id, '%language' => $langcode))); - } - } - $this->assertEqual(count($results), count($available_languages), format_string('No unavailable language has been processed for entity %id.', array('%id' => $id))); - } - - $null = NULL; - $grouped_results = _field_invoke_multiple('test_op_multiple', $entity_type, $entities, $null, $null, $options); - foreach ($grouped_results as $id => $results) { - foreach ($results as $langcode => $result) { - $this->assertTrue(isset($options['language'][$id]), format_string('The result language %language for entity %id was correctly suggested (display language: %display_language).', array('%id' => $id, '%language' => $langcode, '%display_language' => $display_language))); - } - } - } - - /** - * Test translatable fields storage/retrieval. - */ - function testTranslatableFieldSaveLoad() { - // Enable field translations for nodes. - field_test_entity_info_translatable('node', TRUE); - $entity_info = entity_get_info('node'); - $this->assertTrue(count($entity_info['translation']), 'Nodes are translatable.'); - - // Prepare the field translations. - field_test_entity_info_translatable('test_entity', TRUE); - $eid = $evid = 1; - $entity_type = 'test_entity'; - $entity = field_test_create_stub_entity($eid, $evid, $this->instance['bundle']); - $field_translations = array(); - $available_languages = field_available_languages($entity_type, $this->field); - $this->assertTrue(count($available_languages) > 1, 'Field is translatable.'); - foreach ($available_languages as $langcode) { - $field_translations[$langcode] = $this->_generateTestFieldValues($this->field['cardinality']); - } - - // Save and reload the field translations. - $entity->{$this->field_name} = $field_translations; - field_attach_insert($entity_type, $entity); - unset($entity->{$this->field_name}); - field_attach_load($entity_type, array($eid => $entity)); - - // Check if the correct values were saved/loaded. - foreach ($field_translations as $langcode => $items) { - $result = TRUE; - foreach ($items as $delta => $item) { - $result = $result && $item['value'] == $entity->{$this->field_name}[$langcode][$delta]['value']; - } - $this->assertTrue($result, format_string('%language translation correctly handled.', array('%language' => $langcode))); - } - } - - /** - * Tests display language logic for translatable fields. - */ - function testFieldDisplayLanguage() { - $field_name = drupal_strtolower($this->randomName() . '_field_name'); - $entity_type = 'test_entity'; - - // We need an additional field here to properly test display language - // suggestions. - $field = array( - 'field_name' => $field_name, - 'type' => 'test_field', - 'cardinality' => 2, - 'translatable' => TRUE, - ); - field_create_field($field); - - $instance = array( - 'field_name' => $field['field_name'], - 'entity_type' => $entity_type, - 'bundle' => 'test_bundle', - ); - field_create_instance($instance); - - $entity = field_test_create_stub_entity(1, 1, $this->instance['bundle']); - $instances = field_info_instances($entity_type, $this->instance['bundle']); - - $enabled_languages = field_content_languages(); - $languages = array(); - - // Generate field translations for languages different from the first - // enabled. - foreach ($instances as $instance) { - $field_name = $instance['field_name']; - $field = field_info_field($field_name); - do { - // Index 0 is reserved for the requested language, this way we ensure - // that no field is actually populated with it. - $langcode = $enabled_languages[mt_rand(1, count($enabled_languages) - 1)]; - } - while (isset($languages[$langcode])); - $languages[$langcode] = TRUE; - $entity->{$field_name}[$langcode] = $this->_generateTestFieldValues($field['cardinality']); - } - - // Test multiple-fields display languages for untranslatable entities. - field_test_entity_info_translatable($entity_type, FALSE); - drupal_static_reset('field_language'); - $requested_language = $enabled_languages[0]; - $display_language = field_language($entity_type, $entity, NULL, $requested_language); - foreach ($instances as $instance) { - $field_name = $instance['field_name']; - $this->assertTrue($display_language[$field_name] == LANGUAGE_NONE, format_string('The display language for field %field_name is %language.', array('%field_name' => $field_name, '%language' => LANGUAGE_NONE))); - } - - // Test multiple-fields display languages for translatable entities. - field_test_entity_info_translatable($entity_type, TRUE); - drupal_static_reset('field_language'); - $display_language = field_language($entity_type, $entity, NULL, $requested_language); - - foreach ($instances as $instance) { - $field_name = $instance['field_name']; - $langcode = $display_language[$field_name]; - // As the requested language was not assinged to any field, if the - // returned language is defined for the current field, core fallback rules - // were successfully applied. - $this->assertTrue(isset($entity->{$field_name}[$langcode]) && $langcode != $requested_language, format_string('The display language for the field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); - } - - // Test single-field display language. - drupal_static_reset('field_language'); - $langcode = field_language($entity_type, $entity, $this->field_name, $requested_language); - $this->assertTrue(isset($entity->{$this->field_name}[$langcode]) && $langcode != $requested_language, format_string('The display language for the (single) field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode))); - - // Test field_language() basic behavior without language fallback. - variable_set('field_test_language_fallback', FALSE); - $entity->{$this->field_name}[$requested_language] = mt_rand(1, 127); - drupal_static_reset('field_language'); - $display_language = field_language($entity_type, $entity, $this->field_name, $requested_language); - $this->assertEqual($display_language, $requested_language, 'Display language behave correctly when language fallback is disabled'); - } - - /** - * Tests field translations when creating a new revision. - */ - function testFieldFormTranslationRevisions() { - $web_user = $this->drupalCreateUser(array('access field_test content', 'administer field_test content')); - $this->drupalLogin($web_user); - - // Prepare the field translations. - field_test_entity_info_translatable($this->entity_type, TRUE); - $eid = 1; - $entity = field_test_create_stub_entity($eid, $eid, $this->instance['bundle']); - $available_languages = array_flip(field_available_languages($this->entity_type, $this->field)); - unset($available_languages[LANGUAGE_NONE]); - $field_name = $this->field['field_name']; - - // Store the field translations. - $entity->is_new = TRUE; - foreach ($available_languages as $langcode => $value) { - $entity->{$field_name}[$langcode][0]['value'] = $value + 1; - } - field_test_entity_save($entity); - - // Create a new revision. - $langcode = field_valid_language(NULL); - $edit = array("{$field_name}[$langcode][0][value]" => $entity->{$field_name}[$langcode][0]['value'], 'revision' => TRUE); - $this->drupalPost('test-entity/manage/' . $eid . '/edit', $edit, t('Save')); - - // Check translation revisions. - $this->checkTranslationRevisions($eid, $eid, $available_languages); - $this->checkTranslationRevisions($eid, $eid + 1, $available_languages); - } - - /** - * Check if the field translation attached to the entity revision identified - * by the passed arguments were correctly stored. - */ - private function checkTranslationRevisions($eid, $evid, $available_languages) { - $field_name = $this->field['field_name']; - $entity = field_test_entity_test_load($eid, $evid); - foreach ($available_languages as $langcode => $value) { - $passed = isset($entity->{$field_name}[$langcode]) && $entity->{$field_name}[$langcode][0]['value'] == $value + 1; - $this->assertTrue($passed, format_string('The @language translation for revision @revision was correctly stored', array('@language' => $langcode, '@revision' => $entity->ftvid))); - } - } -} - -/** - * Unit test class for field bulk delete and batch purge functionality. - */ -class FieldBulkDeleteTestCase extends FieldTestCase { - protected $field; - - public static function getInfo() { - return array( - 'name' => 'Field bulk delete tests', - 'description' => 'Bulk delete fields and instances, and clean up afterwards.', - 'group' => 'Field API', - ); - } - - /** - * Convenience function for Field API tests. - * - * Given an array of potentially fully-populated entities and an - * optional field name, generate an array of stub entities of the - * same fieldable type which contains the data for the field name - * (if given). - * - * @param $entity_type - * The entity type of $entities. - * @param $entities - * An array of entities of type $entity_type. - * @param $field_name - * Optional; a field name whose data should be copied from - * $entities into the returned stub entities. - * @return - * An array of stub entities corresponding to $entities. - */ - function _generateStubEntities($entity_type, $entities, $field_name = NULL) { - $stubs = array(); - foreach ($entities as $id => $entity) { - $stub = entity_create_stub_entity($entity_type, entity_extract_ids($entity_type, $entity)); - if (isset($field_name)) { - $stub->{$field_name} = $entity->{$field_name}; - } - $stubs[$id] = $stub; - } - return $stubs; - } - - /** - * Tests that the expected hooks have been invoked on the expected entities. - * - * @param $expected_hooks - * An array keyed by hook name, with one entry per expected invocation. - * Each entry is the value of the "$entity" parameter the hook is expected - * to have been passed. - * @param $actual_hooks - * The array of actual hook invocations recorded by field_test_memorize(). - */ - function checkHooksInvocations($expected_hooks, $actual_hooks) { - foreach ($expected_hooks as $hook => $invocations) { - $actual_invocations = $actual_hooks[$hook]; - - // Check that the number of invocations is correct. - $this->assertEqual(count($actual_invocations), count($invocations), "$hook() was called the expected number of times."); - - // Check that the hook was called for each expected argument. - foreach ($invocations as $argument) { - $found = FALSE; - foreach ($actual_invocations as $actual_arguments) { - if ($actual_arguments[1] == $argument) { - $found = TRUE; - break; - } - } - $this->assertTrue($found, "$hook() was called on expected argument"); - } - } - } - - function setUp() { - parent::setUp('field_test'); - - $this->fields = array(); - $this->instances = array(); - $this->entities = array(); - $this->entities_by_bundles = array(); - - // Create two bundles. - $this->bundles = array('bb_1' => 'bb_1', 'bb_2' => 'bb_2'); - foreach ($this->bundles as $name => $desc) { - field_test_create_bundle($name, $desc); - } - - // Create two fields. - $field = array('field_name' => 'bf_1', 'type' => 'test_field', 'cardinality' => 1); - $this->fields[] = field_create_field($field); - $field = array('field_name' => 'bf_2', 'type' => 'test_field', 'cardinality' => 4); - $this->fields[] = field_create_field($field); - - // For each bundle, create an instance of each field, and 10 - // entities with values for each field. - $id = 0; - $this->entity_type = 'test_entity'; - foreach ($this->bundles as $bundle) { - foreach ($this->fields as $field) { - $instance = array( - 'field_name' => $field['field_name'], - 'entity_type' => $this->entity_type, - 'bundle' => $bundle, - 'widget' => array( - 'type' => 'test_field_widget', - ) - ); - $this->instances[] = field_create_instance($instance); - } - - for ($i = 0; $i < 10; $i++) { - $entity = field_test_create_stub_entity($id, $id, $bundle); - foreach ($this->fields as $field) { - $entity->{$field['field_name']}[LANGUAGE_NONE] = $this->_generateTestFieldValues($field['cardinality']); - } - - $this->entities[$id] = $entity; - // Also keep track of the entities per bundle. - $this->entities_by_bundles[$bundle][$id] = $entity; - field_attach_insert($this->entity_type, $entity); - $id++; - } - } - } - - /** - * Verify that deleting an instance leaves the field data items in - * the database and that the appropriate Field API functions can - * operate on the deleted data and instance. - * - * This tests how EntityFieldQuery interacts with - * field_delete_instance() and could be moved to FieldCrudTestCase, - * but depends on this class's setUp(). - */ - function testDeleteFieldInstance() { - $bundle = reset($this->bundles); - $field = reset($this->fields); - - // There are 10 entities of this bundle. - $query = new EntityFieldQuery(); - $found = $query - ->fieldCondition($field) - ->entityCondition('bundle', $bundle) - ->execute(); - $this->assertEqual(count($found['test_entity']), 10, 'Correct number of entities found before deleting'); - - // Delete the instance. - $instance = field_info_instance($this->entity_type, $field['field_name'], $bundle); - field_delete_instance($instance); - - // The instance still exists, deleted. - $instances = field_read_instances(array('field_id' => $field['id'], 'deleted' => 1), array('include_deleted' => 1, 'include_inactive' => 1)); - $this->assertEqual(count($instances), 1, 'There is one deleted instance'); - $this->assertEqual($instances[0]['bundle'], $bundle, 'The deleted instance is for the correct bundle'); - - // There are 0 entities of this bundle with non-deleted data. - $query = new EntityFieldQuery(); - $found = $query - ->fieldCondition($field) - ->entityCondition('bundle', $bundle) - ->execute(); - $this->assertTrue(!isset($found['test_entity']), 'No entities found after deleting'); - - // There are 10 entities of this bundle when deleted fields are allowed, and - // their values are correct. - $query = new EntityFieldQuery(); - $found = $query - ->fieldCondition($field) - ->entityCondition('bundle', $bundle) - ->deleted(TRUE) - ->execute(); - field_attach_load($this->entity_type, $found[$this->entity_type], FIELD_LOAD_CURRENT, array('field_id' => $field['id'], 'deleted' => 1)); - $this->assertEqual(count($found['test_entity']), 10, 'Correct number of entities found after deleting'); - foreach ($found['test_entity'] as $id => $entity) { - $this->assertEqual($this->entities[$id]->{$field['field_name']}, $entity->{$field['field_name']}, "Entity $id with deleted data loaded correctly"); - } - } - - /** - * Verify that field data items and instances are purged when an - * instance is deleted. - */ - function testPurgeInstance() { - // Start recording hook invocations. - field_test_memorize(); - - $bundle = reset($this->bundles); - $field = reset($this->fields); - - // Delete the instance. - $instance = field_info_instance($this->entity_type, $field['field_name'], $bundle); - field_delete_instance($instance); - - // No field hooks were called. - $mem = field_test_memorize(); - $this->assertEqual(count($mem), 0, 'No field hooks were called'); - - $batch_size = 2; - for ($count = 8; $count >= 0; $count -= $batch_size) { - // Purge two entities. - field_purge_batch($batch_size); - - // There are $count deleted entities left. - $query = new EntityFieldQuery(); - $found = $query - ->fieldCondition($field) - ->entityCondition('bundle', $bundle) - ->deleted(TRUE) - ->execute(); - $this->assertEqual($count ? count($found['test_entity']) : count($found), $count, 'Correct number of entities found after purging 2'); - } - - // Check hooks invocations. - // - hook_field_load() (multiple hook) should have been called on all - // entities by pairs of two. - // - hook_field_delete() should have been called once for each entity in the - // bundle. - $actual_hooks = field_test_memorize(); - $hooks = array(); - $stubs = $this->_generateStubEntities($this->entity_type, $this->entities_by_bundles[$bundle], $field['field_name']); - foreach (array_chunk($stubs, $batch_size, TRUE) as $chunk) { - $hooks['field_test_field_load'][] = $chunk; - } - foreach ($stubs as $stub) { - $hooks['field_test_field_delete'][] = $stub; - } - $this->checkHooksInvocations($hooks, $actual_hooks); - - // The instance still exists, deleted. - $instances = field_read_instances(array('field_id' => $field['id'], 'deleted' => 1), array('include_deleted' => 1, 'include_inactive' => 1)); - $this->assertEqual(count($instances), 1, 'There is one deleted instance'); - - // Purge the instance. - field_purge_batch($batch_size); - - // The instance is gone. - $instances = field_read_instances(array('field_id' => $field['id'], 'deleted' => 1), array('include_deleted' => 1, 'include_inactive' => 1)); - $this->assertEqual(count($instances), 0, 'The instance is gone'); - - // The field still exists, not deleted, because it has a second instance. - $fields = field_read_fields(array('id' => $field['id']), array('include_deleted' => 1, 'include_inactive' => 1)); - $this->assertTrue(isset($fields[$field['id']]), 'The field exists and is not deleted'); - } - - /** - * Verify that fields are preserved and purged correctly as multiple - * instances are deleted and purged. - */ - function testPurgeField() { - // Start recording hook invocations. - field_test_memorize(); - - $field = reset($this->fields); - - // Delete the first instance. - $bundle = reset($this->bundles); - $instance = field_info_instance($this->entity_type, $field['field_name'], $bundle); - field_delete_instance($instance); - - // Assert that hook_field_delete() was not called yet. - $mem = field_test_memorize(); - $this->assertEqual(count($mem), 0, 'No field hooks were called.'); - - // Purge the data. - field_purge_batch(10); - - // Check hooks invocations. - // - hook_field_load() (multiple hook) should have been called once, for all - // entities in the bundle. - // - hook_field_delete() should have been called once for each entity in the - // bundle. - $actual_hooks = field_test_memorize(); - $hooks = array(); - $stubs = $this->_generateStubEntities($this->entity_type, $this->entities_by_bundles[$bundle], $field['field_name']); - $hooks['field_test_field_load'][] = $stubs; - foreach ($stubs as $stub) { - $hooks['field_test_field_delete'][] = $stub; - } - $this->checkHooksInvocations($hooks, $actual_hooks); - - // Purge again to purge the instance. - field_purge_batch(0); - - // The field still exists, not deleted. - $fields = field_read_fields(array('id' => $field['id']), array('include_deleted' => 1)); - $this->assertTrue(isset($fields[$field['id']]) && !$fields[$field['id']]['deleted'], 'The field exists and is not deleted'); - - // Delete the second instance. - $bundle = next($this->bundles); - $instance = field_info_instance($this->entity_type, $field['field_name'], $bundle); - field_delete_instance($instance); - - // Assert that hook_field_delete() was not called yet. - $mem = field_test_memorize(); - $this->assertEqual(count($mem), 0, 'No field hooks were called.'); - - // Purge the data. - field_purge_batch(10); - - // Check hooks invocations (same as above, for the 2nd bundle). - $actual_hooks = field_test_memorize(); - $hooks = array(); - $stubs = $this->_generateStubEntities($this->entity_type, $this->entities_by_bundles[$bundle], $field['field_name']); - $hooks['field_test_field_load'][] = $stubs; - foreach ($stubs as $stub) { - $hooks['field_test_field_delete'][] = $stub; - } - $this->checkHooksInvocations($hooks, $actual_hooks); - - // The field still exists, deleted. - $fields = field_read_fields(array('id' => $field['id']), array('include_deleted' => 1)); - $this->assertTrue(isset($fields[$field['id']]) && $fields[$field['id']]['deleted'], 'The field exists and is deleted'); - - // Purge again to purge the instance and the field. - field_purge_batch(0); - - // The field is gone. - $fields = field_read_fields(array('id' => $field['id']), array('include_deleted' => 1, 'include_inactive' => 1)); - $this->assertEqual(count($fields), 0, 'The field is purged.'); - } -} - -/** - * Tests entity properties. - */ -class EntityPropertiesTestCase extends FieldTestCase { - public static function getInfo() { - return array( - 'name' => 'Entity properties', - 'description' => 'Tests entity properties.', - 'group' => 'Entity API', - ); - } - - function setUp() { - parent::setUp('field_test'); - } - - /** - * Tests label key and label callback of an entity. - */ - function testEntityLabel() { - $entity_types = array( - 'test_entity_no_label', - 'test_entity_label', - 'test_entity_label_callback', - ); - - $entity = field_test_create_stub_entity(); - - foreach ($entity_types as $entity_type) { - $label = entity_label($entity_type, $entity); - - switch ($entity_type) { - case 'test_entity_no_label': - $this->assertFalse($label, 'Entity with no label property or callback returned FALSE.'); - break; - - case 'test_entity_label': - $this->assertEqual($label, $entity->ftlabel, 'Entity with label key returned correct label.'); - break; - - case 'test_entity_label_callback': - $this->assertEqual($label, 'label callback ' . $entity->ftlabel, 'Entity with label callback returned correct label.'); - break; - } - } - } -} diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc deleted file mode 100644 index c6686eb..0000000 --- a/modules/field/tests/field_test.entity.inc +++ /dev/null @@ -1,500 +0,0 @@ - array('label' => 'Test Bundle'))); - $test_entity_modes = array( - 'full' => array( - 'label' => t('Full object'), - 'custom settings' => TRUE, - ), - 'teaser' => array( - 'label' => t('Teaser'), - 'custom settings' => TRUE, - ), - ); - - return array( - 'test_entity' => array( - 'label' => t('Test Entity'), - 'fieldable' => TRUE, - 'field cache' => FALSE, - 'base table' => 'test_entity', - 'revision table' => 'test_entity_revision', - 'entity keys' => array( - 'id' => 'ftid', - 'revision' => 'ftvid', - 'bundle' => 'fttype', - ), - 'bundles' => $bundles, - 'view modes' => $test_entity_modes, - ), - // This entity type doesn't get form handling for now... - 'test_cacheable_entity' => array( - 'label' => t('Test Entity, cacheable'), - 'fieldable' => TRUE, - 'field cache' => TRUE, - 'entity keys' => array( - 'id' => 'ftid', - 'revision' => 'ftvid', - 'bundle' => 'fttype', - ), - 'bundles' => $bundles, - 'view modes' => $test_entity_modes, - ), - 'test_entity_bundle_key' => array( - 'label' => t('Test Entity with a bundle key.'), - 'base table' => 'test_entity_bundle_key', - 'fieldable' => TRUE, - 'field cache' => FALSE, - 'entity keys' => array( - 'id' => 'ftid', - 'bundle' => 'fttype', - ), - 'bundles' => array('bundle1' => array('label' => 'Bundle1'), 'bundle2' => array('label' => 'Bundle2')) + $bundles, - 'view modes' => $test_entity_modes, - ), - // In this case, the bundle key is not stored in the database. - 'test_entity_bundle' => array( - 'label' => t('Test Entity with a specified bundle.'), - 'base table' => 'test_entity_bundle', - 'fieldable' => TRUE, - 'controller class' => 'TestEntityBundleController', - 'field cache' => FALSE, - 'entity keys' => array( - 'id' => 'ftid', - 'bundle' => 'fttype', - ), - 'bundles' => array('test_entity_2' => array('label' => 'Test entity 2')) + $bundles, - 'view modes' => $test_entity_modes, - ), - // @see EntityPropertiesTestCase::testEntityLabel() - 'test_entity_no_label' => array( - 'label' => t('Test entity without label'), - 'fieldable' => TRUE, - 'field cache' => FALSE, - 'base table' => 'test_entity', - 'entity keys' => array( - 'id' => 'ftid', - 'revision' => 'ftvid', - 'bundle' => 'fttype', - ), - 'bundles' => $bundles, - 'view modes' => $test_entity_modes, - ), - 'test_entity_label' => array( - 'label' => t('Test entity label'), - 'fieldable' => TRUE, - 'field cache' => FALSE, - 'base table' => 'test_entity', - 'entity keys' => array( - 'id' => 'ftid', - 'revision' => 'ftvid', - 'bundle' => 'fttype', - 'label' => 'ftlabel', - ), - 'bundles' => $bundles, - 'view modes' => $test_entity_modes, - ), - 'test_entity_label_callback' => array( - 'label' => t('Test entity label callback'), - 'fieldable' => TRUE, - 'field cache' => FALSE, - 'base table' => 'test_entity', - 'label callback' => 'field_test_entity_label_callback', - 'entity keys' => array( - 'id' => 'ftid', - 'revision' => 'ftvid', - 'bundle' => 'fttype', - ), - 'bundles' => $bundles, - 'view modes' => $test_entity_modes, - ), - ); -} - -/** - * Implements hook_entity_info_alter(). - */ -function field_test_entity_info_alter(&$entity_info) { - // Enable/disable field_test as a translation handler. - foreach (field_test_entity_info_translatable() as $entity_type => $translatable) { - $entity_info[$entity_type]['translation']['field_test'] = $translatable; - } - // Disable locale as a translation handler. - foreach ($entity_info as $entity_type => $info) { - $entity_info[$entity_type]['translation']['locale'] = FALSE; - } -} - -/** - * Helper function to enable entity translations. - */ -function field_test_entity_info_translatable($entity_type = NULL, $translatable = NULL) { - drupal_static_reset('field_has_translation_handler'); - $stored_value = &drupal_static(__FUNCTION__, array()); - if (isset($entity_type)) { - $stored_value[$entity_type] = $translatable; - entity_info_cache_clear(); - } - return $stored_value; -} - -/** - * Creates a new bundle for test_entity entities. - * - * @param $bundle - * The machine-readable name of the bundle. - * @param $text - * The human-readable name of the bundle. If none is provided, the machine - * name will be used. - */ -function field_test_create_bundle($bundle, $text = NULL) { - $bundles = variable_get('field_test_bundles', array('test_bundle' => array('label' => 'Test Bundle'))); - $bundles += array($bundle => array('label' => $text ? $text : $bundle)); - variable_set('field_test_bundles', $bundles); - - $info = field_test_entity_info(); - foreach ($info as $type => $type_info) { - field_attach_create_bundle($type, $bundle); - } -} - -/** - * Renames a bundle for test_entity entities. - * - * @param $bundle_old - * The machine-readable name of the bundle to rename. - * @param $bundle_new - * The new machine-readable name of the bundle. - */ -function field_test_rename_bundle($bundle_old, $bundle_new) { - $bundles = variable_get('field_test_bundles', array('test_bundle' => array('label' => 'Test Bundle'))); - $bundles[$bundle_new] = $bundles[$bundle_old]; - unset($bundles[$bundle_old]); - variable_set('field_test_bundles', $bundles); - - $info = field_test_entity_info(); - foreach ($info as $type => $type_info) { - field_attach_rename_bundle($type, $bundle_old, $bundle_new); - } -} - -/** - * Deletes a bundle for test_entity objects. - * - * @param $bundle - * The machine-readable name of the bundle to delete. - */ -function field_test_delete_bundle($bundle) { - $bundles = variable_get('field_test_bundles', array('test_bundle' => array('label' => 'Test Bundle'))); - unset($bundles[$bundle]); - variable_set('field_test_bundles', $bundles); - - $info = field_test_entity_info(); - foreach ($info as $type => $type_info) { - field_attach_delete_bundle($type, $bundle); - } -} - -/** - * Creates a basic test_entity entity. - */ -function field_test_create_stub_entity($id = 1, $vid = 1, $bundle = 'test_bundle', $label = '') { - $entity = new stdClass(); - // Only set id and vid properties if they don't come as NULL (creation form). - if (isset($id)) { - $entity->ftid = $id; - } - if (isset($vid)) { - $entity->ftvid = $vid; - } - $entity->fttype = $bundle; - - $label = !empty($label) ? $label : $bundle . ' label'; - $entity->ftlabel = $label; - - return $entity; -} - -/** - * Loads a test_entity. - * - * @param $ftid - * The id of the entity to load. - * @param $ftvid - * (Optional) The revision id of the entity to load. If not specified, the - * current revision will be used. - * @return - * The loaded entity. - */ -function field_test_entity_test_load($ftid, $ftvid = NULL) { - // Load basic strucure. - $query = db_select('test_entity', 'fte', array()) - ->condition('fte.ftid', $ftid); - - if ($ftvid) { - $query->join('test_entity_revision', 'fter', 'fte.ftid = fter.ftid'); - $query->addField('fte', 'ftid'); - $query->addField('fte', 'fttype'); - $query->addField('fter', 'ftvid'); - $query->condition('fter.ftvid', $ftvid); - } - else { - $query->fields('fte'); - } - - $entities = $query->execute()->fetchAllAssoc('ftid'); - - // Attach fields. - if ($ftvid) { - field_attach_load_revision('test_entity', $entities); - } - else { - field_attach_load('test_entity', $entities); - } - - return $entities[$ftid]; -} - -/** - * Saves a test_entity. - * - * A new entity is created if $entity->ftid and $entity->is_new are both empty. - * A new revision is created if $entity->revision is not empty. - * - * @param $entity - * The entity to save. - */ -function field_test_entity_save(&$entity) { - field_attach_presave('test_entity', $entity); - - if (!isset($entity->is_new)) { - $entity->is_new = empty($entity->ftid); - } - - if (!$entity->is_new && !empty($entity->revision)) { - $entity->old_ftvid = $entity->ftvid; - unset($entity->ftvid); - } - - $update_entity = TRUE; - if ($entity->is_new) { - drupal_write_record('test_entity', $entity); - drupal_write_record('test_entity_revision', $entity); - $op = 'insert'; - } - else { - drupal_write_record('test_entity', $entity, 'ftid'); - if (!empty($entity->revision)) { - drupal_write_record('test_entity_revision', $entity); - } - else { - drupal_write_record('test_entity_revision', $entity, 'ftvid'); - $update_entity = FALSE; - } - $op = 'update'; - } - if ($update_entity) { - db_update('test_entity') - ->fields(array('ftvid' => $entity->ftvid)) - ->condition('ftid', $entity->ftid) - ->execute(); - } - - // Save fields. - $function = "field_attach_$op"; - $function('test_entity', $entity); -} - -/** - * Menu callback: displays the 'Add new test_entity' form. - */ -function field_test_entity_add($fttype) { - $fttype = str_replace('-', '_', $fttype); - $entity = (object)array('fttype' => $fttype); - drupal_set_title(t('Create test_entity @bundle', array('@bundle' => $fttype)), PASS_THROUGH); - return drupal_get_form('field_test_entity_form', $entity, TRUE); -} - -/** - * Menu callback: displays the 'Edit exiisting test_entity' form. - */ -function field_test_entity_edit($entity) { - drupal_set_title(t('test_entity @ftid revision @ftvid', array('@ftid' => $entity->ftid, '@ftvid' => $entity->ftvid)), PASS_THROUGH); - return drupal_get_form('field_test_entity_form', $entity); -} - -/** - * Test_entity form. - */ -function field_test_entity_form($form, &$form_state, $entity, $add = FALSE) { - // During initial form build, add the entity to the form state for use during - // form building and processing. During a rebuild, use what is in the form - // state. - if (!isset($form_state['test_entity'])) { - $form_state['test_entity'] = $entity; - } - else { - $entity = $form_state['test_entity']; - } - - foreach (array('ftid', 'ftvid', 'fttype') as $key) { - $form[$key] = array( - '#type' => 'value', - '#value' => isset($entity->$key) ? $entity->$key : NULL, - ); - } - - // Add field widgets. - field_attach_form('test_entity', $entity, $form, $form_state); - - if (!$add) { - $form['revision'] = array( - '#access' => user_access('administer field_test content'), - '#type' => 'checkbox', - '#title' => t('Create new revision'), - '#default_value' => FALSE, - '#weight' => 100, - ); - } - $form['submit'] = array( - '#type' => 'submit', - '#value' => t('Save'), - '#weight' => 101, - ); - - return $form; -} - -/** - * Validate handler for field_test_entity_form(). - */ -function field_test_entity_form_validate($form, &$form_state) { - entity_form_field_validate('test_entity', $form, $form_state); -} - -/** - * Submit handler for field_test_entity_form(). - */ -function field_test_entity_form_submit($form, &$form_state) { - $entity = field_test_entity_form_submit_build_test_entity($form, $form_state); - $insert = empty($entity->ftid); - field_test_entity_save($entity); - - $message = $insert ? t('test_entity @id has been created.', array('@id' => $entity->ftid)) : t('test_entity @id has been updated.', array('@id' => $entity->ftid)); - drupal_set_message($message); - - if ($entity->ftid) { - $form_state['redirect'] = 'test-entity/manage/' . $entity->ftid . '/edit'; - } - else { - // Error on save. - drupal_set_message(t('The entity could not be saved.'), 'error'); - $form_state['rebuild'] = TRUE; - } -} - -/** - * Updates the form state's entity by processing this submission's values. - */ -function field_test_entity_form_submit_build_test_entity($form, &$form_state) { - $entity = $form_state['test_entity']; - entity_form_submit_build_entity('test_entity', $entity, $form, $form_state); - return $entity; -} - -/** - * Form combining two separate entities. - */ -function field_test_entity_nested_form($form, &$form_state, $entity_1, $entity_2) { - // First entity. - foreach (array('ftid', 'ftvid', 'fttype') as $key) { - $form[$key] = array( - '#type' => 'value', - '#value' => $entity_1->$key, - ); - } - field_attach_form('test_entity', $entity_1, $form, $form_state); - - // Second entity. - $form['entity_2'] = array( - '#type' => 'fieldset', - '#title' => t('Second entity'), - '#tree' => TRUE, - '#parents' => array('entity_2'), - '#weight' => 50, - ); - foreach (array('ftid', 'ftvid', 'fttype') as $key) { - $form['entity_2'][$key] = array( - '#type' => 'value', - '#value' => $entity_2->$key, - ); - } - field_attach_form('test_entity', $entity_2, $form['entity_2'], $form_state); - - $form['save'] = array( - '#type' => 'submit', - '#value' => t('Save'), - '#weight' => 100, - ); - - return $form; -} - -/** - * Validate handler for field_test_entity_nested_form(). - */ -function field_test_entity_nested_form_validate($form, &$form_state) { - $entity_1 = (object) $form_state['values']; - field_attach_form_validate('test_entity', $entity_1, $form, $form_state); - - $entity_2 = (object) $form_state['values']['entity_2']; - field_attach_form_validate('test_entity', $entity_2, $form['entity_2'], $form_state); -} - -/** - * Submit handler for field_test_entity_nested_form(). - */ -function field_test_entity_nested_form_submit($form, &$form_state) { - $entity_1 = (object) $form_state['values']; - field_attach_submit('test_entity', $entity_1, $form, $form_state); - field_test_entity_save($entity_1); - - $entity_2 = (object) $form_state['values']['entity_2']; - field_attach_submit('test_entity', $entity_2, $form['entity_2'], $form_state); - field_test_entity_save($entity_2); - - drupal_set_message(t('test_entities @id_1 and @id_2 have been updated.', array('@id_1' => $entity_1->ftid, '@id_2' => $entity_2->ftid))); -} - -/** - * Controller class for the test_entity_bundle entity type. - * - * This extends the DrupalDefaultEntityController class, adding required - * special handling for bundles (since they are not stored in the database). - */ -class TestEntityBundleController extends DrupalDefaultEntityController { - - protected function attachLoad(&$entities, $revision_id = FALSE) { - // Add bundle information. - foreach ($entities as $key => $entity) { - $entity->fttype = 'test_entity_bundle'; - $entities[$key] = $entity; - } - parent::attachLoad($entities, $revision_id); - } -} diff --git a/modules/field/tests/field_test.field.inc b/modules/field/tests/field_test.field.inc deleted file mode 100644 index 1cab773..0000000 --- a/modules/field/tests/field_test.field.inc +++ /dev/null @@ -1,413 +0,0 @@ - array( - 'label' => t('Test field'), - 'description' => t('Dummy field type used for tests.'), - 'settings' => array( - 'test_field_setting' => 'dummy test string', - 'changeable' => 'a changeable field setting', - 'unchangeable' => 'an unchangeable field setting', - ), - 'instance_settings' => array( - 'test_instance_setting' => 'dummy test string', - 'test_hook_field_load' => FALSE, - ), - 'default_widget' => 'test_field_widget', - 'default_formatter' => 'field_test_default', - ), - 'shape' => array( - 'label' => t('Shape'), - 'description' => t('Another dummy field type.'), - 'settings' => array( - 'foreign_key_name' => 'shape', - ), - 'instance_settings' => array(), - 'default_widget' => 'test_field_widget', - 'default_formatter' => 'field_test_default', - ), - 'hidden_test_field' => array( - 'no_ui' => TRUE, - 'label' => t('Hidden from UI test field'), - 'description' => t('Dummy hidden field type used for tests.'), - 'settings' => array(), - 'instance_settings' => array(), - 'default_widget' => 'test_field_widget', - 'default_formatter' => 'field_test_default', - ), - ); -} - -/** - * Implements hook_field_update_forbid(). - */ -function field_test_field_update_forbid($field, $prior_field, $has_data) { - if ($field['type'] == 'test_field' && $field['settings']['unchangeable'] != $prior_field['settings']['unchangeable']) { - throw new FieldException("field_test 'unchangeable' setting cannot be changed'"); - } -} - -/** - * Implements hook_field_load(). - */ -function field_test_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) { - $args = func_get_args(); - field_test_memorize(__FUNCTION__, $args); - - foreach ($items as $id => $item) { - // To keep the test non-intrusive, only act for instances with the - // test_hook_field_load setting explicitly set to TRUE. - if ($instances[$id]['settings']['test_hook_field_load']) { - foreach ($item as $delta => $value) { - // Don't add anything on empty values. - if ($value) { - $items[$id][$delta]['additional_key'] = 'additional_value'; - } - } - } - } -} - -/** - * Implements hook_field_insert(). - */ -function field_test_field_insert($entity_type, $entity, $field, $instance, $items) { - $args = func_get_args(); - field_test_memorize(__FUNCTION__, $args); -} - -/** - * Implements hook_field_update(). - */ -function field_test_field_update($entity_type, $entity, $field, $instance, $items) { - $args = func_get_args(); - field_test_memorize(__FUNCTION__, $args); -} - -/** - * Implements hook_field_delete(). - */ -function field_test_field_delete($entity_type, $entity, $field, $instance, $items) { - $args = func_get_args(); - field_test_memorize(__FUNCTION__, $args); -} - -/** - * Implements hook_field_validate(). - * - * Possible error codes: - * - 'field_test_invalid': The value is invalid. - */ -function field_test_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) { - $args = func_get_args(); - field_test_memorize(__FUNCTION__, $args); - - foreach ($items as $delta => $item) { - if ($item['value'] == -1) { - $errors[$field['field_name']][$langcode][$delta][] = array( - 'error' => 'field_test_invalid', - 'message' => t('%name does not accept the value -1.', array('%name' => $instance['label'])), - ); - } - } -} - -/** - * Implements hook_field_is_empty(). - */ -function field_test_field_is_empty($item, $field) { - return empty($item['value']); -} - -/** - * Implements hook_field_settings_form(). - */ -function field_test_field_settings_form($field, $instance, $has_data) { - $settings = $field['settings']; - - $form['test_field_setting'] = array( - '#type' => 'textfield', - '#title' => t('Field test field setting'), - '#default_value' => $settings['test_field_setting'], - '#required' => FALSE, - '#description' => t('A dummy form element to simulate field setting.'), - ); - - return $form; -} - -/** - * Implements hook_field_instance_settings_form(). - */ -function field_test_field_instance_settings_form($field, $instance) { - $settings = $instance['settings']; - - $form['test_instance_setting'] = array( - '#type' => 'textfield', - '#title' => t('Field test field instance setting'), - '#default_value' => $settings['test_instance_setting'], - '#required' => FALSE, - '#description' => t('A dummy form element to simulate field instance setting.'), - ); - - return $form; -} - -/** - * Implements hook_field_widget_info(). - */ -function field_test_field_widget_info() { - return array( - 'test_field_widget' => array( - 'label' => t('Test field'), - 'field types' => array('test_field', 'hidden_test_field'), - 'settings' => array('test_widget_setting' => 'dummy test string'), - ), - 'test_field_widget_multiple' => array( - 'label' => t('Test field 1'), - 'field types' => array('test_field'), - 'settings' => array('test_widget_setting_multiple' => 'dummy test string'), - 'behaviors' => array( - 'multiple values' => FIELD_BEHAVIOR_CUSTOM, - ), - ), - ); -} - -/** - * Implements hook_field_widget_form(). - */ -function field_test_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) { - switch ($instance['widget']['type']) { - case 'test_field_widget': - $element += array( - '#type' => 'textfield', - '#default_value' => isset($items[$delta]['value']) ? $items[$delta]['value'] : '', - ); - return array('value' => $element); - - case 'test_field_widget_multiple': - $values = array(); - foreach ($items as $delta => $value) { - $values[] = $value['value']; - } - $element += array( - '#type' => 'textfield', - '#default_value' => implode(', ', $values), - '#element_validate' => array('field_test_widget_multiple_validate'), - ); - return $element; - } -} - -/** - * Form element validation handler for 'test_field_widget_multiple' widget. - */ -function field_test_widget_multiple_validate($element, &$form_state) { - $values = array_map('trim', explode(',', $element['#value'])); - $items = array(); - foreach ($values as $value) { - $items[] = array('value' => $value); - } - form_set_value($element, $items, $form_state); -} - -/** - * Implements hook_field_widget_error(). - */ -function field_test_field_widget_error($element, $error, $form, &$form_state) { - // @todo No easy way to differenciate widget types, we should receive it as a - // parameter. - if (isset($element['value'])) { - // Widget is test_field_widget. - $error_element = $element['value']; - } - else { - // Widget is test_field_widget_multiple. - $error_element = $element; - } - - form_error($error_element, $error['message']); -} - -/** - * Implements hook_field_widget_settings_form(). - */ -function field_test_field_widget_settings_form($field, $instance) { - $widget = $instance['widget']; - $settings = $widget['settings']; - - $form['test_widget_setting'] = array( - '#type' => 'textfield', - '#title' => t('Field test field widget setting'), - '#default_value' => $settings['test_widget_setting'], - '#required' => FALSE, - '#description' => t('A dummy form element to simulate field widget setting.'), - ); - - return $form; -} - -/** - * Implements hook_field_formatter_info(). - */ -function field_test_field_formatter_info() { - return array( - 'field_test_default' => array( - 'label' => t('Default'), - 'description' => t('Default formatter'), - 'field types' => array('test_field'), - 'settings' => array( - 'test_formatter_setting' => 'dummy test string', - ), - ), - 'field_test_multiple' => array( - 'label' => t('Multiple'), - 'description' => t('Multiple formatter'), - 'field types' => array('test_field'), - 'settings' => array( - 'test_formatter_setting_multiple' => 'dummy test string', - ), - ), - 'field_test_with_prepare_view' => array( - 'label' => t('Tests hook_field_formatter_prepare_view()'), - 'field types' => array('test_field'), - 'settings' => array( - 'test_formatter_setting_additional' => 'dummy test string', - ), - ), - ); -} - -/** - * Implements hook_field_formatter_settings_form(). - */ -function field_test_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) { - $display = $instance['display'][$view_mode]; - $settings = $display['settings']; - - $element = array(); - - // The name of the setting depends on the formatter type. - $map = array( - 'field_test_default' => 'test_formatter_setting', - 'field_test_multiple' => 'test_formatter_setting_multiple', - 'field_test_with_prepare_view' => 'test_formatter_setting_additional', - ); - - if (isset($map[$display['type']])) { - $name = $map[$display['type']]; - - $element[$name] = array( - '#title' => t('Setting'), - '#type' => 'textfield', - '#size' => 20, - '#default_value' => $settings[$name], - '#required' => TRUE, - ); - } - - return $element; -} - -/** - * Implements hook_field_formatter_settings_summary(). - */ -function field_test_field_formatter_settings_summary($field, $instance, $view_mode) { - $display = $instance['display'][$view_mode]; - $settings = $display['settings']; - - $summary = ''; - - // The name of the setting depends on the formatter type. - $map = array( - 'field_test_default' => 'test_formatter_setting', - 'field_test_multiple' => 'test_formatter_setting_multiple', - 'field_test_with_prepare_view' => 'test_formatter_setting_additional', - ); - - if (isset($map[$display['type']])) { - $name = $map[$display['type']]; - $summary = t('@setting: @value', array('@setting' => $name, '@value' => $settings[$name])); - } - - return $summary; -} - -/** - * Implements hook_field_formatter_prepare_view(). - */ -function field_test_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) { - foreach ($items as $id => $item) { - // To keep the test non-intrusive, only act on the - // 'field_test_with_prepare_view' formatter. - if ($displays[$id]['type'] == 'field_test_with_prepare_view') { - foreach ($item as $delta => $value) { - // Don't add anything on empty values. - if ($value) { - $items[$id][$delta]['additional_formatter_value'] = $value['value'] + 1; - } - } - } - } -} - -/** - * Implements hook_field_formatter_view(). - */ -function field_test_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) { - $element = array(); - $settings = $display['settings']; - - switch ($display['type']) { - case 'field_test_default': - foreach ($items as $delta => $item) { - $element[$delta] = array('#markup' => $settings['test_formatter_setting'] . '|' . $item['value']); - } - break; - - case 'field_test_with_prepare_view': - foreach ($items as $delta => $item) { - $element[$delta] = array('#markup' => $settings['test_formatter_setting_additional'] . '|' . $item['value'] . '|' . $item['additional_formatter_value']); - } - break; - - case 'field_test_multiple': - if (!empty($items)) { - $array = array(); - foreach ($items as $delta => $item) { - $array[] = $delta . ':' . $item['value']; - } - $element[0] = array('#markup' => $settings['test_formatter_setting_multiple'] . '|' . implode('|', $array)); - } - break; - } - - return $element; -} - -/** - * Sample 'default value' callback. - */ -function field_test_default_value($entity_type, $entity, $field, $instance) { - return array(array('value' => 99)); -} - -/** - * Implements hook_field_access(). - */ -function field_test_field_access($op, $field, $entity_type, $entity, $account) { - if ($field['field_name'] == "field_no_{$op}_access") { - return FALSE; - } - return TRUE; -} diff --git a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info deleted file mode 100644 index 6d11706..0000000 --- a/modules/field/tests/field_test.info +++ /dev/null @@ -1,7 +0,0 @@ -name = "Field API Test" -description = "Support module for the Field API tests." -core = 7.x -package = Testing -files[] = field_test.entity.inc -version = VERSION -hidden = TRUE diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module deleted file mode 100644 index dc2023a..0000000 --- a/modules/field/tests/field_test.module +++ /dev/null @@ -1,269 +0,0 @@ - array( - 'title' => t('Access field_test content'), - 'description' => t('View published field_test content.'), - ), - 'administer field_test content' => array( - 'title' => t('Administer field_test content'), - 'description' => t('Manage field_test content'), - ), - ); - return $perms; -} - -/** - * Implements hook_menu(). - */ -function field_test_menu() { - $items = array(); - $bundles = field_info_bundles('test_entity'); - - foreach ($bundles as $bundle_name => $bundle_info) { - $bundle_url_str = str_replace('_', '-', $bundle_name); - $items['test-entity/add/' . $bundle_url_str] = array( - 'title' => t('Add %bundle test_entity', array('%bundle' => $bundle_info['label'])), - 'page callback' => 'field_test_entity_add', - 'page arguments' => array(2), - 'access arguments' => array('administer field_test content'), - 'type' => MENU_NORMAL_ITEM, - ); - } - $items['test-entity/manage/%field_test_entity_test/edit'] = array( - 'title' => 'Edit test entity', - 'page callback' => 'field_test_entity_edit', - 'page arguments' => array(2), - 'access arguments' => array('administer field_test content'), - 'type' => MENU_NORMAL_ITEM, - ); - - $items['test-entity/nested/%field_test_entity_test/%field_test_entity_test'] = array( - 'title' => 'Nested entity form', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('field_test_entity_nested_form', 2, 3), - 'access arguments' => array('administer field_test content'), - 'type' => MENU_NORMAL_ITEM, - ); - - return $items; -} - -/** - * Generic op to test _field_invoke behavior. - * - * This simulates a field operation callback to be invoked by _field_invoke(). - */ -function field_test_field_test_op($entity_type, $entity, $field, $instance, $langcode, &$items) { - return array($langcode => hash('sha256', serialize(array($entity_type, $entity, $field['field_name'], $langcode, $items)))); -} - -/** - * Generic op to test _field_invoke_multiple behavior. - * - * This simulates a multiple field operation callback to be invoked by - * _field_invoke_multiple(). - */ -function field_test_field_test_op_multiple($entity_type, $entities, $field, $instances, $langcode, &$items) { - $result = array(); - foreach ($entities as $id => $entity) { - // Entities, instances and items are assumed to be consistently grouped by - // language. To verify this we try to access all the passed data structures - // by entity id. If they are grouped correctly, one entity, one instance and - // one array of items should be available for each entity id. - $field_name = $instances[$id]['field_name']; - $result[$id] = array($langcode => hash('sha256', serialize(array($entity_type, $entity, $field_name, $langcode, $items[$id])))); - } - return $result; -} - -/** - * Implements hook_field_available_languages_alter(). - */ -function field_test_field_available_languages_alter(&$languages, $context) { - if (variable_get('field_test_field_available_languages_alter', FALSE)) { - // Add an unavailable language. - $languages[] = 'xx'; - // Remove an available language. - $index = array_search('en', $languages); - unset($languages[$index]); - } -} - -/** - * Implements hook_field_language_alter(). - */ -function field_test_field_language_alter(&$display_language, $context) { - if (variable_get('field_test_language_fallback', TRUE)) { - locale_field_language_fallback($display_language, $context['entity'], $context['language']); - } -} - -/** - * Store and retrieve keyed data for later verification by unit tests. - * - * This function is a simple in-memory key-value store with the - * distinction that it stores all values for a given key instead of - * just the most recently set value. field_test module hooks call - * this function to record their arguments, keyed by hook name. The - * unit tests later call this function to verify that the correct - * hooks were called and were passed the correct arguments. - * - * This function ignores all calls until the first time it is called - * with $key of NULL. Each time it is called with $key of NULL, it - * erases all previously stored data from its internal cache, but also - * returns the previously stored data to the caller. A typical usage - * scenario is: - * - * @code - * // calls to field_test_memorize() here are ignored - * - * // turn on memorization - * field_test_memorize(); - * - * // call some Field API functions that invoke field_test hooks - * $field = field_create_field(...); - * - * // retrieve and reset the memorized hook call data - * $mem = field_test_memorize(); - * - * // make sure hook_field_create_field() is invoked correctly - * assertEqual(count($mem['field_test_field_create_field']), 1); - * assertEqual($mem['field_test_field_create_field'][0], array($field)); - * @endcode - * - * @param $key - * The key under which to store to $value, or NULL as described above. - * @param $value - * A value to store for $key. - * @return - * An array mapping each $key to an array of each $value passed in - * for that key. - */ -function field_test_memorize($key = NULL, $value = NULL) { - $memorize = &drupal_static(__FUNCTION__, NULL); - - if (!isset($key)) { - $return = $memorize; - $memorize = array(); - return $return; - } - if (is_array($memorize)) { - $memorize[$key][] = $value; - } -} - -/** - * Memorize calls to hook_field_create_field(). - */ -function field_test_field_create_field($field) { - $args = func_get_args(); - field_test_memorize(__FUNCTION__, $args); -} - -/** - * Implements hook_entity_query_alter(). - */ -function field_test_entity_query_alter(&$query) { - if (!empty($query->alterMyExecuteCallbackPlease)) { - $query->executeCallback = 'field_test_dummy_field_storage_query'; - } -} - -/** - * Pseudo-implements hook_field_storage_query(). - */ -function field_test_dummy_field_storage_query(EntityFieldQuery $query) { - // Return dummy values that will be checked by the test. - return array( - 'user' => array( - 1 => entity_create_stub_entity('user', array(1, NULL, NULL)), - ), - ); -} - -/** - * Implements callback_entity_info_label(). - * - * @return - * The label of the entity prefixed with "label callback". - */ -function field_test_entity_label_callback($entity) { - return 'label callback ' . $entity->ftlabel; -} - -/** - * Implements hook_field_attach_view_alter(). - */ -function field_test_field_attach_view_alter(&$output, $context) { - if (!empty($context['display']['settings']['alter'])) { - $output['test_field'][] = array('#markup' => 'field_test_field_attach_view_alter'); - } -} - -/** - * Implements hook_field_widget_properties_alter(). - */ -function field_test_field_widget_properties_alter(&$widget, $context) { - // Make the alter_test_text field 42 characters for nodes and comments. - if (in_array($context['entity_type'], array('node', 'comment')) && ($context['field']['field_name'] == 'alter_test_text')) { - $widget['settings']['size'] = 42; - } -} - -/** - * Implements hook_field_widget_properties_ENTITY_TYPE_alter(). - */ -function field_test_field_widget_properties_user_alter(&$widget, $context) { - // Always use buttons for the alter_test_options field on user forms. - if ($context['field']['field_name'] == 'alter_test_options') { - $widget['type'] = 'options_buttons'; - } -} - -/** - * Implements hook_field_widget_form_alter(). - */ -function field_test_field_widget_form_alter(&$element, &$form_state, $context) { - switch ($context['field']['field_name']) { - case 'alter_test_text': - drupal_set_message('Field size: ' . $context['instance']['widget']['settings']['size']); - break; - - case 'alter_test_options': - drupal_set_message('Widget type: ' . $context['instance']['widget']['type']); - break; - } -} - -/** - * Implements hook_query_TAG_alter() for tag 'efq_table_prefixing_test'. - * - * @see EntityFieldQueryTestCase::testTablePrefixing() - */ -function field_test_query_efq_table_prefixing_test_alter(&$query) { - // Add an additional join onto the entity base table. This will cause an - // exception if the EFQ does not properly prefix the base table. - $query->join('test_entity','te2','%alias.ftid = test_entity.ftid'); -} diff --git a/modules/field/tests/field_test.storage.inc b/modules/field/tests/field_test.storage.inc deleted file mode 100644 index a26af17..0000000 --- a/modules/field/tests/field_test.storage.inc +++ /dev/null @@ -1,473 +0,0 @@ - array( - 'label' => t('Test storage'), - 'description' => t('Dummy test storage backend. Stores field values in the variable table.'), - ), - 'field_test_storage_failure' => array( - 'label' => t('Test storage failure'), - 'description' => t('Dummy test storage backend. Always fails to create fields.'), - ), - ); -} - -/** - * Implements hook_field_storage_details(). - */ -function field_test_field_storage_details($field) { - $details = array(); - - // Add field columns. - $columns = array(); - foreach ((array) $field['columns'] as $column_name => $attributes) { - $columns[$column_name] = $column_name; - } - return array( - 'drupal_variables' => array( - 'field_test_storage_data[FIELD_LOAD_CURRENT]' => $columns, - 'field_test_storage_data[FIELD_LOAD_REVISION]' => $columns, - ), - ); -} - -/** - * Implements hook_field_storage_details_alter(). - * - * @see FieldAttachStorageTestCase::testFieldStorageDetailsAlter() - */ -function field_test_field_storage_details_alter(&$details, $field) { - - // For testing, storage details are changed only because of the field name. - if ($field['field_name'] == 'field_test_change_my_details') { - $columns = array(); - foreach ((array) $field['columns'] as $column_name => $attributes) { - $columns[$column_name] = $column_name; - } - $details['drupal_variables'] = array( - FIELD_LOAD_CURRENT => array( - 'moon' => $columns, - ), - FIELD_LOAD_REVISION => array( - 'mars' => $columns, - ), - ); - } -} - -/** - * Helper function: stores or retrieves data from the 'storage backend'. - */ -function _field_test_storage_data($data = NULL) { - if (!isset($data)) { - return variable_get('field_test_storage_data', array()); - } - else { - variable_set('field_test_storage_data', $data); - } -} - -/** - * Implements hook_field_storage_load(). - */ -function field_test_field_storage_load($entity_type, $entities, $age, $fields, $options) { - $data = _field_test_storage_data(); - - $load_current = $age == FIELD_LOAD_CURRENT; - - foreach ($fields as $field_id => $ids) { - $field = field_info_field_by_id($field_id); - $field_name = $field['field_name']; - $field_data = $data[$field['id']]; - $sub_table = $load_current ? 'current' : 'revisions'; - $delta_count = array(); - foreach ($field_data[$sub_table] as $row) { - if ($row->type == $entity_type && (!$row->deleted || $options['deleted'])) { - if (($load_current && in_array($row->entity_id, $ids)) || (!$load_current && in_array($row->revision_id, $ids))) { - if (in_array($row->language, field_available_languages($entity_type, $field))) { - if (!isset($delta_count[$row->entity_id][$row->language])) { - $delta_count[$row->entity_id][$row->language] = 0; - } - if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || $delta_count[$row->entity_id][$row->language] < $field['cardinality']) { - $item = array(); - foreach ($field['columns'] as $column => $attributes) { - $item[$column] = $row->{$column}; - } - $entities[$row->entity_id]->{$field_name}[$row->language][] = $item; - $delta_count[$row->entity_id][$row->language]++; - } - } - } - } - } - } -} - -/** - * Implements hook_field_storage_write(). - */ -function field_test_field_storage_write($entity_type, $entity, $op, $fields) { - $data = _field_test_storage_data(); - - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - foreach ($fields as $field_id) { - $field = field_info_field_by_id($field_id); - $field_name = $field['field_name']; - $field_data = &$data[$field_id]; - - $all_languages = field_available_languages($entity_type, $field); - $field_languages = array_intersect($all_languages, array_keys((array) $entity->$field_name)); - - // Delete and insert, rather than update, in case a value was added. - if ($op == FIELD_STORAGE_UPDATE) { - // Delete languages present in the incoming $entity->$field_name. - // Delete all languages if $entity->$field_name is empty. - $languages = !empty($entity->$field_name) ? $field_languages : $all_languages; - if ($languages) { - foreach ($field_data['current'] as $key => $row) { - if ($row->type == $entity_type && $row->entity_id == $id && in_array($row->language, $languages)) { - unset($field_data['current'][$key]); - } - } - if (isset($vid)) { - foreach ($field_data['revisions'] as $key => $row) { - if ($row->type == $entity_type && $row->revision_id == $vid) { - unset($field_data['revisions'][$key]); - } - } - } - } - } - - foreach ($field_languages as $langcode) { - $items = (array) $entity->{$field_name}[$langcode]; - $delta_count = 0; - foreach ($items as $delta => $item) { - $row = (object) array( - 'field_id' => $field_id, - 'type' => $entity_type, - 'entity_id' => $id, - 'revision_id' => $vid, - 'bundle' => $bundle, - 'delta' => $delta, - 'deleted' => FALSE, - 'language' => $langcode, - ); - foreach ($field['columns'] as $column => $attributes) { - $row->{$column} = isset($item[$column]) ? $item[$column] : NULL; - } - - $field_data['current'][] = $row; - if (isset($vid)) { - $field_data['revisions'][] = $row; - } - - if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && ++$delta_count == $field['cardinality']) { - break; - } - } - } - } - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_storage_delete(). - */ -function field_test_field_storage_delete($entity_type, $entity, $fields) { - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - // Note: reusing field_test_storage_purge(), like field_sql_storage.module - // does, is highly inefficient in our case... - foreach (field_info_instances($bundle) as $instance) { - if (isset($fields[$instance['field_id']])) { - $field = field_info_field_by_id($instance['field_id']); - field_test_field_storage_purge($entity_type, $entity, $field, $instance); - } - } -} - -/** - * Implements hook_field_storage_purge(). - */ -function field_test_field_storage_purge($entity_type, $entity, $field, $instance) { - $data = _field_test_storage_data(); - - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - - $field_data = &$data[$field['id']]; - foreach (array('current', 'revisions') as $sub_table) { - foreach ($field_data[$sub_table] as $key => $row) { - if ($row->type == $entity_type && $row->entity_id == $id) { - unset($field_data[$sub_table][$key]); - } - } - } - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_storage_delete_revision(). - */ -function field_test_field_storage_delete_revision($entity_type, $entity, $fields) { - $data = _field_test_storage_data(); - - list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - foreach ($fields as $field_id) { - $field_data = &$data[$field_id]; - foreach (array('current', 'revisions') as $sub_table) { - foreach ($field_data[$sub_table] as $key => $row) { - if ($row->type == $entity_type && $row->entity_id == $id && $row->revision_id == $vid) { - unset($field_data[$sub_table][$key]); - } - } - } - } - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_storage_query(). - */ -function field_test_field_storage_query($field_id, $conditions, $count, &$cursor = NULL, $age) { - $data = _field_test_storage_data(); - - $load_current = $age == FIELD_LOAD_CURRENT; - - $field = field_info_field_by_id($field_id); - $field_columns = array_keys($field['columns']); - - $field_data = $data[$field['id']]; - $sub_table = $load_current ? 'current' : 'revisions'; - // We need to sort records by entity type and entity id. - usort($field_data[$sub_table], '_field_test_field_storage_query_sort_helper'); - - // Initialize results array. - $return = array(); - $entity_count = 0; - $rows_count = 0; - $rows_total = count($field_data[$sub_table]); - $skip = $cursor; - $skipped = 0; - - foreach ($field_data[$sub_table] as $row) { - if ($count != FIELD_QUERY_NO_LIMIT && $entity_count >= $count) { - break; - } - - if ($row->field_id == $field['id']) { - $match = TRUE; - $condition_deleted = FALSE; - // Add conditions. - foreach ($conditions as $condition) { - @list($column, $value, $operator) = $condition; - if (empty($operator)) { - $operator = is_array($value) ? 'IN' : '='; - } - switch ($operator) { - case '=': - $match = $match && $row->{$column} == $value; - break; - case '<>': - case '<': - case '<=': - case '>': - case '>=': - eval('$match = $match && ' . $row->{$column} . ' ' . $operator . ' '. $value); - break; - case 'IN': - $match = $match && in_array($row->{$column}, $value); - break; - case 'NOT IN': - $match = $match && !in_array($row->{$column}, $value); - break; - case 'BETWEEN': - $match = $match && $row->{$column} >= $value[0] && $row->{$column} <= $value[1]; - break; - case 'STARTS_WITH': - case 'ENDS_WITH': - case 'CONTAINS': - // Not supported. - $match = FALSE; - break; - } - // Track condition on 'deleted'. - if ($column == 'deleted') { - $condition_deleted = TRUE; - } - } - - // Exclude deleted data unless we have a condition on it. - if (!$condition_deleted && $row->deleted) { - $match = FALSE; - } - - if ($match) { - if (!isset($skip) || $skipped >= $skip) { - $cursor++; - // If querying all revisions and the entity type has revisions, we need - // to key the results by revision_ids. - $entity_type = entity_get_info($row->type); - $id = ($load_current || empty($entity_type['entity keys']['revision'])) ? $row->entity_id : $row->revision_id; - - if (!isset($return[$row->type][$id])) { - $return[$row->type][$id] = entity_create_stub_entity($row->type, array($row->entity_id, $row->revision_id, $row->bundle)); - $entity_count++; - } - } - else { - $skipped++; - } - } - } - $rows_count++; - - // The query is complete if we walked the whole array. - if ($count != FIELD_QUERY_NO_LIMIT && $rows_count >= $rows_total) { - $cursor = FIELD_QUERY_COMPLETE; - } - } - - return $return; -} - -/** - * Sort helper for field_test_field_storage_query(). - * - * Sorts by entity type and entity id. - */ -function _field_test_field_storage_query_sort_helper($a, $b) { - if ($a->type == $b->type) { - if ($a->entity_id == $b->entity_id) { - return 0; - } - else { - return $a->entity_id < $b->entity_id ? -1 : 1; - } - } - else { - return $a->type < $b->type ? -1 : 1; - } -} - -/** - * Implements hook_field_storage_create_field(). - */ -function field_test_field_storage_create_field($field) { - if ($field['storage']['type'] == 'field_test_storage_failure') { - throw new Exception('field_test_storage_failure engine always fails to create fields'); - } - - $data = _field_test_storage_data(); - - $data[$field['id']] = array( - 'current' => array(), - 'revisions' => array(), - ); - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_storage_delete_field(). - */ -function field_test_field_storage_delete_field($field) { - $data = _field_test_storage_data(); - - $field_data = &$data[$field['id']]; - foreach (array('current', 'revisions') as $sub_table) { - foreach ($field_data[$sub_table] as &$row) { - $row->deleted = TRUE; - } - } - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_storage_delete_instance(). - */ -function field_test_field_storage_delete_instance($instance) { - $data = _field_test_storage_data(); - - $field = field_info_field($instance['field_name']); - $field_data = &$data[$field['id']]; - foreach (array('current', 'revisions') as $sub_table) { - foreach ($field_data[$sub_table] as &$row) { - if ($row->bundle == $instance['bundle']) { - $row->deleted = TRUE; - } - } - } - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_attach_create_bundle(). - */ -function field_test_field_attach_create_bundle($bundle) { - // We don't need to do anything here. -} - -/** - * Implements hook_field_attach_rename_bundle(). - */ -function field_test_field_attach_rename_bundle($bundle_old, $bundle_new) { - $data = _field_test_storage_data(); - - // We need to account for deleted or inactive fields and instances. - $instances = field_read_instances(array('bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); - foreach ($instances as $field_name => $instance) { - $field = field_info_field_by_id($instance['field_id']); - if ($field['storage']['type'] == 'field_test_storage') { - $field_data = &$data[$field['id']]; - foreach (array('current', 'revisions') as $sub_table) { - foreach ($field_data[$sub_table] as &$row) { - if ($row->bundle == $bundle_old) { - $row->bundle = $bundle_new; - } - } - } - } - } - - _field_test_storage_data($data); -} - -/** - * Implements hook_field_attach_delete_bundle(). - */ -function field_test_field_attach_delete_bundle($entity_type, $bundle, $instances) { - $data = _field_test_storage_data(); - - foreach ($instances as $field_name => $instance) { - $field = field_info_field($field_name); - if ($field['storage']['type'] == 'field_test_storage') { - $field_data = &$data[$field['id']]; - foreach (array('current', 'revisions') as $sub_table) { - foreach ($field_data[$sub_table] as &$row) { - if ($row->bundle == $bundle_old) { - $row->deleted = TRUE; - } - } - } - } - } - - _field_test_storage_data($data); -} diff --git a/modules/field/theme/field-rtl.css b/modules/field/theme/field-rtl.css deleted file mode 100644 index 5d35a86..0000000 --- a/modules/field/theme/field-rtl.css +++ /dev/null @@ -1,14 +0,0 @@ - -form .field-multiple-table th.field-label { - padding-right: 0; -} -form .field-multiple-table td.field-multiple-drag { - padding-left: 0; -} -form .field-multiple-table td.field-multiple-drag a.tabledrag-handle{ - padding-left: .5em; -} -.field-label-inline .field-label, -.field-label-inline .field-items { - float: right; -} diff --git a/modules/field/theme/field.css b/modules/field/theme/field.css deleted file mode 100644 index 9eba32f..0000000 --- a/modules/field/theme/field.css +++ /dev/null @@ -1,28 +0,0 @@ - -/* Field display */ -.field .field-label { - font-weight: bold; -} -.field-label-inline .field-label, -.field-label-inline .field-items { - float:left; /*LTR*/ -} - -/* Form display */ -form .field-multiple-table { - margin: 0; -} -form .field-multiple-table th.field-label { - padding-left: 0; /*LTR*/ -} -form .field-multiple-table td.field-multiple-drag { - width: 30px; - padding-right: 0; /*LTR*/ -} -form .field-multiple-table td.field-multiple-drag a.tabledrag-handle { - padding-right: .5em; /*LTR*/ -} - -form .field-add-more-submit { - margin: .5em 0 0; -} diff --git a/modules/field/theme/field.tpl.php b/modules/field/theme/field.tpl.php deleted file mode 100644 index f0f9d58..0000000 --- a/modules/field/theme/field.tpl.php +++ /dev/null @@ -1,62 +0,0 @@ - - -
\n!\n> - -diff --git a/modules/field_ui/field_ui-rtl.css b/modules/field_ui/field_ui-rtl.css deleted file mode 100644 index 1066baa..0000000 --- a/modules/field_ui/field_ui-rtl.css +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @file - * Right-to-left specific stylesheet for the Field UI module. - */ - -/* 'Manage fields' overview */ -table.field-ui-overview tr.add-new .label-input { - float: right; -} diff --git a/modules/field_ui/field_ui.css b/modules/field_ui/field_ui.css deleted file mode 100644 index 2184023..0000000 --- a/modules/field_ui/field_ui.css +++ /dev/null @@ -1,71 +0,0 @@ -/** - * @file - * Stylesheet for the Field UI module. - */ - -/* 'Manage fields' and 'Manage display' overviews */ -table.field-ui-overview tr.add-new .label-input { - float: left; /* LTR */ -} -table.field-ui-overview tr.add-new .tabledrag-changed { - display: none; -} -table.field-ui-overview tr.add-new .description { - margin-bottom: 0; - max-width: 250px; -} -table.field-ui-overview tr.add-new .form-type-machine-name .description { - white-space: normal; -} -table.field-ui-overview tr.add-new .add-new-placeholder { - font-weight: bold; - padding-bottom: .5em; -} -table.field-ui-overview tr.region-title td { - font-weight: bold; -} -table.field-ui-overview tr.region-message td { - font-style: italic; -} -table.field-ui-overview tr.region-populated { - display: none; -} -table.field-ui-overview tr.region-add-new-title { - display: none; -} -table.field-ui-overview tr.add-new td { - vertical-align: top; - white-space: nowrap; -} - -/* 'Manage display' overview */ -#field-display-overview .field-formatter-summary-cell { - line-height: 1em; -} -#field-display-overview .field-formatter-summary { - float: left; - font-size: 0.9em; -} -#field-display-overview td.field-formatter-summary-cell span.warning { - display: block; - float: left; - margin-right: .5em; -} -#field-display-overview .field-formatter-settings-edit-wrapper { - float: right; -} -#field-display-overview .field-formatter-settings-edit { - float: right; -} -#field-display-overview tr.field-formatter-settings-editing td { - vertical-align: top; -} -#field-display-overview tr.field-formatter-settings-editing .field-formatter-type { - display: none; -} -#field-display-overview .field-formatter-settings-edit-form .formatter-name{ - font-weight: bold; -} -#field-ui-display-overview-form #edit-refresh { - display:none; -} diff --git a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info deleted file mode 100644 index 41d0999..0000000 --- a/modules/field_ui/field_ui.info +++ /dev/null @@ -1,7 +0,0 @@ -name = Field UI -description = User interface for the Field API. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -files[] = field_ui.test diff --git a/modules/field_ui/field_ui.js b/modules/field_ui/field_ui.js deleted file mode 100644 index 65b28d0..0000000 --- a/modules/field_ui/field_ui.js +++ /dev/null @@ -1,341 +0,0 @@ -/** - * @file - * Attaches the behaviors for the Field UI module. - */ - -(function($) { - -Drupal.behaviors.fieldUIFieldOverview = { - attach: function (context, settings) { - $('table#field-overview', context).once('field-overview', function () { - Drupal.fieldUIFieldOverview.attachUpdateSelects(this, settings); - }); - } -}; - -Drupal.fieldUIFieldOverview = { - /** - * Implements dependent select dropdowns on the 'Manage fields' screen. - */ - attachUpdateSelects: function(table, settings) { - var widgetTypes = settings.fieldWidgetTypes; - var fields = settings.fields; - - // Store the default text of widget selects. - $('.widget-type-select', table).each(function () { - this.initialValue = this.options[0].text; - }); - - // 'Field type' select updates its 'Widget' select. - $('.field-type-select', table).each(function () { - this.targetSelect = $('.widget-type-select', $(this).closest('tr')); - - $(this).bind('change keyup', function () { - var selectedFieldType = this.options[this.selectedIndex].value; - var options = (selectedFieldType in widgetTypes ? widgetTypes[selectedFieldType] : []); - this.targetSelect.fieldUIPopulateOptions(options); - }); - - // Trigger change on initial pageload to get the right widget options - // when field type comes pre-selected (on failed validation). - $(this).trigger('change', false); - }); - - // 'Existing field' select updates its 'Widget' select and 'Label' textfield. - $('.field-select', table).each(function () { - this.targetSelect = $('.widget-type-select', $(this).closest('tr')); - this.targetTextfield = $('.label-textfield', $(this).closest('tr')); - this.targetTextfield - .data('field_ui_edited', false) - .bind('keyup', function (e) { - $(this).data('field_ui_edited', $(this).val() != ''); - }); - - $(this).bind('change keyup', function (e, updateText) { - var updateText = (typeof updateText == 'undefined' ? true : updateText); - var selectedField = this.options[this.selectedIndex].value; - var selectedFieldType = (selectedField in fields ? fields[selectedField].type : null); - var selectedFieldWidget = (selectedField in fields ? fields[selectedField].widget : null); - var options = (selectedFieldType && (selectedFieldType in widgetTypes) ? widgetTypes[selectedFieldType] : []); - this.targetSelect.fieldUIPopulateOptions(options, selectedFieldWidget); - - // Only overwrite the "Label" input if it has not been manually - // changed, or if it is empty. - if (updateText && !this.targetTextfield.data('field_ui_edited')) { - this.targetTextfield.val(selectedField in fields ? fields[selectedField].label : ''); - } - }); - - // Trigger change on initial pageload to get the right widget options - // and label when field type comes pre-selected (on failed validation). - $(this).trigger('change', false); - }); - } -}; - -/** - * Populates options in a select input. - */ -jQuery.fn.fieldUIPopulateOptions = function (options, selected) { - return this.each(function () { - var disabled = false; - if (options.length == 0) { - options = [this.initialValue]; - disabled = true; - } - - // If possible, keep the same widget selected when changing field type. - // This is based on textual value, since the internal value might be - // different (options_buttons vs. node_reference_buttons). - var previousSelectedText = this.options[this.selectedIndex].text; - - var html = ''; - jQuery.each(options, function (value, text) { - // Figure out which value should be selected. The 'selected' param - // takes precedence. - var is_selected = ((typeof selected != 'undefined' && value == selected) || (typeof selected == 'undefined' && text == previousSelectedText)); - html += ''; - }); - - $(this).html(html).attr('disabled', disabled ? 'disabled' : false); - }); -}; - -Drupal.behaviors.fieldUIDisplayOverview = { - attach: function (context, settings) { - $('table#field-display-overview', context).once('field-display-overview', function() { - Drupal.fieldUIOverview.attach(this, settings.fieldUIRowsData, Drupal.fieldUIDisplayOverview); - }); - } -}; - -Drupal.fieldUIOverview = { - /** - * Attaches the fieldUIOverview behavior. - */ - attach: function (table, rowsData, rowHandlers) { - var tableDrag = Drupal.tableDrag[table.id]; - - // Add custom tabledrag callbacks. - tableDrag.onDrop = this.onDrop; - tableDrag.row.prototype.onSwap = this.onSwap; - - // Create row handlers. - $('tr.draggable', table).each(function () { - // Extract server-side data for the row. - var row = this; - if (row.id in rowsData) { - var data = rowsData[row.id]; - data.tableDrag = tableDrag; - - // Create the row handler, make it accessible from the DOM row element. - var rowHandler = new rowHandlers[data.rowHandler](row, data); - $(row).data('fieldUIRowHandler', rowHandler); - } - }); - }, - - /** - * Event handler to be attached to form inputs triggering a region change. - */ - onChange: function () { - var $trigger = $(this); - var row = $trigger.closest('tr').get(0); - var rowHandler = $(row).data('fieldUIRowHandler'); - - var refreshRows = {}; - refreshRows[rowHandler.name] = $trigger.get(0); - - // Handle region change. - var region = rowHandler.getRegion(); - if (region != rowHandler.region) { - // Remove parenting. - $('select.field-parent', row).val(''); - // Let the row handler deal with the region change. - $.extend(refreshRows, rowHandler.regionChange(region)); - // Update the row region. - rowHandler.region = region; - } - - // Ajax-update the rows. - Drupal.fieldUIOverview.AJAXRefreshRows(refreshRows); - }, - - /** - * Lets row handlers react when a row is dropped into a new region. - */ - onDrop: function () { - var dragObject = this; - var row = dragObject.rowObject.element; - var rowHandler = $(row).data('fieldUIRowHandler'); - if (rowHandler !== undefined) { - var regionRow = $(row).prevAll('tr.region-message').get(0); - var region = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); - - if (region != rowHandler.region) { - // Let the row handler deal with the region change. - refreshRows = rowHandler.regionChange(region); - // Update the row region. - rowHandler.region = region; - // Ajax-update the rows. - Drupal.fieldUIOverview.AJAXRefreshRows(refreshRows); - } - } - }, - - /** - * Refreshes placeholder rows in empty regions while a row is being dragged. - * - * Copied from block.js. - * - * @param table - * The table DOM element. - * @param rowObject - * The tableDrag rowObject for the row being dragged. - */ - onSwap: function (draggedRow) { - var rowObject = this; - $('tr.region-message', rowObject.table).each(function () { - // If the dragged row is in this region, but above the message row, swap - // it down one space. - if ($(this).prev('tr').get(0) == rowObject.group[rowObject.group.length - 1]) { - // Prevent a recursion problem when using the keyboard to move rows up. - if ((rowObject.method != 'keyboard' || rowObject.direction == 'down')) { - rowObject.swap('after', this); - } - } - // This region has become empty. - if ($(this).next('tr').is(':not(.draggable)') || $(this).next('tr').length == 0) { - $(this).removeClass('region-populated').addClass('region-empty'); - } - // This region has become populated. - else if ($(this).is('.region-empty')) { - $(this).removeClass('region-empty').addClass('region-populated'); - } - }); - }, - - /** - * Triggers Ajax refresh of selected rows. - * - * The 'format type' selects can trigger a series of changes in child rows. - * The #ajax behavior is therefore not attached directly to the selects, but - * triggered manually through a hidden #ajax 'Refresh' button. - * - * @param rows - * A hash object, whose keys are the names of the rows to refresh (they - * will receive the 'ajax-new-content' effect on the server side), and - * whose values are the DOM element in the row that should get an Ajax - * throbber. - */ - AJAXRefreshRows: function (rows) { - // Separate keys and values. - var rowNames = []; - var ajaxElements = []; - $.each(rows, function (rowName, ajaxElement) { - rowNames.push(rowName); - ajaxElements.push(ajaxElement); - }); - - if (rowNames.length) { - // Add a throbber next each of the ajaxElements. - var $throbber = $('>:- -> - $item): ?> -->- -'); - $(ajaxElements) - .addClass('progress-disabled') - .after($throbber); - - // Fire the Ajax update. - $('input[name=refresh_rows]').val(rowNames.join(' ')); - $('input#edit-refresh').mousedown(); - - // Disabled elements do not appear in POST ajax data, so we mark the - // elements disabled only after firing the request. - $(ajaxElements).attr('disabled', true); - } - } -}; - - -/** - * Row handlers for the 'Manage display' screen. - */ -Drupal.fieldUIDisplayOverview = {}; - -/** - * Constructor for a 'field' row handler. - * - * This handler is used for both fields and 'extra fields' rows. - * - * @param row - * The row DOM element. - * @param data - * Additional data to be populated in the constructed object. - */ -Drupal.fieldUIDisplayOverview.field = function (row, data) { - this.row = row; - this.name = data.name; - this.region = data.region; - this.tableDrag = data.tableDrag; - - // Attach change listener to the 'formatter type' select. - this.$formatSelect = $('select.field-formatter-type', row); - this.$formatSelect.change(Drupal.fieldUIOverview.onChange); - - return this; -}; - -Drupal.fieldUIDisplayOverview.field.prototype = { - /** - * Returns the region corresponding to the current form values of the row. - */ - getRegion: function () { - return (this.$formatSelect.val() == 'hidden') ? 'hidden' : 'visible'; - }, - - /** - * Reacts to a row being changed regions. - * - * This function is called when the row is moved to a different region, as a - * result of either : - * - a drag-and-drop action (the row's form elements then probably need to be - * updated accordingly) - * - user input in one of the form elements watched by the - * Drupal.fieldUIOverview.onChange change listener. - * - * @param region - * The name of the new region for the row. - * @return - * A hash object indicating which rows should be Ajax-updated as a result - * of the change, in the format expected by - * Drupal.displayOverview.AJAXRefreshRows(). - */ - regionChange: function (region) { - - // When triggered by a row drag, the 'format' select needs to be adjusted - // to the new region. - var currentValue = this.$formatSelect.val(); - switch (region) { - case 'visible': - if (currentValue == 'hidden') { - // Restore the formatter back to the default formatter. Pseudo-fields do - // not have default formatters, we just return to 'visible' for those. - var value = (this.defaultFormatter != undefined) ? this.defaultFormatter : 'visible'; - } - break; - - default: - var value = 'hidden'; - break; - } - if (value != undefined) { - this.$formatSelect.val(value); - } - - var refreshRows = {}; - refreshRows[this.name] = this.$formatSelect.get(0); - - return refreshRows; - } -}; - -})(jQuery); diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test deleted file mode 100644 index 21767d6..0000000 --- a/modules/field_ui/field_ui.test +++ /dev/null @@ -1,751 +0,0 @@ -drupalCreateUser(array('access content', 'administer content types', 'administer taxonomy')); - $this->drupalLogin($admin_user); - - // Create content type, with underscores. - $type_name = strtolower($this->randomName(8)) . '_test'; - $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name)); - $this->type = $type->type; - // Store a valid URL name, with hyphens instead of underscores. - $this->hyphen_type = str_replace('_', '-', $this->type); - } - - /** - * Creates a new field through the Field UI. - * - * @param $bundle_path - * Admin path of the bundle that the new field is to be attached to. - * @param $initial_edit - * $edit parameter for drupalPost() on the first step ('Manage fields' - * screen). - * @param $field_edit - * $edit parameter for drupalPost() on the second step ('Field settings' - * form). - * @param $instance_edit - * $edit parameter for drupalPost() on the third step ('Instance settings' - * form). - */ - function fieldUIAddNewField($bundle_path, $initial_edit, $field_edit = array(), $instance_edit = array()) { - // Use 'test_field' field type by default. - $initial_edit += array( - 'fields[_add_new_field][type]' => 'test_field', - 'fields[_add_new_field][widget_type]' => 'test_field_widget', - ); - $label = $initial_edit['fields[_add_new_field][label]']; - $field_name = $initial_edit['fields[_add_new_field][field_name]']; - - // First step : 'Add new field' on the 'Manage fields' page. - $this->drupalPost("$bundle_path/fields", $initial_edit, t('Save')); - $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $label)), 'Field settings page was displayed.'); - - // Second step : 'Field settings' form. - $this->drupalPost(NULL, $field_edit, t('Save field settings')); - $this->assertRaw(t('Updated field %label field settings.', array('%label' => $label)), 'Redirected to instance and widget settings page.'); - - // Third step : 'Instance settings' form. - $this->drupalPost(NULL, $instance_edit, t('Save settings')); - $this->assertRaw(t('Saved %label configuration.', array('%label' => $label)), 'Redirected to "Manage fields" page.'); - - // Check that the field appears in the overview form. - $this->assertFieldByXPath('//table[@id="field-overview"]//td[1]', $label, 'Field was created and appears in the overview page.'); - } - - /** - * Adds an existing field through the Field UI. - * - * @param $bundle_path - * Admin path of the bundle that the field is to be attached to. - * @param $initial_edit - * $edit parameter for drupalPost() on the first step ('Manage fields' - * screen). - * @param $instance_edit - * $edit parameter for drupalPost() on the second step ('Instance settings' - * form). - */ - function fieldUIAddExistingField($bundle_path, $initial_edit, $instance_edit = array()) { - // Use 'test_field_widget' by default. - $initial_edit += array( - 'fields[_add_existing_field][widget_type]' => 'test_field_widget', - ); - $label = $initial_edit['fields[_add_existing_field][label]']; - $field_name = $initial_edit['fields[_add_existing_field][field_name]']; - - // First step : 'Add existing field' on the 'Manage fields' page. - $this->drupalPost("$bundle_path/fields", $initial_edit, t('Save')); - - // Second step : 'Instance settings' form. - $this->drupalPost(NULL, $instance_edit, t('Save settings')); - $this->assertRaw(t('Saved %label configuration.', array('%label' => $label)), 'Redirected to "Manage fields" page.'); - - // Check that the field appears in the overview form. - $this->assertFieldByXPath('//table[@id="field-overview"]//td[1]', $label, 'Field was created and appears in the overview page.'); - } - - /** - * Deletes a field instance through the Field UI. - * - * @param $bundle_path - * Admin path of the bundle that the field instance is to be deleted from. - * @param $field_name - * The name of the field. - * @param $label - * The label of the field. - * @param $bundle_label - * The label of the bundle. - */ - function fieldUIDeleteField($bundle_path, $field_name, $label, $bundle_label) { - // Display confirmation form. - $this->drupalGet("$bundle_path/fields/$field_name/delete"); - $this->assertRaw(t('Are you sure you want to delete the field %label', array('%label' => $label)), 'Delete confirmation was found.'); - - // Submit confirmation form. - $this->drupalPost(NULL, array(), t('Delete')); - $this->assertRaw(t('The field %label has been deleted from the %type content type.', array('%label' => $label, '%type' => $bundle_label)), 'Delete message was found.'); - - // Check that the field does not appear in the overview form. - $this->assertNoFieldByXPath('//table[@id="field-overview"]//span[@class="label-field"]', $label, 'Field does not appear in the overview page.'); - } -} - -/** - * Tests the functionality of the 'Manage fields' screen. - */ -class FieldUIManageFieldsTestCase extends FieldUITestCase { - public static function getInfo() { - return array( - 'name' => 'Manage fields', - 'description' => 'Test the Field UI "Manage fields" screen.', - 'group' => 'Field UI', - ); - } - - function setUp() { - parent::setUp(); - - // Create random field name. - $this->field_label = $this->randomName(8); - $this->field_name_input = strtolower($this->randomName(8)); - $this->field_name = 'field_'. $this->field_name_input; - } - - /** - * Runs the field CRUD tests. - * - * In order to act on the same fields, and not create the fields over and over - * again the following tests create, update and delete the same fields. - */ - function testCRUDFields() { - $this->manageFieldsPage(); - $this->createField(); - $this->updateField(); - $this->addExistingField(); - } - - /** - * Tests the manage fields page. - */ - function manageFieldsPage() { - $this->drupalGet('admin/structure/types/manage/' . $this->hyphen_type . '/fields'); - // Check all table columns. - $table_headers = array( - t('Label'), - t('Machine name'), - t('Field type'), - t('Widget'), - t('Operations'), - ); - foreach ($table_headers as $table_header) { - // We check that the label appear in the table headings. - $this->assertRaw($table_header . '', format_string('%table_header table header was found.', array('%table_header' => $table_header))); - } - - // "Add new field" and "Add existing field" aren't a table heading so just - // test the text. - foreach (array('Add new field', 'Add existing field') as $element) { - $this->assertText($element, format_string('"@element" was found.', array('@element' => $element))); - } - } - - /** - * Tests adding a new field. - * - * @todo Assert properties can bet set in the form and read back in $field and - * $instances. - */ - function createField() { - // Create a test field. - $edit = array( - 'fields[_add_new_field][label]' => $this->field_label, - 'fields[_add_new_field][field_name]' => $this->field_name_input, - ); - $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->hyphen_type, $edit); - - // Assert the field appears in the "add existing field" section for - // different entity types; e.g. if a field was added in a node entity, it - // should also appear in the 'taxonomy term' entity. - $vocabulary = taxonomy_vocabulary_load(1); - $this->drupalGet('admin/structure/taxonomy/' . $vocabulary->machine_name . '/fields'); - $this->assertTrue($this->xpath('//select[@name="fields[_add_existing_field][field_name]"]//option[@value="' . $this->field_name . '"]'), 'Existing field was found in account settings.'); - } - - /** - * Tests editing an existing field. - */ - function updateField() { - // Go to the field edit page. - $this->drupalGet('admin/structure/types/manage/' . $this->hyphen_type . '/fields/' . $this->field_name); - - // Populate the field settings with new settings. - $string = 'updated dummy test string'; - $edit = array( - 'field[settings][test_field_setting]' => $string, - 'instance[settings][test_instance_setting]' => $string, - 'instance[widget][settings][test_widget_setting]' => $string, - ); - $this->drupalPost(NULL, $edit, t('Save settings')); - - // Assert the field settings are correct. - $this->assertFieldSettings($this->type, $this->field_name, $string); - - // Assert redirection back to the "manage fields" page. - $this->assertText(t('Saved @label configuration.', array('@label' => $this->field_label)), 'Redirected to "Manage fields" page.'); - } - - /** - * Tests adding an existing field in another content type. - */ - function addExistingField() { - // Check "Add existing field" appears. - $this->drupalGet('admin/structure/types/manage/page/fields'); - $this->assertRaw(t('Add existing field'), '"Add existing field" was found.'); - - // Check that the list of options respects entity type restrictions on - // fields. The 'comment' field is restricted to the 'comment' entity type - // and should not appear in the list. - $this->assertFalse($this->xpath('//select[@id="edit-add-existing-field-field-name"]//option[@value="comment"]'), 'The list of options respects entity type restrictions.'); - - // Add a new field based on an existing field. - $edit = array( - 'fields[_add_existing_field][label]' => $this->field_label . '_2', - 'fields[_add_existing_field][field_name]' => $this->field_name, - ); - $this->fieldUIAddExistingField("admin/structure/types/manage/page", $edit); - } - - /** - * Asserts field settings are as expected. - * - * @param $bundle - * The bundle name for the instance. - * @param $field_name - * The field name for the instance. - * @param $string - * The settings text. - * @param $entity_type - * The entity type for the instance. - */ - function assertFieldSettings($bundle, $field_name, $string = 'dummy test string', $entity_type = 'node') { - // Reset the fields info. - field_info_cache_clear(); - // Assert field settings. - $field = field_info_field($field_name); - $this->assertTrue($field['settings']['test_field_setting'] == $string, 'Field settings were found.'); - - // Assert instance and widget settings. - $instance = field_info_instance($entity_type, $field_name, $bundle); - $this->assertTrue($instance['settings']['test_instance_setting'] == $string, 'Field instance settings were found.'); - $this->assertTrue($instance['widget']['settings']['test_widget_setting'] == $string, 'Field widget settings were found.'); - } - - /** - * Tests that default value is correctly validated and saved. - */ - function testDefaultValue() { - // Create a test field and instance. - $field_name = 'test'; - $field = array( - 'field_name' => $field_name, - 'type' => 'test_field' - ); - field_create_field($field); - $instance = array( - 'field_name' => $field_name, - 'entity_type' => 'node', - 'bundle' => $this->type, - ); - field_create_instance($instance); - - $langcode = LANGUAGE_NONE; - $admin_path = 'admin/structure/types/manage/' . $this->hyphen_type . '/fields/' . $field_name; - $element_id = "edit-$field_name-$langcode-0-value"; - $element_name = "{$field_name}[$langcode][0][value]"; - $this->drupalGet($admin_path); - $this->assertFieldById($element_id, '', 'The default value widget was empty.'); - - // Check that invalid default values are rejected. - $edit = array($element_name => '-1'); - $this->drupalPost($admin_path, $edit, t('Save settings')); - $this->assertText("$field_name does not accept the value -1", 'Form vaildation failed.'); - - // Check that the default value is saved. - $edit = array($element_name => '1'); - $this->drupalPost($admin_path, $edit, t('Save settings')); - $this->assertText("Saved $field_name configuration", 'The form was successfully submitted.'); - $instance = field_info_instance('node', $field_name, $this->type); - $this->assertEqual($instance['default_value'], array(array('value' => 1)), 'The default value was correctly saved.'); - - // Check that the default value shows up in the form - $this->drupalGet($admin_path); - $this->assertFieldById($element_id, '1', 'The default value widget was displayed with the correct value.'); - - // Check that the default value can be emptied. - $edit = array($element_name => ''); - $this->drupalPost(NULL, $edit, t('Save settings')); - $this->assertText("Saved $field_name configuration", 'The form was successfully submitted.'); - field_info_cache_clear(); - $instance = field_info_instance('node', $field_name, $this->type); - $this->assertEqual($instance['default_value'], NULL, 'The default value was correctly saved.'); - } - - /** - * Tests that deletion removes fields and instances as expected. - */ - function testDeleteField() { - // Create a new field. - $bundle_path1 = 'admin/structure/types/manage/' . $this->hyphen_type; - $edit1 = array( - 'fields[_add_new_field][label]' => $this->field_label, - 'fields[_add_new_field][field_name]' => $this->field_name_input, - ); - $this->fieldUIAddNewField($bundle_path1, $edit1); - - // Create an additional node type. - $type_name2 = strtolower($this->randomName(8)) . '_test'; - $type2 = $this->drupalCreateContentType(array('name' => $type_name2, 'type' => $type_name2)); - $type_name2 = $type2->type; - $hyphen_type2 = str_replace('_', '-', $type_name2); - - // Add an instance to the second node type. - $bundle_path2 = 'admin/structure/types/manage/' . $hyphen_type2; - $edit2 = array( - 'fields[_add_existing_field][label]' => $this->field_label, - 'fields[_add_existing_field][field_name]' => $this->field_name, - ); - $this->fieldUIAddExistingField($bundle_path2, $edit2); - - // Delete the first instance. - $this->fieldUIDeleteField($bundle_path1, $this->field_name, $this->field_label, $this->type); - - // Reset the fields info. - field_info_cache_clear(); - // Check that the field instance was deleted. - $this->assertNull(field_info_instance('node', $this->field_name, $this->type), 'Field instance was deleted.'); - // Check that the field was not deleted - $this->assertNotNull(field_info_field($this->field_name), 'Field was not deleted.'); - - // Delete the second instance. - $this->fieldUIDeleteField($bundle_path2, $this->field_name, $this->field_label, $type_name2); - - // Reset the fields info. - field_info_cache_clear(); - // Check that the field instance was deleted. - $this->assertNull(field_info_instance('node', $this->field_name, $type_name2), 'Field instance was deleted.'); - // Check that the field was deleted too. - $this->assertNull(field_info_field($this->field_name), 'Field was deleted.'); - } - - /** - * Tests that Field UI respects the 'no_ui' option in hook_field_info(). - */ - function testHiddenFields() { - $bundle_path = 'admin/structure/types/manage/' . $this->hyphen_type . '/fields/'; - - // Check that the field type is not available in the 'add new field' row. - $this->drupalGet($bundle_path); - $this->assertFalse($this->xpath('//select[@id="edit-add-new-field-type"]//option[@value="hidden_test_field"]'), "The 'add new field' select respects field types 'no_ui' property."); - - // Create a field and an instance programmatically. - $field_name = 'hidden_test_field'; - field_create_field(array('field_name' => $field_name, 'type' => $field_name)); - $instance = array( - 'field_name' => $field_name, - 'bundle' => $this->type, - 'entity_type' => 'node', - 'label' => t('Hidden field'), - 'widget' => array('type' => 'test_field_widget'), - ); - field_create_instance($instance); - $this->assertTrue(field_read_instance('node', $field_name, $this->type), format_string('An instance of the field %field was created programmatically.', array('%field' => $field_name))); - - // Check that the newly added instance appears on the 'Manage Fields' - // screen. - $this->drupalGet($bundle_path); - $this->assertFieldByXPath('//table[@id="field-overview"]//td[1]', $instance['label'], 'Field was created and appears in the overview page.'); - - // Check that the instance does not appear in the 'add existing field' row - // on other bundles. - $bundle_path = 'admin/structure/types/manage/article/fields/'; - $this->drupalGet($bundle_path); - $this->assertFalse($this->xpath('//select[@id="edit-add-existing-field-field-name"]//option[@value=:field_name]', array(':field_name' => $field_name)), "The 'add existing field' select respects field types 'no_ui' property."); - } - - /** - * Tests renaming a bundle. - */ - function testRenameBundle() { - $type2 = strtolower($this->randomName(8)) . '_' .'test'; - $hyphen_type2 = str_replace('_', '-', $type2); - - $options = array( - 'type' => $type2, - ); - $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type, $options, t('Save content type')); - - $this->drupalGet('admin/structure/types/manage/' . $hyphen_type2 . '/fields'); - } - - /** - * Tests that a duplicate field name is caught by validation. - */ - function testDuplicateFieldName() { - // field_tags already exists, so we're expecting an error when trying to - // create a new field with the same name. - $edit = array( - 'fields[_add_new_field][field_name]' => 'tags', - 'fields[_add_new_field][label]' => $this->randomName(), - 'fields[_add_new_field][type]' => 'taxonomy_term_reference', - 'fields[_add_new_field][widget_type]' => 'options_select', - ); - $url = 'admin/structure/types/manage/' . $this->hyphen_type . '/fields'; - $this->drupalPost($url, $edit, t('Save')); - - $this->assertText(t('The machine-readable name is already in use. It must be unique.')); - $this->assertUrl($url, array(), 'Stayed on the same page.'); - } -} - -/** - * Tests the functionality of the 'Manage display' screens. - */ -class FieldUIManageDisplayTestCase extends FieldUITestCase { - public static function getInfo() { - return array( - 'name' => 'Manage display', - 'description' => 'Test the Field UI "Manage display" screens.', - 'group' => 'Field UI', - ); - } - - function setUp() { - parent::setUp(array('search')); - } - - /** - * Tests formatter settings. - */ - function testFormatterUI() { - $manage_fields = 'admin/structure/types/manage/' . $this->hyphen_type; - $manage_display = $manage_fields . '/display'; - - // Create a field, and a node with some data for the field. - $edit = array( - 'fields[_add_new_field][label]' => 'Test field', - 'fields[_add_new_field][field_name]' => 'test', - ); - $this->fieldUIAddNewField($manage_fields, $edit); - - // Clear the test-side cache and get the saved field instance. - field_info_cache_clear(); - $instance = field_info_instance('node', 'field_test', $this->type); - $format = $instance['display']['default']['type']; - $default_settings = field_info_formatter_settings($format); - $setting_name = key($default_settings); - $setting_value = $instance['display']['default']['settings'][$setting_name]; - - // Display the "Manage display" screen and check that the expected formatter is - // selected. - $this->drupalGet($manage_display); - $this->assertFieldByName('fields[field_test][type]', $format, 'The expected formatter is selected.'); - $this->assertText("$setting_name: $setting_value", 'The expected summary is displayed.'); - - // Change the formatter and check that the summary is updated. - $edit = array('fields[field_test][type]' => 'field_test_multiple', 'refresh_rows' => 'field_test'); - $this->drupalPostAJAX(NULL, $edit, array('op' => t('Refresh'))); - $format = 'field_test_multiple'; - $default_settings = field_info_formatter_settings($format); - $setting_name = key($default_settings); - $setting_value = $default_settings[$setting_name]; - $this->assertFieldByName('fields[field_test][type]', $format, 'The expected formatter is selected.'); - $this->assertText("$setting_name: $setting_value", 'The expected summary is displayed.'); - - // Submit the form and check that the instance is updated. - $this->drupalPost(NULL, array(), t('Save')); - field_info_cache_clear(); - $instance = field_info_instance('node', 'field_test', $this->type); - $current_format = $instance['display']['default']['type']; - $current_setting_value = $instance['display']['default']['settings'][$setting_name]; - $this->assertEqual($current_format, $format, 'The formatter was updated.'); - $this->assertEqual($current_setting_value, $setting_value, 'The setting was updated.'); - } - - /** - * Tests switching view modes to use custom or 'default' settings'. - */ - function testViewModeCustom() { - // Create a field, and a node with some data for the field. - $edit = array( - 'fields[_add_new_field][label]' => 'Test field', - 'fields[_add_new_field][field_name]' => 'test', - ); - $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->hyphen_type, $edit); - // For this test, use a formatter setting value that is an integer unlikely - // to appear in a rendered node other than as part of the field being tested - // (for example, unlikely to be part of the "Submitted by ... on ..." line). - $value = 12345; - $settings = array( - 'type' => $this->type, - 'field_test' => array(LANGUAGE_NONE => array(array('value' => $value))), - ); - $node = $this->drupalCreateNode($settings); - - // Gather expected output values with the various formatters. - $formatters = field_info_formatter_types(); - $output = array( - 'field_test_default' => $formatters['field_test_default']['settings']['test_formatter_setting'] . '|' . $value, - 'field_test_with_prepare_view' => $formatters['field_test_with_prepare_view']['settings']['test_formatter_setting_additional'] . '|' . $value. '|' . ($value + 1), - ); - - // Check that the field is displayed with the default formatter in 'rss' - // mode (uses 'default'), and hidden in 'teaser' mode (uses custom settings). - $this->assertNodeViewText($node, 'rss', $output['field_test_default'], "The field is displayed as expected in view modes that use 'default' settings."); - $this->assertNodeViewNoText($node, 'teaser', $value, "The field is hidden in view modes that use custom settings."); - - // Change fomatter for 'default' mode, check that the field is displayed - // accordingly in 'rss' mode. - $edit = array( - 'fields[field_test][type]' => 'field_test_with_prepare_view', - ); - $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type . '/display', $edit, t('Save')); - $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected in view modes that use 'default' settings."); - - // Specialize the 'rss' mode, check that the field is displayed the same. - $edit = array( - "view_modes_custom[rss]" => TRUE, - ); - $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type . '/display', $edit, t('Save')); - $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected in newly specialized 'rss' mode."); - - // Set the field to 'hidden' in the view mode, check that the field is - // hidden. - $edit = array( - 'fields[field_test][type]' => 'hidden', - ); - $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type . '/display/rss', $edit, t('Save')); - $this->assertNodeViewNoText($node, 'rss', $value, "The field is hidden in 'rss' mode."); - - // Set the view mode back to 'default', check that the field is displayed - // accordingly. - $edit = array( - "view_modes_custom[rss]" => FALSE, - ); - $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type . '/display', $edit, t('Save')); - $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected when 'rss' mode is set back to 'default' settings."); - - // Specialize the view mode again. - $edit = array( - "view_modes_custom[rss]" => TRUE, - ); - $this->drupalPost('admin/structure/types/manage/' . $this->hyphen_type . '/display', $edit, t('Save')); - // Check that the previous settings for the view mode have been kept. - $this->assertNodeViewNoText($node, 'rss', $value, "The previous settings are kept when 'rss' mode is specialized again."); - } - - /** - * Asserts that a string is found in the rendered node in a view mode. - * - * @param $node - * The node. - * @param $view_mode - * The view mode in which the node should be displayed. - * @param $text - * Plain text to look for. - * @param $message - * Message to display. - * - * @return - * TRUE on pass, FALSE on fail. - */ - function assertNodeViewText($node, $view_mode, $text, $message) { - return $this->assertNodeViewTextHelper($node, $view_mode, $text, $message, FALSE); - } - - /** - * Asserts that a string is not found in the rendered node in a view mode. - * - * @param $node - * The node. - * @param $view_mode - * The view mode in which the node should be displayed. - * @param $text - * Plain text to look for. - * @param $message - * Message to display. - * @return - * TRUE on pass, FALSE on fail. - */ - function assertNodeViewNoText($node, $view_mode, $text, $message) { - return $this->assertNodeViewTextHelper($node, $view_mode, $text, $message, TRUE); - } - - /** - * Asserts that a string is (not) found in the rendered nodein a view mode. - * - * This helper function is used by assertNodeViewText() and - * assertNodeViewNoText(). - * - * @param $node - * The node. - * @param $view_mode - * The view mode in which the node should be displayed. - * @param $text - * Plain text to look for. - * @param $message - * Message to display. - * @param $not_exists - * TRUE if this text should not exist, FALSE if it should. - * - * @return - * TRUE on pass, FALSE on fail. - */ - function assertNodeViewTextHelper($node, $view_mode, $text, $message, $not_exists) { - // Make sure caches on the tester side are refreshed after changes - // submitted on the tested side. - field_info_cache_clear(); - - // Save current content so that we can restore it when we're done. - $old_content = $this->drupalGetContent(); - - // Render a cloned node, so that we do not alter the original. - $clone = clone $node; - $element = node_view($clone, $view_mode); - $output = drupal_render($element); - $this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '
'. $output); - - // Assign content so that DrupalWebTestCase functions can be used. - $this->drupalSetContent($output); - $method = ($not_exists ? 'assertNoText' : 'assertText'); - $return = $this->{$method}((string) $text, $message); - - // Restore previous content. - $this->drupalSetContent($old_content); - - return $return; - } -} - -/** - * Tests custom widget hooks and callbacks on the field administration pages. - */ -class FieldUIAlterTestCase extends DrupalWebTestCase { - public static function getInfo() { - return array( - 'name' => 'Widget customization', - 'description' => 'Test custom field widget hooks and callbacks on field administration pages.', - 'group' => 'Field UI', - ); - } - - function setUp() { - parent::setUp(array('field_test')); - - // Create test user. - $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer users')); - $this->drupalLogin($admin_user); - } - - /** - * Tests hook_field_widget_properties_alter() on the default field widget. - * - * @see field_test_field_widget_properties_alter() - * @see field_test_field_widget_properties_user_alter() - * @see field_test_field_widget_form_alter() - */ - function testDefaultWidgetPropertiesAlter() { - // Create the alter_test_text field and an instance on article nodes. - field_create_field(array( - 'field_name' => 'alter_test_text', - 'type' => 'text', - )); - field_create_instance(array( - 'field_name' => 'alter_test_text', - 'entity_type' => 'node', - 'bundle' => 'article', - 'widget' => array( - 'type' => 'text_textfield', - 'size' => 60, - ), - )); - - // Test that field_test_field_widget_properties_alter() sets the size to - // 42 and that field_test_field_widget_form_alter() reports the correct - // size when the form is displayed. - $this->drupalGet('admin/structure/types/manage/article/fields/alter_test_text'); - $this->assertText('Field size: 42', 'Altered field size is found in hook_field_widget_form_alter().'); - - // Create the alter_test_options field. - field_create_field(array( - 'field_name' => 'alter_test_options', - 'type' => 'list_text' - )); - // Create instances on users and page nodes. - field_create_instance(array( - 'field_name' => 'alter_test_options', - 'entity_type' => 'user', - 'bundle' => 'user', - 'widget' => array( - 'type' => 'options_select', - ) - )); - field_create_instance(array( - 'field_name' => 'alter_test_options', - 'entity_type' => 'node', - 'bundle' => 'page', - 'widget' => array( - 'type' => 'options_select', - ) - )); - - // Test that field_test_field_widget_properties_user_alter() replaces - // the widget and that field_test_field_widget_form_alter() reports the - // correct widget name when the form is displayed. - $this->drupalGet('admin/config/people/accounts/fields/alter_test_options'); - $this->assertText('Widget type: options_buttons', 'Widget type is altered for users in hook_field_widget_form_alter().'); - - // Test that the widget is not altered on page nodes. - $this->drupalGet('admin/structure/types/manage/page/fields/alter_test_options'); - $this->assertText('Widget type: options_select', 'Widget type is not altered for pages in hook_field_widget_form_alter().'); - } -} diff --git a/modules/file/file.api.php b/modules/file/file.api.php deleted file mode 100644 index df178c6..0000000 --- a/modules/file/file.api.php +++ /dev/null @@ -1,60 +0,0 @@ - $grants['node']); - } -} diff --git a/modules/file/file.css b/modules/file/file.css deleted file mode 100644 index bd4a059..0000000 --- a/modules/file/file.css +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file - * Admin stylesheet for file module. - */ - -/** - * Managed file element styles. - */ -.form-managed-file .form-file, -.form-managed-file .form-submit { - margin: 0; -} - -.form-managed-file input.progress-disabled { - float: none; - display: inline; -} - -.form-managed-file div.ajax-progress, -.form-managed-file div.throbber { - display: inline; - float: none; - padding: 1px 5px 2px 5px; -} - -.form-managed-file div.ajax-progress-bar { - display: none; - margin-top: 4px; - width: 28em; - padding: 0; -} - -.form-managed-file div.ajax-progress-bar div.bar { - margin: 0; -} diff --git a/modules/file/file.info b/modules/file/file.info deleted file mode 100644 index eda79f9..0000000 --- a/modules/file/file.info +++ /dev/null @@ -1,7 +0,0 @@ -name = File -description = Defines a file field type. -package = Core -version = VERSION -core = 7.x -dependencies[] = field -files[] = tests/file.test diff --git a/modules/file/file.install b/modules/file/file.install deleted file mode 100644 index 47ee4fd..0000000 --- a/modules/file/file.install +++ /dev/null @@ -1,98 +0,0 @@ - array( - 'fid' => array( - 'description' => 'The {file_managed}.fid being referenced in this field.', - 'type' => 'int', - 'not null' => FALSE, - 'unsigned' => TRUE, - ), - 'display' => array( - 'description' => 'Flag to control whether this file should be displayed when viewing content.', - 'type' => 'int', - 'size' => 'tiny', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 1, - ), - 'description' => array( - 'description' => 'A description of the file.', - 'type' => 'text', - 'not null' => FALSE, - ), - ), - 'indexes' => array( - 'fid' => array('fid'), - ), - 'foreign keys' => array( - 'fid' => array( - 'table' => 'file_managed', - 'columns' => array('fid' => 'fid'), - ), - ), - ); -} - -/** - * Implements hook_requirements(). - * - * Display information about getting upload progress bars working. - */ -function file_requirements($phase) { - $requirements = array(); - - // Check the server's ability to indicate upload progress. - if ($phase == 'runtime') { - $implementation = file_progress_implementation(); - $apache = strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== FALSE; - $fastcgi = strpos($_SERVER['SERVER_SOFTWARE'], 'mod_fastcgi') !== FALSE || strpos($_SERVER["SERVER_SOFTWARE"], 'mod_fcgi') !== FALSE; - $description = NULL; - if (!$apache) { - $value = t('Not enabled'); - $description = t('Your server is not capable of displaying file upload progress. File upload progress requires an Apache server running PHP with mod_php.'); - $severity = REQUIREMENT_INFO; - } - elseif ($fastcgi) { - $value = t('Not enabled'); - $description = t('Your server is not capable of displaying file upload progress. File upload progress requires PHP be run with mod_php and not as FastCGI.'); - $severity = REQUIREMENT_INFO; - } - elseif (!$implementation && extension_loaded('apc')) { - $value = t('Not enabled'); - $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Addapc.rfc1867 = 1to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.'); - $severity = REQUIREMENT_INFO; - } - elseif (!$implementation) { - $value = t('Not enabled'); - $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.'); - $severity = REQUIREMENT_INFO; - } - elseif ($implementation == 'apc') { - $value = t('Enabled (APC RFC1867)'); - $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.'); - $severity = REQUIREMENT_OK; - } - elseif ($implementation == 'uploadprogress') { - $value = t('Enabled (PECL uploadprogress)'); - $severity = REQUIREMENT_OK; - } - $requirements['file_progress'] = array( - 'title' => t('Upload progress'), - 'value' => $value, - 'severity' => $severity, - 'description' => $description, - ); - } - - return $requirements; -} diff --git a/modules/file/icons/application-octet-stream.png b/modules/file/icons/application-octet-stream.png deleted file mode 100644 index d545321..0000000 Binary files a/modules/file/icons/application-octet-stream.png and /dev/null differ diff --git a/modules/file/icons/application-pdf.png b/modules/file/icons/application-pdf.png deleted file mode 100644 index 36107d6..0000000 Binary files a/modules/file/icons/application-pdf.png and /dev/null differ diff --git a/modules/file/icons/application-x-executable.png b/modules/file/icons/application-x-executable.png deleted file mode 100644 index d545321..0000000 Binary files a/modules/file/icons/application-x-executable.png and /dev/null differ diff --git a/modules/file/icons/audio-x-generic.png b/modules/file/icons/audio-x-generic.png deleted file mode 100644 index 28d7f50..0000000 Binary files a/modules/file/icons/audio-x-generic.png and /dev/null differ diff --git a/modules/file/icons/image-x-generic.png b/modules/file/icons/image-x-generic.png deleted file mode 100644 index c1b814f..0000000 Binary files a/modules/file/icons/image-x-generic.png and /dev/null differ diff --git a/modules/file/icons/package-x-generic.png b/modules/file/icons/package-x-generic.png deleted file mode 100644 index 21fc382..0000000 Binary files a/modules/file/icons/package-x-generic.png and /dev/null differ diff --git a/modules/file/icons/text-html.png b/modules/file/icons/text-html.png deleted file mode 100644 index 9c7c793..0000000 Binary files a/modules/file/icons/text-html.png and /dev/null differ diff --git a/modules/file/icons/text-plain.png b/modules/file/icons/text-plain.png deleted file mode 100644 index 0680484..0000000 Binary files a/modules/file/icons/text-plain.png and /dev/null differ diff --git a/modules/file/icons/text-x-generic.png b/modules/file/icons/text-x-generic.png deleted file mode 100644 index 0680484..0000000 Binary files a/modules/file/icons/text-x-generic.png and /dev/null differ diff --git a/modules/file/icons/text-x-script.png b/modules/file/icons/text-x-script.png deleted file mode 100644 index f9ecca8..0000000 Binary files a/modules/file/icons/text-x-script.png and /dev/null differ diff --git a/modules/file/icons/video-x-generic.png b/modules/file/icons/video-x-generic.png deleted file mode 100644 index a2b71f9..0000000 Binary files a/modules/file/icons/video-x-generic.png and /dev/null differ diff --git a/modules/file/icons/x-office-document.png b/modules/file/icons/x-office-document.png deleted file mode 100644 index 40db538..0000000 Binary files a/modules/file/icons/x-office-document.png and /dev/null differ diff --git a/modules/file/icons/x-office-presentation.png b/modules/file/icons/x-office-presentation.png deleted file mode 100644 index fb119e5..0000000 Binary files a/modules/file/icons/x-office-presentation.png and /dev/null differ diff --git a/modules/file/icons/x-office-spreadsheet.png b/modules/file/icons/x-office-spreadsheet.png deleted file mode 100644 index 9af7b61..0000000 Binary files a/modules/file/icons/x-office-spreadsheet.png and /dev/null differ diff --git a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info deleted file mode 100644 index 8db907b..0000000 --- a/modules/file/tests/file_module_test.info +++ /dev/null @@ -1,6 +0,0 @@ -name = File test -description = Provides hooks for testing File module functionality. -package = Core -version = VERSION -core = 7.x -hidden = TRUE diff --git a/modules/file/tests/file_module_test.module b/modules/file/tests/file_module_test.module deleted file mode 100644 index f66c749..0000000 --- a/modules/file/tests/file_module_test.module +++ /dev/null @@ -1,69 +0,0 @@ - 'Managed file test', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('file_module_test_form'), - 'access arguments' => array('access content'), - ); - - return $items; -} - -/** - * Form constructor for testing a 'managed_file' element. - * - * @see file_module_test_form_submit() - * @ingroup forms - */ -function file_module_test_form($form, &$form_state, $tree = TRUE, $extended = FALSE, $default_fid = NULL) { - $form['#tree'] = (bool) $tree; - - $form['nested']['file'] = array( - '#type' => 'managed_file', - '#title' => t('Managed file'), - '#upload_location' => 'public://test', - '#progress_message' => t('Please wait...'), - '#extended' => (bool) $extended, - '#size' => 13, - ); - if ($default_fid) { - $form['nested']['file']['#default_value'] = $extended ? array('fid' => $default_fid) : $default_fid; - } - - $form['textfield'] = array( - '#type' => 'textfield', - '#title' => t('Type a value and ensure it stays'), - ); - - $form['submit'] = array( - '#type' => 'submit', - '#value' => t('Save'), - ); - - return $form; -} - -/** - * Form submission handler for file_module_test_form(). - */ -function file_module_test_form_submit($form, &$form_state) { - if ($form['#tree']) { - $fid = $form['nested']['file']['#extended'] ? $form_state['values']['nested']['file']['fid'] : $form_state['values']['nested']['file']; - } - else { - $fid = $form['nested']['file']['#extended'] ? $form_state['values']['file']['fid'] : $form_state['values']['file']; - } - drupal_set_message(t('The file id is %fid.', array('%fid' => $fid))); -} diff --git a/modules/filter/filter.admin.inc b/modules/filter/filter.admin.inc deleted file mode 100644 index 60284d9..0000000 --- a/modules/filter/filter.admin.inc +++ /dev/null @@ -1,408 +0,0 @@ - $format) { - // Check whether this is the fallback text format. This format is available - // to all roles and cannot be disabled via the admin interface. - $form['formats'][$id]['#is_fallback'] = ($id == $fallback_format); - if ($form['formats'][$id]['#is_fallback']) { - $form['formats'][$id]['name'] = array('#markup' => drupal_placeholder($format->name)); - $roles_markup = drupal_placeholder(t('All roles may use this format')); - } - else { - $form['formats'][$id]['name'] = array('#markup' => check_plain($format->name)); - $roles = array_map('check_plain', filter_get_roles_by_format($format)); - $roles_markup = $roles ? implode(', ', $roles) : t('No roles may use this format'); - } - $form['formats'][$id]['roles'] = array('#markup' => $roles_markup); - $form['formats'][$id]['configure'] = array('#type' => 'link', '#title' => t('configure'), '#href' => 'admin/config/content/formats/' . $id); - $form['formats'][$id]['disable'] = array('#type' => 'link', '#title' => t('disable'), '#href' => 'admin/config/content/formats/' . $id . '/disable', '#access' => !$form['formats'][$id]['#is_fallback']); - $form['formats'][$id]['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight for @title', array('@title' => $format->name)), - '#title_display' => 'invisible', - '#default_value' => $format->weight, - ); - } - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save changes')); - return $form; -} - -/** - * Form submission handler for filter_admin_overview(). - */ -function filter_admin_overview_submit($form, &$form_state) { - foreach ($form_state['values']['formats'] as $id => $data) { - if (is_array($data) && isset($data['weight'])) { - // Only update if this is a form element with weight. - db_update('filter_format') - ->fields(array('weight' => $data['weight'])) - ->condition('format', $id) - ->execute(); - } - } - filter_formats_reset(); - drupal_set_message(t('The text format ordering has been saved.')); -} - -/** - * Returns HTML for the text format administration overview form. - * - * @param $variables - * An associative array containing: - * - form: A render element representing the form. - * - * @ingroup themeable - */ -function theme_filter_admin_overview($variables) { - $form = $variables['form']; - - $rows = array(); - foreach (element_children($form['formats']) as $id) { - $form['formats'][$id]['weight']['#attributes']['class'] = array('text-format-order-weight'); - $rows[] = array( - 'data' => array( - drupal_render($form['formats'][$id]['name']), - drupal_render($form['formats'][$id]['roles']), - drupal_render($form['formats'][$id]['weight']), - drupal_render($form['formats'][$id]['configure']), - drupal_render($form['formats'][$id]['disable']), - ), - 'class' => array('draggable'), - ); - } - $header = array(t('Name'), t('Roles'), t('Weight'), array('data' => t('Operations'), 'colspan' => 2)); - $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'text-format-order'))); - $output .= drupal_render_children($form); - - drupal_add_tabledrag('text-format-order', 'order', 'sibling', 'text-format-order-weight'); - - return $output; -} - -/** - * Page callback: Displays the text format add/edit form. - * - * @param object|null $format - * (optional) An object representing a format, with the following properties: - * - format: A machine-readable name representing the ID of the text format - * to save. If this corresponds to an existing text format, that format - * will be updated; otherwise, a new format will be created. - * - name: The title of the text format. - * - cache: (optional) An integer indicating whether the text format is - * cacheable (1) or not (0). Defaults to 1. - * - status: (optional) An integer indicating whether the text format is - * enabled (1) or not (0). Defaults to 1. - * - weight: (optional) The weight of the text format, which controls its - * placement in text format lists. If omitted, the weight is set to 0. - * Defaults to NULL. - * - * @return - * A form array. - * - * @see filter_menu() - */ -function filter_admin_format_page($format = NULL) { - if (!isset($format->name)) { - drupal_set_title(t('Add text format')); - $format = (object) array( - 'format' => NULL, - 'name' => '', - ); - } - return drupal_get_form('filter_admin_format_form', $format); -} - -/** - * Form constructor for the text format add/edit form. - * - * @param $format - * A format object having the properties: - * - format: A machine-readable name representing the ID of the text format to - * save. If this corresponds to an existing text format, that format will be - * updated; otherwise, a new format will be created. - * - name: The title of the text format. - * - cache: An integer indicating whether the text format is cacheable (1) or - * not (0). Defaults to 1. - * - status: (optional) An integer indicating whether the text format is - * enabled (1) or not (0). Defaults to 1. - * - weight: (optional) The weight of the text format, which controls its - * placement in text format lists. If omitted, the weight is set to 0. - * - * @see filter_admin_format_form_validate() - * @see filter_admin_format_form_submit() - * @ingroup forms - */ -function filter_admin_format_form($form, &$form_state, $format) { - $is_fallback = ($format->format == filter_fallback_format()); - - $form['#format'] = $format; - $form['#tree'] = TRUE; - $form['#attached']['js'][] = drupal_get_path('module', 'filter') . '/filter.admin.js'; - $form['#attached']['css'][] = drupal_get_path('module', 'filter') . '/filter.css'; - - $form['name'] = array( - '#type' => 'textfield', - '#title' => t('Name'), - '#default_value' => $format->name, - '#required' => TRUE, - ); - $form['format'] = array( - '#type' => 'machine_name', - '#required' => TRUE, - '#default_value' => $format->format, - '#maxlength' => 255, - '#machine_name' => array( - 'exists' => 'filter_format_exists', - ), - '#disabled' => !empty($format->format), - ); - - // Add user role access selection. - $form['roles'] = array( - '#type' => 'checkboxes', - '#title' => t('Roles'), - '#options' => array_map('check_plain', user_roles()), - '#disabled' => $is_fallback, - ); - if ($is_fallback) { - $form['roles']['#description'] = t('All roles for this text format must be enabled and cannot be changed.'); - } - if (!empty($format->format)) { - // If editing an existing text format, pre-select its current permissions. - $form['roles']['#default_value'] = array_keys(filter_get_roles_by_format($format)); - } - elseif ($admin_role = variable_get('user_admin_role', 0)) { - // If adding a new text format and the site has an administrative role, - // pre-select that role so as to grant administrators access to the new - // text format permission by default. - $form['roles']['#default_value'] = array($admin_role); - } - - // Retrieve available filters and load all configured filters for existing - // text formats. - $filter_info = filter_get_filters(); - $filters = !empty($format->format) ? filter_list_format($format->format) : array(); - - // Prepare filters for form sections. - foreach ($filter_info as $name => $filter) { - // Create an empty filter object for new/unconfigured filters. - if (!isset($filters[$name])) { - $filters[$name] = new stdClass(); - $filters[$name]->format = $format->format; - $filters[$name]->module = $filter['module']; - $filters[$name]->name = $name; - $filters[$name]->status = 0; - $filters[$name]->weight = $filter['weight']; - $filters[$name]->settings = array(); - } - } - $form['#filters'] = $filters; - - // Filter status. - $form['filters']['status'] = array( - '#type' => 'item', - '#title' => t('Enabled filters'), - '#prefix' => '', - '#suffix' => '', - ); - foreach ($filter_info as $name => $filter) { - $form['filters']['status'][$name] = array( - '#type' => 'checkbox', - '#title' => $filter['title'], - '#default_value' => $filters[$name]->status, - '#parents' => array('filters', $name, 'status'), - '#description' => $filter['description'], - '#weight' => $filter['weight'], - ); - } - - // Filter order (tabledrag). - $form['filters']['order'] = array( - '#type' => 'item', - '#title' => t('Filter processing order'), - '#theme' => 'filter_admin_format_filter_order', - ); - foreach ($filter_info as $name => $filter) { - $form['filters']['order'][$name]['filter'] = array( - '#markup' => $filter['title'], - ); - $form['filters']['order'][$name]['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight for @title', array('@title' => $filter['title'])), - '#title_display' => 'invisible', - '#delta' => 50, - '#default_value' => $filters[$name]->weight, - '#parents' => array('filters', $name, 'weight'), - ); - $form['filters']['order'][$name]['#weight'] = $filters[$name]->weight; - } - - // Filter settings. - $form['filter_settings_title'] = array( - '#type' => 'item', - '#title' => t('Filter settings'), - ); - $form['filter_settings'] = array( - '#type' => 'vertical_tabs', - ); - - foreach ($filter_info as $name => $filter) { - if (isset($filter['settings callback']) && function_exists($filter['settings callback'])) { - $function = $filter['settings callback']; - // Pass along stored filter settings and default settings, but also the - // format object and all filters to allow for complex implementations. - $defaults = (isset($filter['default settings']) ? $filter['default settings'] : array()); - $settings_form = $function($form, $form_state, $filters[$name], $format, $defaults, $filters); - if (!empty($settings_form)) { - $form['filters']['settings'][$name] = array( - '#type' => 'fieldset', - '#title' => $filter['title'], - '#parents' => array('filters', $name, 'settings'), - '#weight' => $filter['weight'], - '#group' => 'filter_settings', - ); - $form['filters']['settings'][$name] += $settings_form; - } - } - } - - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); - - return $form; -} - -/** - * Returns HTML for a text format's filter order form. - * - * @param $variables - * An associative array containing: - * - element: A render element representing the form. - * - * @ingroup themeable - */ -function theme_filter_admin_format_filter_order($variables) { - $element = $variables['element']; - - // Filter order (tabledrag). - $rows = array(); - foreach (element_children($element, TRUE) as $name) { - $element[$name]['weight']['#attributes']['class'][] = 'filter-order-weight'; - $rows[] = array( - 'data' => array( - drupal_render($element[$name]['filter']), - drupal_render($element[$name]['weight']), - ), - 'class' => array('draggable'), - ); - } - $output = drupal_render_children($element); - $output .= theme('table', array('rows' => $rows, 'attributes' => array('id' => 'filter-order'))); - drupal_add_tabledrag('filter-order', 'order', 'sibling', 'filter-order-weight', NULL, NULL, TRUE); - - return $output; -} - -/** - * Form validation handler for filter_admin_format_form(). - * - * @see filter_admin_format_form_submit() - */ -function filter_admin_format_form_validate($form, &$form_state) { - $format_format = trim($form_state['values']['format']); - $format_name = trim($form_state['values']['name']); - - // Ensure that the values to be saved later are exactly the ones validated. - form_set_value($form['format'], $format_format, $form_state); - form_set_value($form['name'], $format_name, $form_state); - - $result = db_query("SELECT format FROM {filter_format} WHERE name = :name AND format <> :format", array(':name' => $format_name, ':format' => $format_format))->fetchField(); - if ($result) { - form_set_error('name', t('Text format names must be unique. A format named %name already exists.', array('%name' => $format_name))); - } -} - -/** - * Form submission handler for filter_admin_format_form(). - * - * @see filter_admin_format_form_validate() - */ -function filter_admin_format_form_submit($form, &$form_state) { - // Remove unnecessary values. - form_state_values_clean($form_state); - - // Add the submitted form values to the text format, and save it. - $format = $form['#format']; - foreach ($form_state['values'] as $key => $value) { - $format->$key = $value; - } - $status = filter_format_save($format); - - // Save user permissions. - if ($permission = filter_permission_name($format)) { - foreach ($format->roles as $rid => $enabled) { - user_role_change_permissions($rid, array($permission => $enabled)); - } - } - - switch ($status) { - case SAVED_NEW: - drupal_set_message(t('Added text format %format.', array('%format' => $format->name))); - break; - - case SAVED_UPDATED: - drupal_set_message(t('The text format %format has been updated.', array('%format' => $format->name))); - break; - } -} - -/** - * Form constructor for the text format deletion confirmation form. - * - * @param $format - * An object representing a text format. - * - * @see filter_menu() - * @see filter_admin_disable_submit() - * @ingroup forms - */ -function filter_admin_disable($form, &$form_state, $format) { - $form['#format'] = $format; - - return confirm_form($form, - t('Are you sure you want to disable the text format %format?', array('%format' => $format->name)), - 'admin/config/content/formats', - t('Disabled text formats are completely removed from the administrative interface, and any content stored with that format will not be displayed. This action cannot be undone.'), - t('Disable') - ); -} - -/** - * Form submission handler for filter_admin_disable(). - */ -function filter_admin_disable_submit($form, &$form_state) { - $format = $form['#format']; - filter_format_disable($format); - drupal_set_message(t('Disabled text format %format.', array('%format' => $format->name))); - - $form_state['redirect'] = 'admin/config/content/formats'; -} diff --git a/modules/filter/filter.admin.js b/modules/filter/filter.admin.js deleted file mode 100644 index 3bc6233..0000000 --- a/modules/filter/filter.admin.js +++ /dev/null @@ -1,44 +0,0 @@ -(function ($) { - -Drupal.behaviors.filterStatus = { - attach: function (context, settings) { - $('#filters-status-wrapper input.form-checkbox', context).once('filter-status', function () { - var $checkbox = $(this); - // Retrieve the tabledrag row belonging to this filter. - var $row = $('#' + $checkbox.attr('id').replace(/-status$/, '-weight'), context).closest('tr'); - // Retrieve the vertical tab belonging to this filter. - var tab = $('#' + $checkbox.attr('id').replace(/-status$/, '-settings'), context).data('verticalTab'); - - // Bind click handler to this checkbox to conditionally show and hide the - // filter's tableDrag row and vertical tab pane. - $checkbox.bind('click.filterUpdate', function () { - if ($checkbox.is(':checked')) { - $row.show(); - if (tab) { - tab.tabShow().updateSummary(); - } - } - else { - $row.hide(); - if (tab) { - tab.tabHide().updateSummary(); - } - } - // Restripe table after toggling visibility of table row. - Drupal.tableDrag['filter-order'].restripeTable(); - }); - - // Attach summary for configurable filters (only for screen-readers). - if (tab) { - tab.fieldset.drupalSetSummary(function (tabContext) { - return $checkbox.is(':checked') ? Drupal.t('Enabled') : Drupal.t('Disabled'); - }); - } - - // Trigger our bound click handler to update elements to initial state. - $checkbox.triggerHandler('click.filterUpdate'); - }); - } -}; - -})(jQuery); diff --git a/modules/filter/filter.api.php b/modules/filter/filter.api.php deleted file mode 100644 index 2901eb9..0000000 --- a/modules/filter/filter.api.php +++ /dev/null @@ -1,323 +0,0 @@ - FALSE while developing, but be sure to remove that - * setting if it's not needed, when you are no longer in development mode. - * - * @return - * An associative array of filters, whose keys are internal filter names, - * which should be unique and therefore prefixed with the name of the module. - * Each value is an associative array describing the filter, with the - * following elements (all are optional except as noted): - * - title: (required) An administrative summary of what the filter does. - * - description: Additional administrative information about the filter's - * behavior, if needed for clarification. - * - settings callback: The name of a function that returns configuration form - * elements for the filter. See callback_filter_settings() for details. - * - default settings: An associative array containing default settings for - * the filter, to be applied when the filter has not been configured yet. - * - prepare callback: The name of a function that escapes the content before - * the actual filtering happens. See callback_filter_prepare() for - * details. - * - process callback: (required) The name the function that performs the - * actual filtering. See callback_filter_process() for details. - * - cache (default TRUE): Specifies whether the filtered text can be cached. - * Note that setting this to FALSE makes the entire text format not - * cacheable, which may have an impact on the site's overall performance. - * See filter_format_allowcache() for details. - * - tips callback: The name of a function that returns end-user-facing filter - * usage guidelines for the filter. See callback_filter_tips() for - * details. - * - weight: A default weight for the filter in new text formats. - * - * @see filter_example.module - * @see hook_filter_info_alter() - */ -function hook_filter_info() { - $filters['filter_html'] = array( - 'title' => t('Limit allowed HTML tags'), - 'description' => t('Allows you to restrict the HTML tags the user can use. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.'), - 'process callback' => '_filter_html', - 'settings callback' => '_filter_html_settings', - 'default settings' => array( - 'allowed_html' => '