diff --git a/core/lib/Drupal/Core/Annotation/Evaluate.php b/core/lib/Drupal/Core/Annotation/Evaluate.php new file mode 100644 index 0000000..a2dfd25 --- /dev/null +++ b/core/lib/Drupal/Core/Annotation/Evaluate.php @@ -0,0 +1,28 @@ +code = $values['value']; + } + + /** + * Implements AnnotationInterface::get(). + */ + public function get() { + return eval($this->code); + } +} diff --git a/core/lib/Drupal/Core/Annotation/Plugin.php b/core/lib/Drupal/Core/Annotation/Plugin.php index cb1ed60..d1a03c8 100644 --- a/core/lib/Drupal/Core/Annotation/Plugin.php +++ b/core/lib/Drupal/Core/Annotation/Plugin.php @@ -36,14 +36,22 @@ class Plugin implements AnnotationInterface { * classed annotations that were used. */ public function __construct($values) { + $this->definition = $this->parse($values); + } + + public function parse($values) { foreach ($values as $key => $value) { if ($value instanceof AnnotationInterface) { - $this->definition[$key] = $value->get(); + $definitions[$key] = $value->get(); + } + elseif (is_array($value)) { + $definitions[$key] = $this->parse($value); } else { - $this->definition[$key] = $value; + $definitions[$key] = $value; } } + return $definitions; } /** diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 047026a..ceecd3f 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -347,95 +347,6 @@ function aggregator_queue_info() { } /** - * 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 diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/CategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/CategoryBlock.php new file mode 100644 index 0000000..c6b2e9a --- /dev/null +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/CategoryBlock.php @@ -0,0 +1,36 @@ +derivatives) && !empty($this->derivatives[$derivative_id])) { + return $this->derivatives[$derivative_id]; + } + $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title WHERE cid = :cid', array(':cid' => $derivative_id))->fetchObject(); + $this->derivatives[$derivative_id] = $base_plugin_definition; + $this->derivatives[$derivative_id]['delta'] = $result->cid; + $this->derivatives[$derivative_id]['subject'] = t('@title category latest items', array('@title' => $result->title)); + return $this->derivatives[$derivative_id]; + } + + /** + * Implements DerivativeInterface::getDerivativeDefinitions(). + */ + public function getDerivativeDefinitions(array $base_plugin_definition) { + $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title'); + foreach ($result as $category) { + $this->derivatives[$category->cid] = $this->config; + $this->derivatives[$category->cid]['delta'] = $category->cid; + $this->derivatives[$category->cid]['subject'] = t('@title category latest items', array('@title' => $category->title)); + } + return $this->derivatives; + } +} diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/FeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/FeedBlock.php new file mode 100644 index 0000000..456535d --- /dev/null +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/FeedBlock.php @@ -0,0 +1,36 @@ +derivatives) && !empty($this->derivatives[$derivative_id])) { + return $this->derivatives[$derivative_id]; + } + $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title WHERE cid = :cid', array(':cid' => $derivative_id))->fetchObject(); + $this->derivatives[$derivative_id] = $base_plugin_definition; + $this->derivatives[$derivative_id]['delta'] = $result->cid; + $this->derivatives[$derivative_id]['subject'] = t('@title feed latest items', array('@title' => $result->title)); + return $this->derivatives[$derivative_id]; + } + + /** + * Implements DerivativeInterface::getDerivativeDefinitions(). + */ + public function getDerivativeDefinitions(array $base_plugin_definition) { + $result = db_query('SELECT fid, title FROM {aggregator_feed} WHERE block <> 0 ORDER BY fid'); + foreach ($result as $feed) { + $this->derivatives[$feed->fid] = $this->config; + $this->derivatives[$feed->fid]['delta'] = $feed->fid; + $this->derivatives[$feed->fid]['subject'] = t('@title feed latest items', array('@title' => $feed->title)); + } + return $this->derivatives; + } +} diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/CategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/CategoryBlock.php new file mode 100644 index 0000000..d893f67 --- /dev/null +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/CategoryBlock.php @@ -0,0 +1,83 @@ +derivatives = array(); + } + + /** + * Implements AccessInterface::access(). + */ + public function access() { + return user_access('access news feeds'); + } + + /** + * Implements BlockInterface::configure(). + */ + public function configure($form, &$form_state) { + $form = parent::configure($form, $form_state); + $form['block_count'] = array( + '#type' => 'select', + '#title' => t('Number of news items in block'), + '#default_value' => $this->config['settings']['block_count'], + '#options' => drupal_map_assoc(range(2, 20)), + ); + return $form; + } + + /** + * Implements BlockInterface::configureSubmit(). + */ + public function configureSubmit($form, &$form_state) { + parent::configureSubmit($form, $form_state); + $this->config['settings']['block_count'] = $form_state['values']['block_count']; + } + + /** + * Implements BlockInterface::build(). + */ + public function build() { + $id = $this->derivative; + if ($category = db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchObject()) { + $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, $this->config['settings']['block_count'], array(':cid' => $category->cid)); + $read_more = theme('more_link', array('url' => 'aggregator/categories/' . $category->cid, 'title' => t("View this category's recent news."))); + + $items = array(); + 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) { + return array( + '#block' => $this->derivatives[$this->derivative], + '#children' => theme('item_list', array('items' => $items)) . $read_more, + ); + } + return array(); + } + } +} diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/FeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/FeedBlock.php new file mode 100644 index 0000000..7a9e6d1 --- /dev/null +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/FeedBlock.php @@ -0,0 +1,81 @@ +derivatives = array(); + } + + /** + * Implements AccessInterface::access(). + */ + public function access() { + return user_access('access news feeds'); + } + + /** + * Implements BlockInterface::configure(). + */ + public function configure($form, &$form_state) { + $form = parent::configure($form, $form_state); + $form['block_count'] = array( + '#type' => 'select', + '#title' => t('Number of news items in block'), + '#default_value' => $this->config['block_count'], + '#options' => drupal_map_assoc(range(2, 20)), + ); + return $form; + } + + /** + * Implements BlockInterface::configureSubmit(). + */ + public function configureSubmit($form, &$form_state) { + parent::configureSubmit($form, $form_state); + $this->config['block_count'] = $form_state['values']['block_count']; + } + + /** + * Implements BlockInterface::build(). + */ + public function build() { + $id = $this->derivative; + if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) { + $result = db_query_range("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", 0, $this->config['block_count'], array(':fid' => $id)); + $read_more = theme('more_link', array('url' => 'aggregator/sources/' . $feed->fid, 'title' => t("View this feed's recent news."))); + + $items = array(); + 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) { + return array( + '#block' => $this->config, + '#children' => theme('item_list', array('items' => $items)) . $read_more, + ); + } + } + } +} diff --git a/core/modules/block/block-library-form.tpl.php b/core/modules/block/block-library-form.tpl.php new file mode 100644 index 0000000..8179076 --- /dev/null +++ b/core/modules/block/block-library-form.tpl.php @@ -0,0 +1,32 @@ + +
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,
- );
+ elseif (!$theme && isset($config['config_id'])) {
+ list(, , , $theme) = explode('.', $config['config_id']);
}
-
- // Configure the block visibility per language.
- if (module_exists('language') && language_multilingual()) {
- $configurable_language_types = language_types_get_configurable();
- $existing_language_settings = db_query("SELECT type, langcode FROM {block_language} WHERE module = :module AND delta = :delta", array(
- ':module' => $form['module']['#value'],
- ':delta' => $form['delta']['#value'],
- ))->fetchAll();
- $default_langcode_options = array();
- $default_language_type = $configurable_language_types[0];
- foreach ($existing_language_settings as $setting) {
- $default_langcode_options[] = $setting->langcode;
- // Overwrite default language type if we have it set. Although this
- // theoretically would allow per language type association, our UI
- // only allows language type association overall for a block, so we
- // only need a single value.
- $default_language_type = $setting->type;
- }
-
- // Fetch languages.
- $languages = language_list(LANGUAGE_ALL);
- foreach ($languages as $language) {
- // @TODO $language->name is not wrapped with t(), it should be replaced
- // by CMI translation implementation.
- $langcodes_options[$language->langcode] = $language->name;
- }
- $form['visibility']['language'] = array(
- '#type' => 'fieldset',
- '#title' => t('Languages'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#group' => 'visibility',
- '#weight' => 5,
- );
- // If there are multiple configurable language types, let the user pick
- // which one should be applied to this visibility setting. This way users
- // can limit blocks by interface language or content language for exmaple.
- $language_types = language_types_info();
- $language_type_options = array();
- foreach ($configurable_language_types as $type_key) {
- $language_type_options[$type_key] = $language_types[$type_key]['name'];
- }
- $form['visibility']['language']['language_type'] = array(
- '#type' => 'radios',
- '#title' => t('Language type'),
- '#options' => $language_type_options,
- '#default_value' => $default_language_type,
- '#access' => count($language_type_options) > 1,
- );
- $form['visibility']['language']['langcodes'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Show this block only for specific languages'),
- '#default_value' => $default_langcode_options,
- '#options' => $langcodes_options,
- '#description' => t('Show this block only for the selected language(s). If you select no languages, the block will be visibile in all languages.'),
- );
- }
-
- // 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'),
+ $form['theme'] = array(
+ '#type' => 'value',
+ '#value' => $theme,
);
-
+ $form += $instance->configure($form, $form_state);
return $form;
}
@@ -516,15 +276,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) {
* @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_state['values']['instance']->configureValidate($form, $form_state);
}
/**
@@ -534,186 +286,16 @@ function block_admin_configure_validate($form, &$form_state) {
* @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();
- }
-
- // Update the block visibility settings if we have settings to store
- // for the existing languages.
- if (module_exists('language') && isset($form_state['values']['langcodes'])) {
- db_delete('block_language')
- ->condition('module', $form_state['values']['module'])
- ->condition('delta', $form_state['values']['delta'])
- ->execute();
- $query = db_insert('block_language')->fields(array(
- 'type', 'langcode', 'module', 'delta'
- ));
- foreach (array_filter($form_state['values']['langcodes']) as $langcode) {
- $query->values(array(
- 'type' => $form_state['values']['language_type'],
- 'langcode' => $langcode,
- 'module' => $form_state['values']['module'],
- 'delta' => $form_state['values']['delta'],
- ));
- }
- $query->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_invalidate(array('content' => TRUE));
- $form_state['redirect'] = 'admin/structure/block';
- }
-}
-
-/**
- * Form constructor for the add block form.
- *
- * @see block_menu()
- * @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_state['values']['instance']->configureSubmit($form, $form_state);
+ $config_values = $form_state['values']['instance']->getConfig();
+ $machine_name = 'plugin.core.block.' . $form_state['values']['theme'] . '.' . $form_state['values']['machine_name'];
+ $config = config($machine_name);
+ $config->set('id', $form_state['values']['instance']->getPluginId());
+ foreach ($config_values as $key => $value) {
+ $config->set($key, $value);
}
-}
-
-/**
- * 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();
- }
-
- // Update the block visibility settings if we have settings to store
- // for the existing languages.
- if (module_exists('language') && isset($form_state['values']['langcodes'])) {
- $query = db_insert('block_language')->fields(array(
- 'type', 'langcode', 'module', 'delta'
- ));
- foreach (array_filter($form_state['values']['langcodes']) as $langcode) {
- $query->values(array(
- 'type' => $form_state['values']['language_type'],
- 'langcode' => $langcode,
- 'module' => $form_state['values']['module'],
- 'delta' => $form_state['values']['delta'],
- ));
- }
- $query->execute();
- }
-
- drupal_set_message(t('The block has been created.'));
- cache_invalidate(array('content' => TRUE));
- $form_state['redirect'] = 'admin/structure/block';
+ $config->save();
+ $form_state['redirect'] = 'admin/structure/block/list/' . $form_state['values']['theme'];
}
/**
@@ -728,13 +310,16 @@ function block_add_block_form_submit($form, &$form_state) {
* @see block_menu()
* @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'));
+function block_custom_block_delete($form, &$form_state, $plugin_id, $theme) {
+ $block = block_load($plugin_id);
+ $form['id'] = array('#type' => 'value', '#value' => $plugin_id);
+ $form['theme'] = array('#type' => 'value', '#value' => $theme);
+ $definition = $block->getDefinition();
+ $config = $block->getConfig();
+ $subject = empty($config['subject']) ? $definition['subject'] : $config['subject'];
+ $form['subject'] = array('#type' => 'value', '#value' => $subject);
+
+ return confirm_form($form, t('Are you sure you want to delete the block %name?', array('%name' => $subject)), 'admin/structure/block', '', t('Delete'), t('Cancel'));
}
/**
@@ -743,26 +328,10 @@ function block_custom_block_delete($form, &$form_state, $module, $delta) {
* @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();
- db_delete('block_language')
- ->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_invalidate(array('content' => TRUE));
- $form_state['redirect'] = 'admin/structure/block';
- return;
+ $config = config($form_state['values']['id']);
+ $config->delete();
+ drupal_set_message(t('The block %name has been removed.', array('%name' => $form_state['values']['subject'])));
+ $form_state['redirect'] = 'admin/structure/block/list/' . $form_state['values']['theme'];
}
/**
diff --git a/core/modules/block/block.library.css b/core/modules/block/block.library.css
new file mode 100644
index 0000000..207a6ee
--- /dev/null
+++ b/core/modules/block/block.library.css
@@ -0,0 +1,29 @@
+#block-library .left-col,
+#block-library .right-col {
+ float:left;
+ width:66%;
+ height:100%;
+ background-color:#ffffff;
+}
+
+#block-library .right-col {
+ width:34%;
+ background-color:#f7f7f7;
+}
+
+#block-library .right-col h3 {
+ margin: 1em -20px;
+ background-color:#d7d7d7;
+ color:#333333;
+ padding:8px 15px;
+ font-size:1.1em;
+}
+
+#block-library .inside {
+ margin:0 20px;
+}
+
+#block-library .bottom-bar {
+ width:100%;
+ clear:both;
+}
\ No newline at end of file
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 0626c08..facdf99 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -1,5 +1,8 @@
' . t('Controlling visibility') . '';
$output .= '' . t('Use this page to create a new custom block.') . '
'; } if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) { @@ -133,16 +136,11 @@ function block_menu() { 'context' => MENU_CONTEXT_NONE, 'file' => 'block.admin.inc', ); - $items['admin/structure/block/add'] = array( - 'title' => 'Add block', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('block_add_block_form'), - 'access arguments' => array('administer blocks'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'block.admin.inc', - ); - foreach (list_themes() as $key => $theme) { - $items['admin/structure/block/list/' . $key] = array( + $themes = list_themes(); + foreach (system_plugin_manager('plugin_ui')->getDefinitions() as $plugin_id => $plugin) { + list($plugin_base, $key) = explode(':', $plugin_id); + $theme = $themes[$key]; + $items['admin/structure/block/list/' . $plugin_id] = array( 'title' => check_plain($theme->info['name']), 'page arguments' => array($key), 'type' => $key == $default_theme ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, @@ -151,16 +149,6 @@ function block_menu() { 'access arguments' => array($key), 'file' => 'block.admin.inc', ); - if ($key != $default_theme) { - $items['admin/structure/block/list/' . $key . '/add'] = array( - 'title' => 'Add block', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('block_add_block_form'), - 'access arguments' => array('administer blocks'), - 'type' => MENU_LOCAL_ACTION, - 'file' => 'block.admin.inc', - ); - } $items['admin/structure/block/demo/' . $key] = array( 'title' => check_plain($theme->info['name']), 'page callback' => 'block_admin_demo', @@ -212,53 +200,6 @@ function _block_custom_theme($theme = NULL) { } /** - * Implements hook_block_info(). - */ -function block_block_info() { - $blocks = array(); - - $result = db_query('SELECT bid, info FROM {block_custom} ORDER BY info'); - foreach ($result as $block) { - $blocks[$block->bid]['info'] = $block->info; - // Not worth caching. - $blocks[$block->bid]['cache'] = DRUPAL_NO_CACHE; - } - return $blocks; -} - -/** - * Implements hook_block_configure(). - */ -function block_block_configure($delta = 0) { - if ($delta) { - $custom_block = block_custom_block_get($delta); - } - else { - $custom_block = array(); - } - return block_custom_block_form($custom_block); -} - -/** - * Implements hook_block_save(). - */ -function block_block_save($delta = 0, $edit = array()) { - block_custom_block_save($edit, $delta); -} - -/** - * Implements hook_block_view(). - * - * Generates the administrator-defined blocks for display. - */ -function block_block_view($delta = '') { - $block = db_query('SELECT body, format FROM {block_custom} WHERE bid = :bid', array(':bid' => $delta))->fetchObject(); - $data['subject'] = NULL; - $data['content'] = check_markup($block->body, $block->format, '', TRUE); - return $data; -} - -/** * Implements hook_page_build(). * * Renders blocks into their regions. @@ -343,7 +284,6 @@ function block_get_blocks_by_region($region) { * A renderable array. */ function _block_get_renderable_region($list = array()) { - $weight = 0; $build = array(); // Block caching is not compatible with node_access modules. We also // preserve the submission of forms in blocks, by fetching from cache @@ -356,23 +296,27 @@ function _block_get_renderable_region($list = array()) { !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')); foreach ($list as $key => $block) { + $config = $block->getConfig(); + $definition = $block->getDefinition(); $build[$key] = array( '#block' => $block, - '#weight' => ++$weight, + '#weight' => (int) $config['weight'], '#theme_wrappers' => array('block'), ); - if ($not_cacheable || in_array($block->cache, array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))) { + if ($not_cacheable || in_array($config['cache'], array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM))) { // Non-cached blocks get built immediately. Provides more content // that can be easily manipulated during hook_page_alter(). $build[$key] = _block_get_renderable_block($build[$key]); } else { + $key_components = explode('.', $key); + $id = array_pop($key_components); $build[$key] += array( '#pre_render' => array('_block_get_renderable_block'), '#cache' => array( - 'keys' => array($block->module, $block->delta), - 'granularity' => $block->cache, + 'keys' => array($id, $config['module']), + 'granularity' => $config['cache'], 'bin' => 'block', 'tags' => array('content' => TRUE), ), @@ -384,11 +328,11 @@ function _block_get_renderable_region($list = array()) { // skip the help block, since we assume that most users do not need or want // to perform contextual actions on the help block, and the links needlessly // draw attention on it. - if ($key != 'system_main' && $key != 'system_help') { - $build[$key]['#contextual_links']['block'] = array('admin/structure/block/manage', array($block->module, $block->delta)); + if ($definition['class'] != 'Drupal\\system\\Plugin\\block\\block\\SystemHelpBlock' && $definition['class'] != 'Drupal\\system\\Plugin\\block\\block\\SystemMainBlock') { + global $theme; + $build[$key]['#contextual_links']['block'] = array('admin/structure/block/manage', array($key, $theme)); } } - $build['#sorted'] = TRUE; return $build; } @@ -403,107 +347,12 @@ function _block_get_renderable_region($list = array()) { * Blocks currently exported by modules. */ function _block_rehash($theme = NULL) { - global $theme_key; - - drupal_theme_initialize(); - if (!isset($theme)) { - // If theme is not specifically set, rehash for the current theme. - $theme = $theme_key; - } - $regions = system_region_list($theme); - - // These are the blocks the function will return. $blocks = array(); - // These are the blocks defined by code and modified by the database. - $current_blocks = array(); - // These are {block}.bid values to be kept. - $bids = array(); - $or = db_or(); - // Gather the blocks defined by modules. - foreach (module_implements('block_info') as $module) { - $module_blocks = module_invoke($module, 'block_info'); - foreach ($module_blocks as $delta => $block) { - // Compile a condition to retrieve this block from the database. - $condition = db_and() - ->condition('module', $module) - ->condition('delta', $delta); - $or->condition($condition); - // Add identifiers. - $block['module'] = $module; - $block['delta'] = $delta; - $block['theme'] = $theme; - $current_blocks[$module][$delta] = $block; - } - } - // Save the blocks defined in code for alter context. - $code_blocks = $current_blocks; - $database_blocks = db_select('block', 'b') - ->fields('b') - ->condition($or) - ->condition('theme', $theme) - ->execute(); - foreach ($database_blocks as $block) { - // Preserve info which is not in the database. - $block->info = $current_blocks[$block->module][$block->delta]['info']; - // The cache mode can only by set from hook_block_info(), so that has - // precedence over the database's value. - if (isset($current_blocks[$block->module][$block->delta]['cache'])) { - $block->cache = $current_blocks[$block->module][$block->delta]['cache']; - } - // Blocks stored in the database override the blocks defined in code. - $current_blocks[$block->module][$block->delta] = get_object_vars($block); - // Preserve this block. - $bids[$block->bid] = $block->bid; - } - drupal_alter('block_info', $current_blocks, $theme, $code_blocks); - foreach ($current_blocks as $module => $module_blocks) { - foreach ($module_blocks as $delta => $block) { - if (!isset($block['pages'])) { - // {block}.pages is type 'text', so it cannot have a - // default value, and not null, so we need to provide - // value if the module did not. - $block['pages'] = ''; - } - // Make sure weight is set. - if (!isset($block['weight'])) { - $block['weight'] = 0; - } - if (!empty($block['region']) && $block['region'] != BLOCK_REGION_NONE && !isset($regions[$block['region']]) && $block['status'] == 1) { - drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block['info'], '%region' => $block['region'])), 'warning'); - // Disabled modules are moved into the BLOCK_REGION_NONE later so no - // need to move the block to another region. - $block['status'] = 0; - } - // Set region to none if not enabled and make sure status is set. - if (empty($block['status'])) { - $block['status'] = 0; - $block['region'] = BLOCK_REGION_NONE; - } - // There is no point saving disabled blocks. Still, we need to save them - // because the 'title' attribute is saved to the {blocks} table. - if (isset($block['bid'])) { - // If the block has a bid property, it comes from the database and - // the record needs to be updated, so set the primary key to 'bid' - // before passing to drupal_write_record(). - $primary_keys = array('bid'); - // Remove a block from the list of blocks to keep if it became disabled. - unset($bids[$block['bid']]); - } - else { - $primary_keys = array(); - } - drupal_write_record('block', $block, $primary_keys); - // Add to the list of blocks we return. - $blocks[] = $block; - } - } - if ($bids) { - // Remove disabled that are no longer defined by the code from the - // database. - db_delete('block') - ->condition('bid', $bids, 'NOT IN') - ->condition('theme', $theme) - ->execute(); + $instances = array(); + $theme = $theme ? $theme : variable_get('theme_default', 'stark'); + $block_configs = config_get_storage_names_with_prefix('plugin.core.block.' . $theme); + foreach ($block_configs as $config) { + $blocks[$config] = block_load($config); } return $blocks; } @@ -721,31 +570,29 @@ function block_list($region) { return $blocks[$region]; } +function block_manager() { + return drupal_container()->get('plugin.manager.block'); +} + /** * Loads a block object from the database. * - * @param $module - * Name of the module that implements the block to load. - * @param $delta - * Unique ID of the block within the context of $module. Pass NULL to return - * an empty block object for $module. + * @param $plugin_id + * The plugin id to load. + * @param $conf + * An optional configuration array for creating a block instance from php + * instead of relying on configuration xml. * * @return * A block object. */ -function block_load($module, $delta) { - if (isset($delta)) { - $block = db_query('SELECT * FROM {block} WHERE module = :module AND delta = :delta', array(':module' => $module, ':delta' => $delta))->fetchObject(); +function block_load($plugin_id, $conf = array()) { + try { + $block = block_manager()->getInstance(array('config' => $plugin_id)); } - - // If the block does not exist in the database yet return a stub block - // object. - if (empty($block)) { - $block = new stdClass(); - $block->module = $module; - $block->delta = $delta; + catch (Drupal\Component\Plugin\Exception\PluginException $e) { + $block = block_manager()->createInstance($plugin_id, $conf); } - return $block; } @@ -756,28 +603,14 @@ function block_load($module, $delta) { * An array of blocks grouped by region. */ function _block_load_blocks() { - global $theme_key; - - $query = db_select('block', 'b'); - $query->addField('b', 'title', 'subject'); - $result = $query - ->fields('b') - ->condition('b.theme', $theme_key) - ->condition('b.status', 1) - ->orderBy('b.region') - ->orderBy('b.weight') - ->orderBy('b.module') - ->addTag('block_load') - ->addTag('translatable') - ->execute(); - - $block_info = $result->fetchAllAssoc('bid'); - // Allow modules to modify the block list. - drupal_alter('block_list', $block_info); - + global $theme; $blocks = array(); - foreach ($block_info as $block) { - $blocks[$block->region]["{$block->module}_{$block->delta}"] = $block; + $instances = config_get_storage_names_with_prefix('plugin.core.block.' . $theme); + //$instances = config_get_storage_names_with_prefix('plugin.core.block'); + foreach ($instances as $plugin_id) { + $block = block_manager()->getInstance(array('config' => $plugin_id)); + $config = $block->getConfig(); + $blocks[$config['region']]["$plugin_id"] = $block; } return $blocks; } @@ -904,45 +737,18 @@ function block_block_list_alter(&$blocks) { */ function _block_get_renderable_block($element) { $block = $element['#block']; - - // Render the block content if it has not been created already. - if (!isset($block->content)) { - $array = module_invoke($block->module, 'block_view', $block->delta); - - // Allow modules to modify the block before it is viewed, via either - // hook_block_view_alter() or hook_block_view_MODULE_DELTA_alter(). - drupal_alter(array('block_view', "block_view_{$block->module}_{$block->delta}"), $array, $block); - - if (empty($array['content'])) { - // Blocks without content should emit no markup at all. - $element += array( - '#access' => FALSE, - '#printed' => TRUE, - ); - } - elseif (isset($array) && is_array($array)) { - foreach ($array as $k => $v) { - $block->$k = $v; + // Don't bother to build blocks that aren't accessible. + if ($element['#access'] = $block->access()) { + $build = $block->build(); + if ($build) { + if (isset($build['#title'])) { + $element['#title'] = $build['#title']; } + $element += $build; } - } - - if (isset($block->content) && $block->content) { - // Normalize to the drupal_render() structure. - if (is_string($block->content)) { - $block->content = array('#markup' => $block->content); - } - // Override default block title if a custom display title is present. - if ($block->title) { - // Check plain here to allow module generated titles to keep any - // markup. - $block->subject = $block->title == '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", array(
+ ':module' => $definition['module'],
+ ))->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;
+ }
+
+ /**
+ * Implements BlockInterface::configureValidate().
+ */
+ public function configureValidate($form, &$form_state) {
+ if (empty($form['settings']['machine_name']['#disabled'])) {
+ if (preg_match('/[^a-zA-Z0-9_]/', $form_state['values']['machine_name'])) {
+ form_set_error('machine_name', t('Block name must be alphanumeric or underscores only.'));
+ }
+ if (in_array('plugin.core.block.' . $form_state['values']['machine_name'], config_get_storage_names_with_prefix('plugin.core.block'))) {
+ form_set_error('machine_name', t('Block name must be unique.'));
+ }
+ }
+ else {
+ $config_id = explode('.', $form_state['values']['machine_name']);
+ $form_state['values']['machine_name'] = array_pop($config_id);
+ }
+ 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.'));
+ }
+ }
+ }
+
+ /**
+ * Implements BlockInterface::configureSubmit().
+ */
+ public function configureSubmit($form, &$form_state) {
+ if (!form_get_errors()) {
+ $transaction = db_transaction();
+ try {
+ $keys = array(
+ 'visibility' => 'visibility',
+ 'pages' => 'pages',
+ 'custom' => 'custom',
+ 'title' => 'subject',
+ 'module' => 'module',
+ 'region' => 'region',
+ );
+ foreach ($keys as $key => $new_key) {
+ if (isset($form_state['values'][$key])) {
+ $this->configuration[$new_key] = $form_state['values'][$key];
+ }
+ }
+ }
+ catch (Exception $e) {
+ $transaction->rollback();
+ watchdog_exception('block', $e);
+ throw $e;
+ }
+ if (empty($this->configuration['weight'])) {
+ $this->configuration['weight'] = 0;
+ }
+ drupal_set_message(t('The block configuration has been saved.'));
+ drupal_flush_all_caches();
+ }
+ }
+
+ /**
+ * Implements BlockInterface::build().
+ */
+ public function build() {}
+}
diff --git a/core/modules/block/lib/Drupal/block/BlockBundle.php b/core/modules/block/lib/Drupal/block/BlockBundle.php
new file mode 100644
index 0000000..a66ac60
--- /dev/null
+++ b/core/modules/block/lib/Drupal/block/BlockBundle.php
@@ -0,0 +1,24 @@
+register('plugin.manager.block', 'Drupal\block\Plugins\Type\BlockManager');
+ }
+}
\ No newline at end of file
diff --git a/core/modules/block/lib/Drupal/block/BlockInterface.php b/core/modules/block/lib/Drupal/block/BlockInterface.php
new file mode 100644
index 0000000..1c0e827
--- /dev/null
+++ b/core/modules/block/lib/Drupal/block/BlockInterface.php
@@ -0,0 +1,51 @@
+derivatives) && !empty($this->derivatives[$derivative_id])) {
+ return $this->derivatives[$derivative_id];
+ }
+ $this->getDerivativeDefinitions($base_plugin_definition);
+ return $this->derivatives[$derivative_id];
+ }
+
+ /**
+ * Implements DerivativeInterface::getDerivativeDefinitions().
+ */
+ public function getDerivativeDefinitions(array $base_plugin_definition) {
+ foreach (list_themes() as $key => $theme) {
+ $this->derivatives[$key] = $base_plugin_definition;
+ }
+ return $this->derivatives;
+ }
+}
\ No newline at end of file
diff --git a/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php b/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php
new file mode 100644
index 0000000..7118e0f
--- /dev/null
+++ b/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php
@@ -0,0 +1,55 @@
+ 'value',
+ '#value' => $theme,
+ );
+ return parent::form($form, $form_state, $plugin, $facet);
+ }
+
+ public function formSubmit($form, &$form_state) {
+ $form_state['redirect'] = 'admin/structure/block/manage/' . $form_state['values']['block'] . '/' . $form_state['values']['theme'];
+ }
+
+ public function access($plugin_id) {
+ list($plugin, $theme) = explode(':', $plugin_id);
+ return _block_themes_access($theme);
+ }
+
+ public function tableHeader() {
+ return array(t('Subject'), t('Operations'));
+ }
+
+ public function row($plugin, $plugin_definition, $plugin_id, $config) {
+ list($plugin, $theme) = explode(':', $plugin);
+ return array($config['subject'], l($plugin_definition['link_title'], $plugin_definition['config_path'] . '/' . $plugin_id . '/' . $theme));
+ }
+}
\ No newline at end of file
diff --git a/core/modules/block/lib/Drupal/block/Plugins/ConfigMapper.php b/core/modules/block/lib/Drupal/block/Plugins/ConfigMapper.php
new file mode 100644
index 0000000..126d12e
--- /dev/null
+++ b/core/modules/block/lib/Drupal/block/Plugins/ConfigMapper.php
@@ -0,0 +1,27 @@
+manager = $manager;
+ }
+
+ /**
+ * Implements MapperInterface::getInstance().
+ */
+ public function getInstance(array $options) {
+ $config = config($options['config']);
+ if ($config) {
+ $plugin_id = $config->get('id');
+ $settings = $config->get();
+ $settings['config_id'] = $options['config'];
+ return $this->manager->createInstance($plugin_id, $settings);
+ }
+ // @Todo throw an exception.
+ }
+}
\ No newline at end of file
diff --git a/core/modules/block/lib/Drupal/block/Plugins/Type/BlockManager.php b/core/modules/block/lib/Drupal/block/Plugins/Type/BlockManager.php
new file mode 100644
index 0000000..c852fda
--- /dev/null
+++ b/core/modules/block/lib/Drupal/block/Plugins/Type/BlockManager.php
@@ -0,0 +1,17 @@
+discovery = new DerivativeDiscoveryDecorator(new AnnotatedClassDiscovery('block', 'block'));
+ $this->factory = new DefaultFactory($this);
+ $this->mapper = new ConfigMapper($this);
+ }
+}
\ No newline at end of file
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
index 90327f9..2ebf579 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
@@ -49,8 +49,13 @@ function setUp() {
$this->normal_user_alt->save();
// Enable our test block.
- $edit['blocks[block_test_test_cache][region]'] = 'sidebar_first';
- $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+ $block = array();
+ $block['id'] = 'test_cache';
+ $block['machine_name'] = $this->randomName(8);
+ $block['theme'] = variable_get('theme_default', 'stark');
+ $block['region'] = 'sidebar_first';
+ $this->block = $block;
+ $this->drupalPost('admin/structure/block/manage/' . $block['id'] . '/' . $block['theme'], array('machine_name' => $block['machine_name'], 'region' => $block['region']), t('Save block'));
}
/**
@@ -192,14 +197,17 @@ function testCachePerPage() {
* Private helper method to set the test block's cache mode.
*/
private function setCacheMode($cache_mode) {
- db_update('block')
- ->fields(array('cache' => $cache_mode))
- ->condition('module', 'block_test')
- ->execute();
-
- $current_mode = db_query("SELECT cache FROM {block} WHERE module = 'block_test'")->fetchField();
- if ($current_mode != $cache_mode) {
- $this->fail(t('Unable to set cache mode to %mode. Current mode: %current_mode', array('%mode' => $cache_mode, '%current_mode' => $current_mode)));
+ $block = $this->block;
+ $block['config_id'] = 'plugin.core.block.' . $block['theme'] . '.' . $block['machine_name'];
+ $block_config = config($block['config_id']);
+ $block_config->set('cache', $cache_mode);
+ $block_config->save();
+
+ $instance = block_load($block['config_id']);
+ $config = $instance->getConfig();
+ if ($config['cache'] != $cache_mode) {
+ $this->fail(t('Unable to set cache mode to %mode. Current mode: %current_mode', array('%mode' => $cache_mode, '%current_mode' => $config['cache'])));
}
+ $this->assertEqual($config['cache'], $cache_mode, t("Test block's database entry updated to DRUPAL_NO_CACHE."));
}
}
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php
index fd28702..c80a881 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php
@@ -37,12 +37,19 @@ function setUp() {
$this->drupalLogin($this->admin_user);
// Enable our test block.
- $edit['blocks[block_test_test_html_id][region]'] = 'sidebar_first';
- $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+ $block = array();
+ $block['id'] = 'test_html_id';
+ $block['machine_name'] = $this->randomName(8);
+ $block['theme'] = variable_get('theme_default', 'stark');
+ $block['region'] = 'sidebar_first';
+ $this->block = $block;
+ $this->drupalPost('admin/structure/block/manage/' . $block['id'] . '/' . $block['theme'], array('machine_name' => $block['machine_name'], 'region' => $block['region']), t('Save block'));
// Make sure the block has some content so it will appear
$current_content = $this->randomName();
variable_set('block_test_content', $current_content);
+ // TODO: This block is being cached. Should it be?
+ $this->resetAll();
}
/**
@@ -50,6 +57,6 @@ function setUp() {
*/
function testHtmlId() {
$this->drupalGet('');
- $this->assertRaw('block-block-test-test-html-id', t('HTML id for test block is valid.'));
+ $this->assertRaw('block-' . strtr(strtolower($this->block['machine_name']), '-', '_'), t('HTML id for test block is valid.'));
}
}
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index f98da2b..2802b0b 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -320,22 +320,24 @@ function testBlockVisibilityPerUser() {
* Test configuring and moving a module-define block to specific regions.
*/
function testBlock() {
- // Select the Navigation block to be configured and moved.
+ // Select the 'Powered by Drupal' block to be configured and moved.
$block = array();
- $block['module'] = 'system';
- $block['delta'] = 'management';
+ $block['id'] = 'system_powered_by_block';
$block['title'] = $this->randomName(8);
+ $block['machine_name'] = $this->randomName(8);
+ $block['theme'] = variable_get('theme_default', 'stark');
+ $block['region'] = 'header';
// Set block title to confirm that interface works and override any custom titles.
- $this->drupalPost('admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/configure', array('title' => $block['title']), t('Save block'));
+ $this->drupalPost('admin/structure/block/manage/' . $block['id'] . '/' . $block['theme'], array('title' => $block['title'], 'machine_name' => $block['machine_name'], 'region' => $block['region']), t('Save block'));
$this->assertText(t('The block configuration has been saved.'), t('Block title set.'));
- $bid = db_query("SELECT bid FROM {block} WHERE module = :module AND delta = :delta", array(
- ':module' => $block['module'],
- ':delta' => $block['delta'],
- ))->fetchField();
- // Check to see if the block was created by checking that it's in the database.
- $this->assertNotNull($bid, t('Block found in database'));
+ // Check to see if the block was created by checking its configuration.
+ $block['config_id'] = 'plugin.core.block.' . $block['theme'] . '.' . $block['machine_name'];
+ $instance = block_load($block['config_id']);
+ $config = $instance->getConfig();
+
+ $this->assertEqual($config['subject'], $block['title'], t('Stored block title found.'));
// Check whether the block can be moved to all available regions.
foreach ($this->regions as $region) {
@@ -344,31 +346,23 @@ function testBlock() {
// Set the block to the disabled region.
$edit = array();
- $edit['blocks[' . $block['module'] . '_' . $block['delta'] . '][region]'] = '-1';
+ $edit['blocks[0][region]'] = -1;
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
// Confirm that the block was moved to the proper region.
$this->assertText(t('The block settings have been updated.'), t('Block successfully move to disabled region.'));
+ $this->drupalGet('node');
$this->assertNoText(t($block['title']), t('Block no longer appears on page.'));
// Confirm that the region's xpath is not available.
- $xpath = $this->buildXPathQuery('//div[@id=:id]/*', array(':id' => 'block-block-' . $bid));
- $this->assertNoFieldByXPath($xpath, FALSE, t('Custom block found in no regions.'));
-
- // For convenience of developers, put the navigation block back.
- $edit = array();
- $edit['blocks[' . $block['module'] . '_' . $block['delta'] . '][region]'] = $this->regions[1];
- $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
- $this->assertText(t('The block settings have been updated.'), t('Block successfully move to first sidebar region.'));
-
- $this->drupalPost('admin/structure/block/manage/' . $block['module'] . '/' . $block['delta'] . '/configure', array('title' => 'Navigation'), t('Save block'));
- $this->assertText(t('The block configuration has been saved.'), t('Block title set.'));
+ $xpath = $this->buildXPathQuery('//div[@id=:id]/*', array(':id' => 'block-' . strtr(strtolower($block['machine_name']), '-', '_')));
+ $this->assertNoFieldByXPath($xpath, FALSE, t('Block found in no regions.'));
}
function moveBlockToRegion($block, $region) {
// Set the created block to a specific region.
$edit = array();
- $edit['blocks[' . $block['module'] . '_' . $block['delta'] . '][region]'] = $region;
+ $edit['blocks[0][region]'] = $region;
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
// Confirm that the block was moved to the proper region.
@@ -380,10 +374,10 @@ function moveBlockToRegion($block, $region) {
// Confirm that the custom block was found at the proper region.
$xpath = $this->buildXPathQuery('//div[@class=:region-class]//div[@id=:block-id]/*', array(
- ':region-class' => 'region region-' . str_replace('_', '-', $region),
- ':block-id' => 'block-' . $block['module'] . '-' . $block['delta'],
+ ':region-class' => 'region region-' . drupal_html_class($region),
+ ':block-id' => 'block-' . strtr(strtolower($block['machine_name']), '-', '_'),
));
- $this->assertFieldByXPath($xpath, NULL, t('Custom block found in %region_name region.', array('%region_name' => $region)));
+ $this->assertFieldByXPath($xpath, NULL, t('Block found in %region_name region.', array('%region_name' => drupal_html_class($region))));
}
/**
@@ -393,19 +387,31 @@ function testBlockRehash() {
module_enable(array('block_test'));
$this->assertTrue(module_exists('block_test'), t('Test block module enabled.'));
- // Our new block should be inserted in the database when we visit the
- // block management page.
- $this->drupalGet('admin/structure/block');
+ // Add a test block.
+ $plugin = block_manager()->getDefinition('test_cache');
+
+ $block = array();
+ $block['id'] = 'test_cache';
+ $block['machine_name'] = $this->randomName(8);
+ $block['theme'] = variable_get('theme_default', 'stark');
+ $block['region'] = 'header';
+ $this->drupalPost('admin/structure/block/manage/' . $block['id'] . '/' . $block['theme'], array('machine_name' => $block['machine_name'], 'region' => $block['region']), t('Save block'));
+
// Our test block's caching should default to DRUPAL_CACHE_PER_ROLE.
- $current_caching = db_query("SELECT cache FROM {block} WHERE module = 'block_test' AND delta = 'test_cache'")->fetchField();
- $this->assertEqual($current_caching, DRUPAL_CACHE_PER_ROLE, t('Test block cache mode defaults to DRUPAL_CACHE_PER_ROLE.'));
+ $block['config_id'] = 'plugin.core.block.' . $block['theme'] . '.' . $block['machine_name'];
+ $instance = block_load($block['config_id']);
+ $config = $instance->getConfig();
+ $this->assertEqual($config['cache'], DRUPAL_CACHE_PER_ROLE, t('Test block cache mode defaults to DRUPAL_CACHE_PER_ROLE.'));
// Disable caching for this block.
- variable_set('block_test_caching', DRUPAL_NO_CACHE);
+ $block_config = config($block['config_id']);
+ $block_config->set('cache', DRUPAL_NO_CACHE);
+ $block_config->save();
// Flushing all caches should call _block_rehash().
$this->resetAll();
- // Verify that the database is updated with the new caching mode.
- $current_caching = db_query("SELECT cache FROM {block} WHERE module = 'block_test' AND delta = 'test_cache'")->fetchField();
- $this->assertEqual($current_caching, DRUPAL_NO_CACHE, t("Test block's database entry updated to DRUPAL_NO_CACHE."));
+ // Verify that block is updated with the new caching mode.
+ $instance = block_load($block['config_id']);
+ $config = $instance->getConfig();
+ $this->assertEqual($config['cache'], DRUPAL_NO_CACHE, t("Test block's database entry updated to DRUPAL_NO_CACHE."));
}
}
diff --git a/core/modules/block/tests/block_test.module b/core/modules/block/tests/block_test.module
index 5e06d5c..03f94b0 100644
--- a/core/modules/block/tests/block_test.module
+++ b/core/modules/block/tests/block_test.module
@@ -12,25 +12,3 @@ function block_test_system_theme_info() {
$themes['block_test_theme'] = drupal_get_path('module', 'block_test') . '/themes/block_test_theme/block_test_theme.info';
return $themes;
}
-
-/**
- * Implements hook_block_info().
- */
-function block_test_block_info() {
- $blocks['test_cache'] = array(
- 'info' => t('Test block caching'),
- 'cache' => variable_get('block_test_caching', DRUPAL_CACHE_PER_ROLE),
- );
-
- $blocks['test_html_id'] = array(
- 'info' => t('Test block html id'),
- );
- return $blocks;
-}
-
-/**
- * Implements hook_block_view().
- */
-function block_test_block_view($delta = 0) {
- return array('content' => variable_get('block_test_content', ''));
-}
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestCacheBlock.php b/core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestCacheBlock.php
new file mode 100644
index 0000000..5e77037
--- /dev/null
+++ b/core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestCacheBlock.php
@@ -0,0 +1,25 @@
+ variable_get('block_test_content', ''));
+ }
+}
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestHtmlIdBlock.php b/core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestHtmlIdBlock.php
new file mode 100644
index 0000000..0c738d8
--- /dev/null
+++ b/core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestHtmlIdBlock.php
@@ -0,0 +1,19 @@
+book['bid']) ? 0 : $node->book['bid'];
- }
-
- if (config('book.settings')->get('block.navigation.mode') == '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);
- }
- }
- if ($block['content'] = $book_menus) {
- $book_menus['#theme'] = 'book_all_books_block';
- }
- }
- 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' => config('book.settings')->get('block.navigation.mode'),
- '#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();
- config('book.settings')->set('block.navigation.mode', $edit['book_block_mode'])->save();
-}
-
-/**
* Returns HTML for a link to a book title when used as a block title.
*
* @param $variables
diff --git a/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php b/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php
new file mode 100644
index 0000000..9e7360d
--- /dev/null
+++ b/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php
@@ -0,0 +1,100 @@
+ 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' => $this->configuration['block_mode'],
+ '#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;
+ }
+
+ public function configureSubmit($form, &$form_state) {
+ parent::configureSubmit($form, $form_state);
+ $this->configuration['block_mode'] = $form_state['values']['book_block_mode'];
+ }
+
+ public function build() {
+ $block = array();
+ $current_bid = 0;
+ if ($node = menu_get_object()) {
+ $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];
+ }
+
+ if ($this->configuration['block_mode'] == 'all pages') {
+ $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);
+ }
+ }
+ if ($book_menus) {
+ return array(
+ '#theme' => 'book_all_books_block',
+ $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);
+ return array(
+ '#title' => theme('book_title_link', array('link' => $data['link'])),
+ ($data['below']) ? menu_tree_output($data['below']) : '',
+ );
+ }
+ }
+ return array();
+ }
+}
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index bd9c107..dc9ab47 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -216,7 +216,7 @@ function comment_field_extra_fields() {
function comment_theme() {
return array(
'comment_block' => array(
- 'variables' => array(),
+ 'variables' => array('number' => NULL),
),
'comment_preview' => array(
'variables' => array('comment' => NULL),
@@ -442,51 +442,6 @@ function comment_permission() {
}
/**
- * Implements hook_block_info().
- */
-function comment_block_info() {
- $blocks['recent']['info'] = t('Recent comments');
- $blocks['recent']['properties']['administrative'] = TRUE;
-
- return $blocks;
-}
-
-/**
- * Implements hook_block_configure().
- */
-function comment_block_configure($delta = '') {
- $form['comment_block_count'] = array(
- '#type' => 'select',
- '#title' => t('Number of recent comments'),
- '#default_value' => variable_get('comment_block_count', 10),
- '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 30)),
- );
-
- return $form;
-}
-
-/**
- * Implements hook_block_save().
- */
-function comment_block_save($delta = '', $edit = array()) {
- variable_set('comment_block_count', (int) $edit['comment_block_count']);
-}
-
-/**
- * Implements hook_block_view().
- *
- * Generates a block with the most recent comments.
- */
-function comment_block_view($delta = '') {
- if (user_access('access comments')) {
- $block['subject'] = t('Recent comments');
- $block['content'] = theme('comment_block');
-
- return $block;
- }
-}
-
-/**
* Redirects comment links to the correct page depending on comment settings.
*
* Since comments are paged there is no way to guarantee which page a comment
@@ -623,9 +578,9 @@ function comment_new_page_count($num_comments, $new_replies, Node $node) {
*
* @ingroup themeable
*/
-function theme_comment_block() {
+function theme_comment_block($variables) {
$items = array();
- $number = variable_get('comment_block_count', 10);
+ $number = $variables['number'];
foreach (comment_get_recent($number) as $comment) {
$items[] = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)) . ' ' . t('@time ago', array('@time' => format_interval(REQUEST_TIME - $comment->changed))) . '';
}
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentBlock.php b/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentBlock.php
new file mode 100644
index 0000000..c98b8e4
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentBlock.php
@@ -0,0 +1,60 @@
+ 'select',
+ '#title' => t('Number of recent comments'),
+ '#default_value' => $this->configuration['block_count'],
+ '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 30)),
+ );
+ return $form;
+ }
+
+ /**
+ * Implements BlockInterface::configureSubmit().
+ */
+ public function configureSubmit($form, &$form_state) {
+ parent::configureSubmit($form, $form_state);
+ $this->configuration['block_count'] = $form_state['values']['block_count'];
+ }
+
+ /**
+ * Implements BlockInterface::build();
+ */
+ public function build() {
+ return array(
+ '#theme' => 'comment_block',
+ '#number' => $this->configuration['block_count'],
+ );
+ }
+}
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 61b018a..de7eb83 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -640,81 +640,7 @@ function forum_form_node_form_alter(&$form, &$form_state, $form_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['block_' . $delta . '_limit'] = array(
- '#type' => 'select',
- '#title' => t('Number of topics'),
- '#default_value' => config('forum.settings')->get('block.' . $delta . '.limit'),
- '#options' => drupal_map_assoc(range(2, 20)),
- );
- return $form;
-}
-
-/**
- * Implements hook_block_save().
- */
-function forum_block_save($delta = '', $edit = array()) {
- config('forum.settings')->set('block.' . $delta . '.limit', $edit['block_' . $delta . '_limit'])->save();
-}
-
-/**
- * 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 = '') {
- $config = config('forum.settings');
- $query = db_select('forum_index', 'f')
- ->fields('f')
- ->addTag('node_access')
- ->addMetaData('base_table', 'forum_index');
- switch ($delta) {
- case 'active':
- $title = t('Active forum topics');
- $query
- ->orderBy('f.last_comment_timestamp', 'DESC')
- ->range(0, $config->get('block.active.limit'));
- break;
-
- case 'new':
- $title = t('New forum topics');
- $query
- ->orderBy('f.created', 'DESC')
- ->range(0, $config->get('block.new.limit'));
- 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.
+ * A #pre_render callback. Lists nodes based on the element's #query property.
*
* @see forum_block_view()
*/
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ActiveBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ActiveBlock.php
new file mode 100644
index 0000000..6d61cba
--- /dev/null
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ActiveBlock.php
@@ -0,0 +1,68 @@
+ 'select',
+ '#title' => t('Number of topics'),
+ '#default_value' => $this->configuration['block_count'],
+ '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
+ return $form;
+ }
+
+ /**
+ * Implements BlockInterface::configureSubmit().
+ */
+ public function configureSubmit($form, &$form_state) {
+ parent::configureSubmit($form, $form_state);
+ $this->configuration['block_count'] = $form_state['values']['block_count'];
+ }
+
+ /**
+ * Implements BlockInterface::build().
+ */
+ public function build() {
+ $query = db_select('forum_index', 'f')
+ ->fields('f')
+ ->addTag('node_access')
+ ->orderBy('f.last_comment_timestamp', 'DESC')
+ ->range(0, $this->configuration['block_count']);
+
+ return array(
+ drupal_render_cache_by_query($query, 'forum_block_view'),
+ );
+ }
+}
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/block/block/NewBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/block/block/NewBlock.php
new file mode 100644
index 0000000..45222b2
--- /dev/null
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/block/block/NewBlock.php
@@ -0,0 +1,68 @@
+ 'select',
+ '#title' => t('Number of topics'),
+ '#default_value' => $this->configuration['block_count'],
+ '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
+ return $form;
+ }
+
+ /**
+ * Implements BlockInterface::configureSubmit().
+ */
+ public function configureSubmit($form, &$form_state) {
+ parent::configureSubmit($form, $form_state);
+ $this->configuration['block_count'] = $form_state['values']['block_count'];
+ }
+
+ /**
+ * Implements BlockInterface::build().
+ */
+ public function build() {
+ $query = db_select('forum_index', 'f')
+ ->fields('f')
+ ->addTag('node_access')
+ ->orderBy('f.created', 'DESC')
+ ->range(0, $this->configuration['block_count']);
+
+ return array(
+ drupal_render_cache_by_query($query, 'forum_block_view'),
+ );
+ }
+}
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index a74bf52..aac8636 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -71,7 +71,7 @@ function help_help($path, $arg) {
* Implements hook_preprocess_HOOK() for block.tpl.php.
*/
function help_preprocess_block(&$variables) {
- if ($variables['block']->module == 'system' && $variables['block']->delta == 'help') {
+ if ($variables['block']->id == 'system_help_block') {
$variables['attributes']['role'] = 'complementary';
}
}
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 5b62382..e9ec0c3 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -509,45 +509,6 @@ function language_language_delete($language) {
}
/**
- * Implements hook_block_info().
- */
-function language_block_info() {
- include_once DRUPAL_ROOT . '/core/includes/language.inc';
- $block = array();
- $info = language_types_info();
- foreach (language_types_get_configurable(FALSE) as $type) {
- $block[$type] = array(
- // We do not need to escape the language type name since the block 'info'
- // value is supposed not to be sanitized. It is escaped later, if needed.
- '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 language_block_view($type) {
- if (language_multilingual()) {
- $path = drupal_is_front_page() ? '' . format_plural($authenticated_count, 'There is currently 1 user online.', 'There are currently @count users online.') . '
', + ); + + // Display a list of currently online users. + $max_users = $this->configuration['max_list_count']; + if ($authenticated_count && $max_users) { + $items = db_query_range('SELECT u.uid, u.name, MAX(s.timestamp) AS max_timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= :interval AND s.uid > 0 GROUP BY u.uid, u.name ORDER BY max_timestamp DESC', 0, $max_users, array(':interval' => $interval))->fetchAll(); + foreach ($items as $account) { + $block['content']['#items'][] = theme('username', array('account' => $account)); + } + } + + return $build; + } +} diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 3b69966..47f8ea2 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -761,145 +761,18 @@ function user_login_block($form) { } /** - * Implements hook_block_info(). - */ -function user_block_info() { - global $user; - - $blocks['login']['info'] = t('User login'); - // Not worth caching. - $blocks['login']['cache'] = DRUPAL_NO_CACHE; - - $blocks['new']['info'] = t('Who\'s new'); - $blocks['new']['properties']['administrative'] = TRUE; - - // Too dynamic to cache. - $blocks['online']['info'] = t('Who\'s online'); - $blocks['online']['cache'] = DRUPAL_NO_CACHE; - $blocks['online']['properties']['administrative'] = TRUE; - - return $blocks; -} - -/** - * Implements hook_block_configure(). - */ -function user_block_configure($delta = '') { - global $user; - - switch ($delta) { - case 'new': - $form['user_block_whois_new_count'] = array( - '#type' => 'select', - '#title' => t('Number of users to display'), - '#default_value' => variable_get('user_block_whois_new_count', 5), - '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)), - ); - return $form; - - case 'online': - $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval'); - $form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.')); - $form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.')); - return $form; - } -} - -/** - * Implements hook_block_save(). - */ -function user_block_save($delta = '', $edit = array()) { - global $user; - - switch ($delta) { - case 'new': - variable_set('user_block_whois_new_count', $edit['user_block_whois_new_count']); - break; - - case 'online': - variable_set('user_block_seconds_online', $edit['user_block_seconds_online']); - variable_set('user_block_max_list_count', $edit['user_block_max_list_count']); - break; - } -} - -/** - * Implements hook_block_view(). - */ -function user_block_view($delta = '') { - global $user; - - $block = array(); - - switch ($delta) { - case 'login': - // For usability's sake, avoid showing two login forms on one page. - if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) { - - $block['subject'] = t('User login'); - $block['content'] = drupal_get_form('user_login_block'); - } - return $block; - - case 'new': - if (user_access('access content')) { - // Retrieve a list of new users who have subsequently accessed the site successfully. - $items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5))->fetchAll(); - - $block['subject'] = t('Who\'s new'); - $block['content'] = array( - '#theme' => 'item_list__user__new', - '#items' => array(), - ); - foreach ($items as $account) { - $block['content']['#items'][] = theme('username', array('account' => $account)); - } - } - return $block; - - case 'online': - if (user_access('access content')) { - // Count users active within the defined period. - $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900); - - // Perform database queries to gather online user lists. We use s.timestamp - // rather than u.access because it is much faster. - $authenticated_count = db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.uid > 0", array(':timestamp' => $interval))->fetchField(); - - $block['subject'] = t('Who\'s online'); - $block['content'] = array( - '#theme' => 'item_list__user__online', - '#items' => array(), - '#prefix' => '' . format_plural($authenticated_count, 'There is currently 1 user online.', 'There are currently @count users online.') . '
', - ); - - // Display a list of currently online users. - $max_users = variable_get('user_block_max_list_count', 10); - if ($authenticated_count && $max_users) { - $items = db_query_range('SELECT u.uid, u.name, MAX(s.timestamp) AS max_timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= :interval AND s.uid > 0 GROUP BY u.uid, u.name ORDER BY max_timestamp DESC', 0, $max_users, array(':interval' => $interval))->fetchAll(); - - foreach ($items as $account) { - $block['content']['#items'][] = theme('username', array('account' => $account)); - } - } - } - return $block; - } -} - -/** - * Implements hook_preprocess_HOOK() for block.tpl.php. + * Implements hook_preprocess_block(). */ function user_preprocess_block(&$variables) { if ($variables['block']->module == 'user') { - switch ($variables['block']->delta) { - case 'login': + switch ($variables['block']->id) { + case 'user_login_block': $variables['attributes']['role'] = 'form'; break; - case 'new': + case 'user_new_block': $variables['attributes']['role'] = 'complementary'; break; - case 'online': + case 'user_online_block': $variables['attributes']['role'] = 'complementary'; break; }