content');
- $this->assertEqual($f, '
content
', t('HTML corrector -- unclosed tag with attribute.'));
-
- // XHTML slash for empty elements.
- $f = _filter_htmlcorrector('
');
- $this->assertEqual($f, '
', t('HTML corrector -- XHTML closing slash.'));
-
- $f = _filter_htmlcorrector('
test
');
- $this->assertEqual($f, '
test
', t('HTML corrector -- Convert uppercased tags to proper lowercased ones.'));
-
- $f = _filter_htmlcorrector('
test
');
- $this->assertEqual($f, '
test
', t('HTML corrector -- Convert uppercased tags to proper lowercased ones.'));
-
- $f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('HTML corrector -- Let proper XHTML pass through.'));
-
- $f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('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
', t('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, '
', t('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', t('HTML corrector -- Automatically close single tags.'));
-
- $f = _filter_htmlcorrector('line1
line2');
- $this->assertEqual($f, 'line1
line2', t('HTML corrector -- Automatically close single tags.'));
-
- $f = _filter_htmlcorrector('line1
line2');
- $this->assertEqual($f, 'line1
line2', t('HTML corrector -- Automatically close single tags.'));
-
- $f = _filter_htmlcorrector('
test');
- $this->assertEqual($f, '
test', t('HTML corrector -- Automatically close single tags.'));
-
- $f = _filter_htmlcorrector('
');
- $this->assertEqual($f, '
', t("HTML corrector -- Transform empty tags to a single closed tag if the tag's content model is EMPTY."));
-
- $f = _filter_htmlcorrector('
');
- $this->assertEqual($f, '
', t("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', t('HTML corrector -- Move non-inline elements outside of inline containers.'));
-
- $f = _filter_htmlcorrector('
line1
line2
');
- $this->assertEqual($f, '
line1
line2
', t('HTML corrector -- Move non-inline elements outside of inline containers.'));
-
- $f = _filter_htmlcorrector('
test
test
\n');
- $this->assertEqual($f, '
test
test
\n', t('HTML corrector -- Auto-close improperly nested tags.'));
-
- $f = _filter_htmlcorrector('
Line1
bold stuff');
- $this->assertEqual($f, 'Line1
bold stuff
', t('HTML corrector -- Properly close unclosed tags, and remove useless closing tags.'));
-
- $f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
-
- $f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
-
- $f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
-
- $f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
-
- $f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
-
- $f = _filter_htmlcorrector('test\n
\n');
- $this->assertEqual($f, 'test\n
\n', t('HTML corrector -- New-lines are accepted and kept as-is.'));
-
- $f = _filter_htmlcorrector('دروبال');
- $this->assertEqual($f, '
دروبال
', t('HTML corrector -- Encoding is correctly kept.'));
-
- $f = _filter_htmlcorrector('');
- $this->assertEqual($f, '', t('HTML corrector -- CDATA added to script element'));
-
- $f = _filter_htmlcorrector('');
- $this->assertEqual($f, '', t('HTML corrector -- CDATA added to a nested script element'));
-
- $f = _filter_htmlcorrector('');
- $this->assertEqual($f, '', t('HTML corrector -- CDATA added to a style element.'));
- }
-
- /**
- * Asserts that a text transformed to lowercase with HTML entities decoded does contains 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 characters 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
- * Message to display if failed.
- * @param $group
- * The group this message belongs to, defaults to 'Other'.
- * @return
- * TRUE on pass, FALSE on fail.
- */
- function assertNormalized($haystack, $needle, $message = '', $group = 'Other') {
- return $this->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
- * Message to display if failed.
- * @param $group
- * 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);
- }
-
- /**
- * Helper method to test functions that are intended to escape HTML.
- *
- * @param $function
- * The name of the function to test.
- */
- function _testEscapedHTML($function) {
- // Define string replacements for the assertion messages.
- $replacements = array('@function' => $function);
-
- // Test that characters that have special meaning in XML are changed into
- // entities.
- $f = $function('<>&"');
- $this->assertEqual($f, '<>&"', t('The @function() function correctly filters basic HTML entities.', $replacements));
-
- // A single quote can also be used for evil things in some contexts.
- $f = $function('\'');
- $this->assertEqual($f, ''', t('The @function() function correctly filters single quotes.', $replacements));
-
- // Test that the filter is not fooled by different evasion techniques.
- // Ignore PHP 5.3+ invalid multibyte sequence warning.
- $f = @$function("\xc2\"");
- $this->assertEqual($f, '', t('The @function() function correctly filters invalid UTF-8.', $replacements));
- }
-}
-
-/**
- * Tests for filter hook invocation.
- */
-class FilterHooksTestCase extends DrupalWebTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Filter format hooks',
- 'description' => 'Test hooks for text formats insert/update/delete.',
- 'group' => 'Filter',
- );
- }
-
- function setUp() {
- parent::setUp('block', 'filter_test');
- $admin_user = $this->drupalCreateUser(array('administer filters', 'administer blocks'));
- $this->drupalLogin($admin_user);
- }
-
- /**
- * Test that hooks run correctly on creating, editing, and deleting a text format.
- */
- function testFilterHooks() {
- // Add a text format.
- $name = $this->randomName();
- $edit = array();
- $edit['name'] = $name;
- $edit['roles[1]'] = 1;
- $this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->assertRaw(t('Added text format %format.', array('%format' => $name)), t('New format created.'));
- $this->assertText('hook_filter_format_insert invoked.', t('hook_filter_format_insert was invoked.'));
-
- $format_id = db_query("SELECT format FROM {filter_format} WHERE name = :name", array(':name' => $name))->fetchField();
-
- // Update text format.
- $edit = array();
- $edit['roles[2]'] = 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)), t('Format successfully updated.'));
- $this->assertText('hook_filter_format_update invoked.', t('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.'), t('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, t('New block found in database'));
-
- // Delete the text format.
- $this->drupalPost('admin/config/content/formats/' . $format_id . '/delete', array(), t('Delete'));
- $this->assertRaw(t('Deleted text format %format.', array('%format' => $name)), t('Format successfully deleted.'));
- $this->assertText('hook_filter_format_delete invoked.', t('hook_filter_format_delete() was invoked.'));
-
- // Verify that the deleted format was replaced with the fallback format.
- $current_format = db_select('block_custom', 'b')
- ->fields('b', array('format'))
- ->condition('bid', $bid)
- ->execute()
- ->fetchField();
- $this->assertEqual($current_format, filter_fallback_format(), t('Deleted text format replaced with the fallback format.'));
- }
-}
-
diff --git a/modules/forum/forum-icon.tpl.php b/modules/forum/forum-icon.tpl.php
deleted file mode 100644
index 9e8c653a88d269856954d52b5cace935b0f57288..0000000000000000000000000000000000000000
--- a/modules/forum/forum-icon.tpl.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- "misc/forum-$icon.png")) ?>
-
-
-
-
diff --git a/modules/forum/forum-list.tpl.php b/modules/forum/forum-list.tpl.php
deleted file mode 100644
index 5d8f18ceca882cb958c53070d470188524194a6e..0000000000000000000000000000000000000000
--- a/modules/forum/forum-list.tpl.php
+++ /dev/null
@@ -1,72 +0,0 @@
-is_container: Is TRUE if the forum can contain other forums. Is
- * FALSE if the forum can contain only topics.
- * - $forum->depth: How deep the forum is in the current hierarchy.
- * - $forum->zebra: 'even' or 'odd' string used for row class.
- * - $forum->name: The name of the forum.
- * - $forum->link: The URL to link to this forum.
- * - $forum->description: The description of this forum.
- * - $forum->new_topics: True if the forum contains unread posts.
- * - $forum->new_url: A URL to the forum's unread posts.
- * - $forum->new_text: Text for the above URL which tells how many new posts.
- * - $forum->old_topics: A count of posts that have already been read.
- * - $forum->num_posts: The total number of posts in the forum.
- * - $forum->last_reply: Text representing the last time a forum was posted or
- * commented in.
- *
- * @see template_preprocess_forum_list()
- * @see theme_forum_list()
- */
-?>
-
-
-
- |
- |
- |
- |
-
-
-
- $forum): ?>
-
- | is_container ? 'colspan="4" class="container"' : 'class="forum"'; ?>>
-
- ', $forum->depth); ?>
-
- description): ?>
- description; ?>
-
- ', $forum->depth); ?>
- |
- is_container): ?>
-
- num_topics ?>
- new_topics): ?>
-
- new_text; ?>
-
- |
- num_posts ?> |
- last_reply ?> |
-
-
-
-
-
diff --git a/modules/forum/forum-rtl.css b/modules/forum/forum-rtl.css
deleted file mode 100644
index 4f81bde2986a771d670218d05701ec9a413b1caf..0000000000000000000000000000000000000000
--- a/modules/forum/forum-rtl.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/* $Id$ */
-
-#forum tr td.forum {
- padding-left: 0.5em;
- padding-right: 25px;
- background-position: 98% 2px;
-}
-.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 c025a9862748790486c0703119d64ff8903e5296..0000000000000000000000000000000000000000
--- a/modules/forum/forum-submitted.tpl.php
+++ /dev/null
@@ -1,29 +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 c223686a969a4ebf54c0b88055ff187ea7ddc4a8..0000000000000000000000000000000000000000
--- a/modules/forum/forum-topic-list.tpl.php
+++ /dev/null
@@ -1,69 +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: An outputtable string represented when the topic was posted.
- * - $topic->last_reply: An outputtable string representing when the topic was
- * last replied to.
- * - $topic->timestamp: The raw timestamp this topic was posted.
- *
- * @see template_preprocess_forum_topic_list()
- * @see theme_forum_topic_list()
- */
-?>
-
-
- |
-
-
-
-
- | icon; ?> |
-
-
- title; ?>
-
-
- created; ?>
-
- |
- moved): ?>
- message; ?> |
-
-
- comment_count; ?>
- new_replies): ?>
-
- new_text; ?>
-
- |
- last_reply; ?> |
-
-
-
-
-
-
diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc
deleted file mode 100644
index 02f1940b26dcb44900d6717da1bcf4341cad4287..0000000000000000000000000000000000000000
--- a/modules/forum/forum.admin.inc
+++ /dev/null
@@ -1,314 +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;
-}
-
-/**
- * Process forum form and container form submissions.
- */
-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']);
-}
-
-/**
- * Returns a form for adding a container to the forum vocabulary
- *
- * @param $edit Associative array containing a container term to be added or edited.
- * @ingroup forms
- * @see forum_form_submit()
- */
-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;
-}
-
-/**
- * Returns a confirmation page for deleting a forum taxonomy term.
- *
- * @param $tid ID of the term to be deleted
- */
-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'));
-}
-
-/**
- * Implement forms api _submit call. Deletes a forum after confirmation.
- */
-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 builder for the forum settings page.
- *
- * @see system_settings_form()
- */
-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);
-}
-
-/**
- * Returns an overview list of existing forums and containers
- */
-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 which is being added or edited
- * @param $title Title to display the select box with
- * @param $child_type Whether the child is forum or container
- */
-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 f56930d5489a559b07acbf5bec375965d6229cf5..0000000000000000000000000000000000000000
--- a/modules/forum/forum.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $Id$ */
-
-#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 tr td.forum {
- padding-left: 25px; /* LTR */
- background-position: 2px 2px; /* LTR */
- background-image: url(../../misc/forum-default.png);
- background-repeat: no-repeat;
-}
-#forum tr.new-topics td.forum {
- background-image: url(../../misc/forum-new.png);
-}
-#forum div.indent {
- margin-left: 20px;
-}
-
diff --git a/modules/forum/forum.info b/modules/forum/forum.info
deleted file mode 100644
index a6fec2ccb305b7a1aaf784e9bc125403ebb70925..0000000000000000000000000000000000000000
--- a/modules/forum/forum.info
+++ /dev/null
@@ -1,14 +0,0 @@
-; $Id$
-name = Forum
-description = Provides discussion forums.
-dependencies[] = taxonomy
-dependencies[] = comment
-package = Core
-version = VERSION
-core = 7.x
-files[] = forum.module
-files[] = forum.admin.inc
-files[] = forum.pages.inc
-files[] = forum.install
-files[] = forum.test
-configure = admin/structure/forum
diff --git a/modules/forum/forum.install b/modules/forum/forum.install
deleted file mode 100644
index 9a1ae18f691e5cb02721a211977814436f554af5..0000000000000000000000000000000000000000
--- a/modules/forum/forum.install
+++ /dev/null
@@ -1,333 +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_' . $vocabulary->machine_name,
- 'type' => 'taxonomy_term_reference',
- 'settings' => array(
- 'allowed_values' => array(
- array(
- 'vid' => $vocabulary->vid,
- 'parent' => 0,
- ),
- ),
- ),
- );
- field_create_field($field);
-
- variable_set('forum_nav_vocabulary', $vocabulary->vid);
-
- // 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_' . $vocabulary->machine_name,
- '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');
-}
-
-/**
- * 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('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',
- ),
- ),
- ),
- );
-
-
- return $schema;
-}
-
-/**
- * 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();
-}
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
deleted file mode 100644
index 5b92d0d2e8284e96aeac597e4618a9b28ad10927..0000000000000000000000000000000000000000
--- a/modules/forum/forum.module
+++ /dev/null
@@ -1,1268 +0,0 @@
-' . t('About') . '';
- $output .= '' . 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 .= '
';
- $output .= '
';
- $output .= '
';
- $output .= '
';
- $output .= '' . t('For more information, see the online handbook entry for Forum module.', array('@forum' => 'http://drupal.org/handbook/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 .= '
';
- return $output;
- case 'admin/structure/forum':
- $output = '' . t('Forums contain forum topics. Use containers to group related forums.') . '
';
- $output .= theme('more_help_link', array('url' => 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),
- ),
- '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'),
- 'type' => MENU_CALLBACK,
- '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'),
- 'type' => MENU_CALLBACK,
- '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' page.
- if ($root_path == 'forum') {
- $tid = (isset($router_item['page_arguments'][0]) ? $router_item['page_arguments'][0] : 0);
- $forum_term = forum_forum_load($tid);
- if ($forum_term) {
- $vid = variable_get('forum_nav_vocabulary', 0);
- $vocabulary = taxonomy_vocabulary_load($vid);
-
- $links = array();
- // Loop through all bundles for forum taxonomy vocabulary field.
- $field = field_info_field('taxonomy_' . $vocabulary->machine_name);
- 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_init().
- */
-function forum_init() {
- drupal_add_css(drupal_get_path('module', 'forum') . '/forum.css', array('preprocess' => TRUE));
-}
-
-/**
- * Implements hook_entity_info_alter().
- */
-function forum_entity_info_alter(&$info) {
- // Take over URI constuction 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';
- }
- }
- }
-}
-
-/**
- * Entity URI callback.
- */
-function forum_uri($forum) {
- return array(
- 'path' => 'forum/' . $forum->tid,
- );
-}
-
-/**
- * Check whether a content type can be used in a forum.
- *
- * @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().
- *
- * Check in particular that only a "leaf" term in the associated 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().
- *
- * Assign 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'];
- $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 ($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($tid) {
- // For containers, remove the tid from the forum_containers variable.
- $containers = variable_get('forum_containers', array());
- $key = array_search($tid, $containers);
- if ($key !== FALSE) {
- unset($containers[$key]);
- }
- variable_set('forum_containers', $containers);
-}
-
-/**
- * Implements hook_comment_publish().
- *
- * This actually handles the insert 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().
- *
- * 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 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' && $entity->status && _forum_node_check_node_type($entity)) {
- // 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();
- }
- // Only save data to the table if the node is published.
- if ($entity->status) {
- $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);
- }
- }
-}
-
-/**
- * Implements hook_form_alter().
- */
-function forum_form_alter(&$form, $form_state, $form_id) {
- $vid = variable_get('forum_nav_vocabulary', 0);
- if (isset($form['vid']) && $form['vid']['#value'] == $vid) {
- // Hide critical options from forum vocabulary.
- if ($form_id == 'taxonomy_form_vocabulary') {
- $form['help_forum_vocab'] = array(
- '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
- '#weight' => -1,
- );
- $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
- $form['delete']['#access'] = FALSE;
- }
- // Hide multiple parents select from forum terms.
- elseif ($form_id == 'taxonomy_form_term') {
- $form['advanced']['parent']['#access'] = FALSE;
- }
- }
- if ($form_id == 'forum_node_form') {
- $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 : NULL;
- }
- }
-}
-
-/**
- * Implements hook_block_info().
- */
-function forum_block_info() {
- $blocks['active'] = array(
- 'info' => t('Active forum topics'),
- 'cache' => DRUPAL_CACHE_CUSTOM,
- );
- $blocks['new'] = array(
- 'info' => t('New forum topics'),
- 'cache' => DRUPAL_CACHE_CUSTOM,
- );
- 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(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 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;
-}
-
-/**
-* A #pre_render callback. Lists nodes based on the element's #query property.
-*
-* @see forum_block_view()
-*
-* @return
-* A renderable array.
-*/
-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 ID of the forum, if not givin 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('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;
-}
-
-/**
- * Calculate the number of nodes the user has not yet read and are newer
- * than NODE_NEW_LIMIT.
- */
-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();
-}
-
-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)
- ->orderBy('f.last_comment_timestamp', 'DESC')
- ->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) {
- $result = db_query("SELECT n.title, n.nid, n.type, n.sticky, n.created, n.uid, n.comment AS comment_mode, ncs.*, f.tid AS forum_tid, u.name, CASE ncs.last_comment_uid WHEN 0 THEN ncs.last_comment_name ELSE u2.name END AS last_comment_name FROM {node} n INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid INNER JOIN {forum} f ON n.vid = f.vid INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {users} u2 ON ncs.last_comment_uid = u2.uid WHERE n.nid IN (:nids)", array(':nids' => $nids));
- }
- else {
- $result = array();
- }
-
- $topics = array();
- foreach ($result as $topic) {
- if ($user->uid) {
- // folder is new if topic is new or there are new comments since 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;
- }
-
- 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;
-}
-
-/**
- * Process variables for forums.tpl.php
- *
- * The $variables array contains the following arguments:
- * - $forums
- * - $topics
- * - $parents
- * - $tid
- * - $sortby
- * - $forum_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'] . '/0/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'] = '';
- }
-}
-
-/**
- * Process variables to format a forum listing.
- *
- * $variables contains the following information:
- * - $forums
- * - $parents
- * - $tid
- *
- * @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;
- 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]->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']);
-}
-
-/**
- * Preprocess variables to format the topic listing.
- *
- * $variables contains the following data:
- * - $tid
- * - $topics
- * - $sortby
- * - $forum_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));
- $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 = '';
- }
- $topic->uid = $topic->last_comment_uid ? $topic->last_comment_uid : $topic->uid;
- $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', array('tags' => NULL));
-}
-
-/**
- * Process variables to format the icon for each individual topic.
- *
- * $variables contains the following data:
- * - $new_posts
- * - $num_posts = 0
- * - $comment_mode = 0
- * - $sticky = 0
- *
- * @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'] = $variables['new_posts'] ? 'hot-new' : 'hot';
- }
- else {
- $variables['icon'] = $variables['new_posts'] ? 'new' : 'default';
- }
-
- if ($variables['comment_mode'] == COMMENT_NODE_CLOSED || $variables['comment_mode'] == COMMENT_NODE_HIDDEN) {
- $variables['icon'] = 'closed';
- }
-
- if ($variables['sticky'] == 1) {
- $variables['icon'] = 'sticky';
- }
-}
-
-/**
- * Process variables to format submission info for display in the forum list and topic list.
- *
- * $variables will contain: $topic
- *
- * @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) : '';
-}
-
-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;
-}
-
-function _forum_get_topic_order($sortby) {
- switch ($sortby) {
- case 1:
- return array('field' => 'ncs.last_comment_timestamp', 'sort' => 'desc');
- break;
- case 2:
- return array('field' => 'ncs.last_comment_timestamp', 'sort' => 'asc');
- break;
- case 3:
- return array('field' => 'ncs.comment_count', 'sort' => 'desc');
- break;
- case 4:
- return array('field' => 'ncs.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} WHERE nid = :nid AND 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 02c780136cd2ebfdc1fe576a896ef9bbdff366f6..0000000000000000000000000000000000000000
--- a/modules/forum/forum.pages.inc
+++ /dev/null
@@ -1,29 +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 1cd7dfc6dd4b362e4e88871abdee102aa9814985..0000000000000000000000000000000000000000
--- a/modules/forum/forum.test
+++ /dev/null
@@ -1,495 +0,0 @@
- 'Forum functionality',
- 'description' => 'Create, view, edit, delete, and change forum entries and verify its consistency in the database.',
- 'group' => 'Forum',
- );
- }
-
- /**
- * Enable modules and create users with specific permissions.
- */
- function setUp() {
- parent::setUp('taxonomy', 'comment', 'forum');
- // Create users.
- $this->admin_user = $this->drupalCreateUser(array('administer blocks', 'administer forums', 'administer menu', 'administer taxonomy', 'create forum content')); // 'access administration pages'));
- $this->edit_any_topics_user = $this->drupalCreateUser(array('create forum content', 'edit any forum content', 'delete any forum content', 'access administration pages'));
- $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());
- }
-
- /**
- * Login users, create forum nodes, and test 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);
- $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);
-
- // 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', t('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, t('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', t('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);
- }
-
- /**
- * Forum nodes should not be created without choosing forum from 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, t('A forum node was not created when missing a forum vocabulary.'));
-
- // Reset the defaults for future tests.
- module_enable(array('forum'));
- }
-
- /**
- * Run 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['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.'), t('Active forum topics forum block was enabled'));
-
- // Enable the new forum block.
- $edit = array();
- $edit['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.'), t('[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', t('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', t('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 form.
- $this->deleteForum($this->delete_forum['tid']);
- // Create forum at the top (root) level.
- $this->root_forum = $this->createForum('forum');
- }
-
- /**
- * Edit 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)), t('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, t('The name was updated'));
- $this->assertEqual($current_settings->description, $description, t('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');
- }
-
- /**
- * Create a forum container or a forum.
- *
- * @param $type
- * Forum type (forum container or forum).
- * @param $parent
- * Forum parent (default = 0 = a root forum; >0 = a forum container or
- * another forum).
- * @return
- * taxonomy_term_data created.
- */
- 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))), t(ucfirst($type) . ' was created'));
-
- // 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;
- }
-
- /**
- * Delete 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');
- }
-
- /**
- * Run 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);
- }
-
- /**
- * Create forum topic.
- *
- * @param array $forum
- * Forum array.
- * @param boolean $container
- * True if $forum is a container.
- *
- * @return object
- * Topic node created.
- */
- 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)), t('Forum topic was not created'));
- $this->assertRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), t('Error message was shown'));
- return;
- }
- else {
- $this->assertRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), t('Forum topic was created'));
- $this->assertNoRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), t('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, t('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, t('Subject was found'));
- $this->assertRaw($body, t('Body was found'));
-
- return $node;
- }
-
- /**
- * Verify 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'), t('Forum help title was displayed'));
- $this->assertText(t('Forum'), t('Forum help node was displayed'));
- }
-
- // Verify the forum blocks were displayed.
- $this->drupalGet('');
- $this->assertResponse(200);
- $this->assertText(t('New forum topics'), t('[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', t('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)), t('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', t('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"])), t('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'])), t('Forum node was deleted'));
- }
- }
-
- /**
- * Verify display of forum page.
- *
- * @param $forum
- * A row from taxonomy_term_data table in array.
- */
- private function verifyForumView($forum, $parent = NULL) {
- // View forum page.
- $this->drupalGet('forum/' . $forum['tid']);
- $this->assertResponse(200);
- $this->assertTitle($forum['name'] . ' | Drupal', t('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)), t('Breadcrumbs were displayed'));
- }
-
- /**
- * Generate forum topics to test display of active forum block.
- *
- * @param array $forum Forum 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;
- }
- }
-
- /**
- * View forum topics to test display of 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);
- }
- }
- }
-}
diff --git a/modules/forum/forums.tpl.php b/modules/forum/forums.tpl.php
deleted file mode 100644
index 2c9e2efa0b00dd27359b4515ca100f44d9f93ae0..0000000000000000000000000000000000000000
--- a/modules/forum/forums.tpl.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
diff --git a/modules/help/help-rtl.css b/modules/help/help-rtl.css
deleted file mode 100644
index 79e99c4f45d380bde9c06730ad4a78807d8fa584..0000000000000000000000000000000000000000
--- a/modules/help/help-rtl.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $Id$ */
-
-.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 568a5ad2f532d79b26a837ff6df9008d1b7fb121..0000000000000000000000000000000000000000
--- a/modules/help/help.admin.inc
+++ /dev/null
@@ -1,76 +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.
- */
-function help_page($name) {
- $output = '';
- if (module_hook($name, 'help')) {
- $module = drupal_parse_info_file(drupal_get_path('module', $name) . '/' . $name . '.info');
- drupal_set_title($module['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' => $module['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);
- if (!empty($admin_tasks)) {
- ksort($admin_tasks);
- $output .= theme('item_list', array('items' => $admin_tasks, 'title' => t('@module administration pages', array('@module' => $module['name']))));
- }
-
- }
- return $output;
-}
-
-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 = '';
- $i = 0;
- foreach ($modules as $module => $name) {
- $output .= '- ' . l($name, 'admin/help/' . $module) . '
';
- if (($i + 1) % $break == 0 && ($i + 1) != $count) {
- $output .= '
';
- }
- $i++;
- }
- $output .= '
';
-
- // Help for another path in the block module
- case 'admin/structure/block':
- return '
' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') . '
';
- }
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/help/help.css b/modules/help/help.css
deleted file mode 100644
index c8062be75120347eb647e24b55eb3cd3fdc88bfd..0000000000000000000000000000000000000000
--- a/modules/help/help.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $Id$ */
-
-.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 4c84b26219aedbd31c5611e267eb699d0d8d84c0..0000000000000000000000000000000000000000
--- a/modules/help/help.info
+++ /dev/null
@@ -1,9 +0,0 @@
-; $Id$
-name = Help
-description = Manages the display of online help.
-package = Core
-version = VERSION
-core = 7.x
-files[] = help.module
-files[] = help.admin.inc
-files[] = help.test
diff --git a/modules/help/help.module b/modules/help/help.module
deleted file mode 100644
index 18357b4b463352ea5a117914c7874278838567e9..0000000000000000000000000000000000000000
--- a/modules/help/help.module
+++ /dev/null
@@ -1,64 +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_CALLBACK,
- 'file' => 'help.admin.inc',
- );
- }
-
- return $items;
-}
-
-/**
- * Implements hook_help().
- */
-function help_help($path, $arg) {
- switch ($path) {
- case 'admin/help':
- $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 .= '
';
- $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/handbooks', '@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/handbook/modules/help/', '@handbook' => 'http://drupal.org/handbook', '@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 .= '
';
- return $output;
- }
-}
diff --git a/modules/help/help.test b/modules/help/help.test
deleted file mode 100644
index db739f3459d3b06b1ac56141542e94b7106f9e21..0000000000000000000000000000000000000000
--- a/modules/help/help.test
+++ /dev/null
@@ -1,121 +0,0 @@
- 'Help functionality',
- 'description' => 'Verify help display and user access to help based on permissions.',
- 'group' => 'Help',
- );
- }
-
- /**
- * Enable modules and create users with specific permissions.
- */
- function setUp() {
- parent::setUp('blog', 'poll');
-
- $this->getModuleList();
-
- // Create users.
- $this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer permissions'));
- $this->any_user = $this->drupalCreateUser(array());
- }
-
- /**
- * Login users, create dblog events, and test dblog functionality through the admin and user interfaces.
- */
- function testHelp() {
- // Login the admin user.
- $this->drupalLogin($this->big_user);
- $this->verifyHelp();
-
- // Login the regular user.
- $this->drupalLogin($this->any_user);
- $this->verifyHelp(403);
-
- // Check for css on admin/help.
- $this->drupalLogin($this->big_user);
- $this->drupalGet('admin/help');
- $this->assertRaw(drupal_get_path('module', 'help') . '/help.css', t('The help.css file is present in the HTML.'));
-
- // Verify that introductory help text exists, goes for 100% module coverage.
- $this->assertRaw(t('For more information, refer to the specific topics listed in the next section or to the
online Drupal handbooks.', array('@drupal' => 'http://drupal.org/handbooks')), 'Help intro text correctly appears.');
-
- // Verify that help topics text appears.
- $this->assertRaw('
' . t('Help topics') . '
' . t('Help is available on the following items:') . '
', t('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, t('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
- }
- }
-
- /**
- * Verify the logged in user has the desired access to the various help nodes and the nodes display help.
- *
- * @param integer $response 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', t('[' . $module . '] Title was displayed'));
- $this->assertRaw('
' . t($name) . '
', t('[' . $module . '] Heading was displayed'));
- }
- }
- }
-
- /**
- * Get list of enabled modules that implement hook_help().
- *
- * @return array 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 module without help to verify it is not listed in help page.
- */
-class NoHelpTestCase extends DrupalWebTestCase {
- 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'));
- }
-
- /**
- * Ensure 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', t('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 59c46605d86698fc2e35a59d714b2884af24fddf..0000000000000000000000000000000000000000
--- a/modules/image/image-rtl.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id$ */
-
-/**
- * Image upload widget.
- */
-div.image-preview {
- float: right; /* RTL */
- padding: 0 0 10px 10px; /* RTL */
-}
-div.image-widget-data {
- float: right; /* RTL */
-}
diff --git a/modules/image/image.admin.css b/modules/image/image.admin.css
deleted file mode 100644
index c2794583e3f4eb0d19b33307a6fee4dc4c201dfb..0000000000000000000000000000000000000000
--- a/modules/image/image.admin.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $Id$ */
-
-/**
- * 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.admin.inc b/modules/image/image.admin.inc
deleted file mode 100644
index ce1b039b6af4bbe47cf1da110a2de091ea035ad7..0000000000000000000000000000000000000000
--- a/modules/image/image.admin.inc
+++ /dev/null
@@ -1,903 +0,0 @@
- theme('image_style_list', array('styles' => $styles)),
- '#attached' => array(
- 'css' => array(drupal_get_path('module', 'image') . '/image.admin.css' => array()),
- ),
- );
-
- return $page;
-
-}
-
-/**
- * Form builder; Edit an image style name and effects order.
- *
- * @param $form_state
- * An associative array containing the current state of the form.
- * @param $style
- * An image style array.
- * @ingroup forms
- * @see image_style_form_submit()
- * @see image_style_name_validate()
- */
-function image_style_form($form, &$form_state, $style) {
- $title = t('Edit %name style', array('%name' => $style['name']));
- drupal_set_title($title, PASS_THROUGH);
-
- // Adjust this form for styles that must be overridden to edit.
- $editable = (bool) ($style['storage'] & IMAGE_STORAGE_EDITABLE);
-
- if (!$editable && empty($form_state['input'])) {
- drupal_set_message(t('This image style is currently being provided by a module. Click the "Override defaults" button to change its settings.'), 'warning');
- }
-
- $form_state['image_style'] = $style;
- $form['#tree'] = TRUE;
- $form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array();
-
- // Show the thumbnail preview.
- $form['preview'] = array(
- '#type' => 'item',
- '#title' => t('Preview'),
- '#markup' => theme('image_style_preview', array('style' => $style)),
- );
-
- // Allow the name of the style to be changed, unless this style is
- // provided by a module's hook_default_image_styles().
- if ($style['storage'] & IMAGE_STORAGE_MODULE) {
- $form['name'] = array(
- '#type' => 'item',
- '#title' => t('Image style name'),
- '#markup' => $style['name'],
- '#description' => t('This image style is being provided by %module module and may not be renamed.', array('%module' => $style['module'])),
- );
- }
- else {
- $form['name'] = array(
- '#type' => 'textfield',
- '#size' => '64',
- '#title' => t('Image style name'),
- '#default_value' => $style['name'],
- '#description' => t('The name is used in URLs for generated images. Use only lowercase alphanumeric characters, underscores (_), and hyphens (-).'),
- '#element_validate' => array('image_style_name_validate'),
- '#required' => TRUE,
- );
- }
-
- // Build the list of existing image effects for this image style.
- $form['effects'] = array(
- '#theme' => 'image_style_effects',
- );
- foreach ($style['effects'] as $key => $effect) {
- $form['effects'][$key]['#weight'] = isset($form_state['input']['effects']) ? $form_state['input']['effects'][$key]['weight'] : NULL;
- $form['effects'][$key]['label'] = array(
- '#markup' => $effect['label'],
- );
- $form['effects'][$key]['summary'] = array(
- '#markup' => isset($effect['summary theme']) ? theme($effect['summary theme'], array('data' => $effect['data'])) : '',
- );
- $form['effects'][$key]['weight'] = array(
- '#type' => 'weight',
- '#default_value' => $effect['weight'],
- '#access' => $editable,
- );
-
- // Only attempt to display these fields for editable styles as the 'ieid'
- // key is not set for styles defined in code.
- if ($editable) {
- $form['effects'][$key]['configure'] = array(
- '#type' => 'link',
- '#title' => t('edit'),
- '#href' => 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'],
- '#access' => $editable && isset($effect['form callback']),
- );
- $form['effects'][$key]['remove'] = array(
- '#type' => 'link',
- '#title' => t('delete'),
- '#href' => 'admin/config/media/image-styles/edit/' . $style['name'] . '/effects/' . $effect['ieid'] . '/delete',
- '#access' => $editable,
- );
- }
- }
-
- // Build the new image effect addition form and add it to the effect list.
- $new_effect_options = array('' => t('Select a new effect'));
- foreach (image_effect_definitions() as $effect => $definition) {
- $new_effect_options[$effect] = check_plain($definition['label']);
- }
- $form['effects']['new'] = array(
- '#tree' => FALSE,
- '#weight' => isset($form_state['input']['weight']) ? $form_state['input']['weight'] : NULL,
- '#access' => $editable,
- );
- $form['effects']['new']['new'] = array(
- '#type' => 'select',
- '#options' => $new_effect_options,
- );
- $form['effects']['new']['weight'] = array(
- '#type' => 'weight',
- '#default_value' => count($form['effects']) - 1,
- );
- $form['effects']['new']['add'] = array(
- '#type' => 'submit',
- '#value' => t('Add'),
- '#validate' => array('image_style_form_add_validate'),
- '#submit' => array('image_style_form_submit', 'image_style_form_add_submit'),
- );
-
- // Show the Override or Submit button for this style.
- $form['actions'] = array('#type' => 'actions');
- $form['actions']['override'] = array(
- '#type' => 'submit',
- '#value' => t('Override defaults'),
- '#validate' => array(),
- '#submit' => array('image_style_form_override_submit'),
- '#access' => !$editable,
- );
- $form['actions']['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Update style'),
- '#access' => $editable,
- );
-
- return $form;
-}
-
-/**
- * Validate handler for adding a new image effect to an image style.
- */
-function image_style_form_add_validate($form, &$form_state) {
- if (!$form_state['values']['new']) {
- form_error($form['effects']['new']['new'], t('Select an effect to add.'));
- $form_state['rebuild'] = TRUE;
- }
-}
-
-/**
- * Submit handler for adding a new image effect to an image style.
- */
-function image_style_form_add_submit($form, &$form_state) {
- $style = $form_state['image_style'];
- // Check if this field has any configuration options.
- $effect = image_effect_definition_load($form_state['values']['new']);
-
- // Load the configuration form for this option.
- if (isset($effect['form callback'])) {
- $path = 'admin/config/media/image-styles/edit/' . $form_state['image_style']['name'] . '/add/' . $form_state['values']['new'];
- $form_state['redirect'] = array($path, array('query' => array('weight' => $form_state['values']['weight'])));
- }
- // If there's no form, immediately add the image effect.
- else {
- $effect['isid'] = $style['isid'];
- $effect['weight'] = $form_state['values']['weight'];
- image_effect_save($effect);
- drupal_set_message(t('The image effect was successfully applied.'));
- }
-}
-
-/**
- * Submit handler for overriding a module-defined style.
- */
-function image_style_form_override_submit($form, &$form_state) {
- drupal_set_message(t('The %style style has been overridden, allowing you to change its settings.', array('%style' => $form_state['image_style']['name'])));
- image_default_style_save($form_state['image_style']);
-}
-
-/**
- * Submit handler for saving an image style.
- */
-function image_style_form_submit($form, &$form_state) {
- // Update the image style name if it has changed.
- $style = $form_state['image_style'];
- if (isset($form_state['values']['name']) && $style['name'] != $form_state['values']['name']) {
- $style['name'] = $form_state['values']['name'];
- }
-
- // Update image effect weights.
- if (!empty($form_state['values']['effects'])) {
- foreach ($form_state['values']['effects'] as $ieid => $effect_data) {
- if (isset($style['effects'][$ieid])) {
- $effect = $style['effects'][$ieid];
- $effect['weight'] = $effect_data['weight'];
- image_effect_save($effect);
- }
- }
- }
-
- image_style_save($style);
- if ($form_state['values']['op'] == t('Update style')) {
- drupal_set_message('Changes to the style have been saved.');
- }
- $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
-}
-
-/**
- * Form builder; Form for adding a new image style.
- *
- * @ingroup forms
- * @see image_style_add_form_submit()
- * @see image_style_name_validate()
- */
-function image_style_add_form($form, &$form_state) {
- $form['name'] = array(
- '#type' => 'textfield',
- '#size' => '64',
- '#title' => t('Style name'),
- '#default_value' => '',
- '#description' => t('The name is used in URLs for generated images. Use only lowercase alphanumeric characters, underscores (_), and hyphens (-).'),
- '#element_validate' => array('image_style_name_validate'),
- '#required' => TRUE,
- );
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Create new style'),
- );
-
- return $form;
-}
-
-/**
- * Submit handler for adding a new image style.
- */
-function image_style_add_form_submit($form, &$form_state) {
- $style = array('name' => $form_state['values']['name']);
- $style = image_style_save($style);
- drupal_set_message(t('Style %name was created.', array('%name' => $style['name'])));
- $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
-}
-
-/**
- * Element validate function to ensure unique, URL safe style names.
- */
-function image_style_name_validate($element, $form_state) {
- // Check for duplicates.
- $styles = image_styles();
- if (isset($styles[$element['#value']]) && (!isset($form_state['image_style']['isid']) || $styles[$element['#value']]['isid'] != $form_state['image_style']['isid'])) {
- form_set_error($element['#name'], t('The image style name %name is already in use.', array('%name' => $element['#value'])));
- }
-
- // Check for illegal characters in image style names.
- if (preg_match('/[^0-9a-z_\-]/', $element['#value'])) {
- form_set_error($element['#name'], t('Please only use lowercase alphanumeric characters, underscores (_), and hyphens (-) for style names.'));
- }
-}
-
-/**
- * Form builder; Form for deleting an image style.
- *
- * @param $style
- * An image style array.
- *
- * @ingroup forms
- * @see image_style_delete_form_submit()
- */
-function image_style_delete_form($form, $form_state, $style) {
- $form_state['image_style'] = $style;
-
- $replacement_styles = array_diff_key(image_style_options(), array($style['name'] => ''));
- $replacement_styles[''] = t('No replacement, just delete');
- $form['replacement'] = array(
- '#title' => t('Replacement style'),
- '#type' => 'select',
- '#options' => $replacement_styles,
- );
-
- return confirm_form(
- $form,
- t('Optionally select a style before deleting %style', array('%style' => $style['name'])),
- 'admin/config/media/image-styles',
- t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted.'),
- t('Delete'), t('Cancel')
- );
-}
-
-/**
- * Submit handler to delete an image style.
- */
-function image_style_delete_form_submit($form, &$form_state) {
- $style = $form_state['image_style'];
-
- image_style_delete($style, $form_state['values']['replacement']);
- drupal_set_message(t('Style %name was deleted.', array('%name' => $style['name'])));
- $form_state['redirect'] = 'admin/config/media/image-styles';
-}
-
-/**
- * Confirmation form to revert a database style to its default.
- */
-function image_style_revert_form($form, $form_state, $style) {
- $form_state['image_style'] = $style;
-
- return confirm_form(
- $form,
- t('Revert the %style style?', array('%style' => $style['name'])),
- 'admin/config/media/image-styles',
- t('Reverting this style will delete the customized settings and restore the defaults provided by the @module module.', array('@module' => $style['module'])),
- t('Revert'), t('Cancel')
- );
-}
-
-/**
- * Submit handler to convert an overridden style to its default.
- */
-function image_style_revert_form_submit($form, &$form_state) {
- drupal_set_message(t('The %style style has been revert to its defaults.', array('%style' => $form_state['image_style']['name'])));
- image_default_style_revert($form_state['image_style']);
- $form_state['redirect'] = 'admin/config/media/image-styles';
-}
-
-/**
- * Form builder; Form for adding and editing image effects.
- *
- * This form is used universally for editing all image effects. Each effect adds
- * its own custom section to the form by calling the form function specified in
- * hook_image_effects().
- *
- * @param $form_state
- * An associative array containing the current state of the form.
- * @param $style
- * An image style array.
- * @param $effect
- * An image effect array.
- *
- * @ingroup forms
- * @see hook_image_effects()
- * @see image_effects()
- * @see image_resize_form()
- * @see image_scale_form()
- * @see image_rotate_form()
- * @see image_crop_form()
- * @see image_effect_form_submit()
- */
-function image_effect_form($form, &$form_state, $style, $effect) {
- if (!empty($effect['data'])) {
- $title = t('Edit %label effect', array('%label' => $effect['label']));
- }
- else{
- $title = t('Add %label effect', array('%label' => $effect['label']));
- }
- drupal_set_title($title, PASS_THROUGH);
-
- $form_state['image_style'] = $style;
- $form_state['image_effect'] = $effect;
-
- // If no configuration for this image effect, return to the image style page.
- if (!isset($effect['form callback'])) {
- drupal_goto('admin/config/media/image-styles/edit/' . $style['name']);
- }
-
- $form['#tree'] = TRUE;
- $form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array();
- if (function_exists($effect['form callback'])) {
- $form['data'] = call_user_func($effect['form callback'], $effect['data']);
- }
-
- // Check the URL for a weight, then the image effect, otherwise use default.
- $form['weight'] = array(
- '#type' => 'hidden',
- '#value' => isset($_GET['weight']) ? intval($_GET['weight']) : (isset($effect['weight']) ? $effect['weight'] : count($style['effects'])),
- );
-
- $form['actions'] = array('#tree' => FALSE, '#type' => 'actions');
- $form['actions']['submit'] = array(
- '#type' => 'submit',
- '#value' => isset($effect['ieid']) ? t('Update effect') : t('Add effect'),
- );
- $form['actions']['cancel'] = array(
- '#type' => 'link',
- '#title' => t('Cancel'),
- '#href' => 'admin/config/media/image-styles/edit/' . $style['name'],
- );
-
- return $form;
-}
-
-/**
- * Submit handler for updating an image effect.
- */
-function image_effect_form_submit($form, &$form_state) {
- $style = $form_state['image_style'];
- $effect = array_merge($form_state['image_effect'], $form_state['values']);
- $effect['isid'] = $style['isid'];
- image_effect_save($effect);
- drupal_set_message(t('The image effect was successfully applied.'));
- $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
-}
-
-/**
- * Form builder; Form for deleting an image effect.
- *
- * @param $style
- * Name of the image style from which the image effect will be removed.
- * @param $effect
- * Name of the image effect to remove.
- * @ingroup forms
- * @see image_effect_delete_form_submit()
- */
-function image_effect_delete_form($form, &$form_state, $style, $effect) {
- $form_state['image_style'] = $style;
- $form_state['image_effect'] = $effect;
-
- $question = t('Are you sure you want to delete the @effect effect from the %style style?', array('%style' => $style['name'], '@effect' => $effect['label']));
- return confirm_form($form, $question, 'admin/config/media/image-styles/edit/' . $style['name'], '', t('Delete'));
-}
-
-/**
- * Submit handler to delete an image effect.
- */
-function image_effect_delete_form_submit($form, &$form_state) {
- $style = $form_state['image_style'];
- $effect = $form_state['image_effect'];
-
- image_effect_delete($effect);
- drupal_set_message(t('The image effect %name has been deleted.', array('%name' => $effect['label'])));
- $form_state['redirect'] = 'admin/config/media/image-styles/edit/' . $style['name'];
-}
-
-/**
- * Element validate handler to ensure an integer pixel value.
- *
- * The property #allow_negative = TRUE may be set to allow negative integers.
- */
-function image_effect_integer_validate($element, &$form_state) {
- $value = empty($element['#allow_negative']) ? $element['#value'] : preg_replace('/^-/', '', $element['#value']);
- if ($element['#value'] != '' && (!is_numeric($value) || intval($value) <= 0)) {
- if (empty($element['#allow_negative'])) {
- form_error($element, t('!name must be an integer.', array('!name' => $element['#title'])));
- }
- else {
- form_error($element, t('!name must be a positive integer.', array('!name' => $element['#title'])));
- }
- }
-}
-
-/**
- * Element validate handler to ensure a hexadecimal color value.
- */
-function image_effect_color_validate($element, &$form_state) {
- if ($element['#value'] != '') {
- $hex_value = preg_replace('/^#/', '', $element['#value']);
- if (!preg_match('/^#[0-9A-F]{3}([0-9A-F]{3})?$/', $element['#value'])) {
- form_error($element, t('!name must be a hexadecimal color value.', array('!name' => $element['#title'])));
- }
- }
-}
-
-/**
- * Element validate handler to ensure that either a height or a width is
- * specified.
- */
-function image_effect_scale_validate($element, &$form_state) {
- if (empty($element['width']['#value']) && empty($element['height']['#value'])) {
- form_error($element, t('Width and height can not both be blank.'));
- }
-}
-
-/**
- * Form structure for the image resize form.
- *
- * Note that this is not a complete form, it only contains the portion of the
- * form for configuring the resize options. Therefore it does not not need to
- * include metadata about the effect, nor a submit button.
- *
- * @param $data
- * The current configuration for this resize effect.
- */
-function image_resize_form($data) {
- $form['width'] = array(
- '#type' => 'textfield',
- '#title' => t('Width'),
- '#default_value' => isset($data['width']) ? $data['width'] : '',
- '#field_suffix' => ' ' . t('pixels'),
- '#required' => TRUE,
- '#size' => 10,
- '#element_validate' => array('image_effect_integer_validate'),
- '#allow_negative' => FALSE,
- );
- $form['height'] = array(
- '#type' => 'textfield',
- '#title' => t('Height'),
- '#default_value' => isset($data['height']) ? $data['height'] : '',
- '#field_suffix' => ' ' . t('pixels'),
- '#required' => TRUE,
- '#size' => 10,
- '#element_validate' => array('image_effect_integer_validate'),
- '#allow_negative' => FALSE,
- );
- return $form;
-}
-
-/**
- * Form structure for the image scale form.
- *
- * Note that this is not a complete form, it only contains the portion of the
- * form for configuring the scale options. Therefore it does not not need to
- * include metadata about the effect, nor a submit button.
- *
- * @param $data
- * The current configuration for this scale effect.
- */
-function image_scale_form($data) {
- $form = image_resize_form($data);
- $form['#element_validate'] = array('image_effect_scale_validate');
- $form['width']['#required'] = FALSE;
- $form['height']['#required'] = FALSE;
- $form['upscale'] = array(
- '#type' => 'checkbox',
- '#default_value' => (isset($data['upscale'])) ? $data['upscale'] : 0,
- '#title' => t('Allow Upscaling'),
- '#description' => t('Let scale make images larger than their original size'),
- );
- return $form;
-}
-
-/**
- * Form structure for the image crop form.
- *
- * Note that this is not a complete form, it only contains the portion of the
- * form for configuring the crop options. Therefore it does not not need to
- * include metadata about the effect, nor a submit button.
- *
- * @param $data
- * The current configuration for this crop effect.
- */
-function image_crop_form($data) {
- $data += array(
- 'width' => '',
- 'height' => '',
- 'anchor' => 'center-center',
- );
-
- $form = image_resize_form($data);
- $form['anchor'] = array(
- '#type' => 'radios',
- '#title' => t('Anchor'),
- '#options' => array(
- 'left-top' => t('Top') . ' ' . t('Left'),
- 'center-top' => t('Top') . ' ' . t('Center'),
- 'right-top' => t('Top') . ' ' . t('Right'),
- 'left-center' => t('Center') . ' ' . t('Left'),
- 'center-center' => t('Center'),
- 'right-center' => t('Center') . ' ' . t('Right'),
- 'left-bottom' => t('Bottom') . ' ' . t('Left'),
- 'center-bottom' => t('Bottom') . ' ' . t('Center'),
- 'right-bottom' => t('Bottom') . ' ' . t('Right'),
- ),
- '#theme' => 'image_anchor',
- '#default_value' => $data['anchor'],
- '#description' => t('The part of the image that will be retained during the crop.'),
- );
-
- return $form;
-}
-
-/**
- * Form structure for the image rotate form.
- *
- * Note that this is not a complete form, it only contains the portion of the
- * form for configuring the rotate options. Therefore it does not not need to
- * include metadata about the effect, nor a submit button.
- *
- * @param $data
- * The current configuration for this rotate effect.
- */
-function image_rotate_form($data) {
- $form['degrees'] = array(
- '#type' => 'textfield',
- '#default_value' => (isset($data['degrees'])) ? $data['degrees'] : 0,
- '#title' => t('Rotation angle'),
- '#description' => t('The number of degrees the image should be rotated. Positive numbers are clockwise, negative are counter-clockwise.'),
- '#field_suffix' => '°',
- '#required' => TRUE,
- '#size' => 6,
- '#maxlength' => 4,
- '#element_validate' => array('image_effect_integer_validate'),
- '#allow_negative' => TRUE,
- );
- $form['bgcolor'] = array(
- '#type' => 'textfield',
- '#default_value' => (isset($data['bgcolor'])) ? $data['bgcolor'] : '#FFFFFF',
- '#title' => t('Background color'),
- '#description' => t('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.'),
- '#size' => 7,
- '#maxlength' => 7,
- '#element_validate' => array('image_effect_color_validate'),
- );
- $form['random'] = array(
- '#type' => 'checkbox',
- '#default_value' => (isset($data['random'])) ? $data['random'] : 0,
- '#title' => t('Randomize'),
- '#description' => t('Randomize the rotation angle for each image. The angle specified above is used as a maximum.'),
- );
- return $form;
-}
-
-/**
- * Returns HTML for the page containing the list of image styles.
- *
- * @param $variables
- * An associative array containing:
- * - styles: An array of all the image styles returned by image_get_styles().
- *
- * @see image_get_styles()
- * @ingroup themeable
- */
-function theme_image_style_list($variables) {
- $styles = $variables['styles'];
-
- $header = array(t('Style name'), t('Settings'), array('data' => t('Operations'), 'colspan' => 3));
- $rows = array();
- foreach ($styles as $style) {
- $row = array();
- $row[] = l($style['name'], 'admin/config/media/image-styles/edit/' . $style['name']);
- $link_attributes = array(
- 'attributes' => array(
- 'class' => array('image-style-link'),
- ),
- );
- if ($style['storage'] == IMAGE_STORAGE_NORMAL) {
- $row[] = t('Custom');
- $row[] = l(t('edit'), 'admin/config/media/image-styles/edit/' . $style['name'], $link_attributes);
- $row[] = l(t('delete'), 'admin/config/media/image-styles/delete/' . $style['name'], $link_attributes);
- }
- elseif ($style['storage'] == IMAGE_STORAGE_OVERRIDE) {
- $row[] = t('Overridden');
- $row[] = l(t('edit'), 'admin/config/media/image-styles/edit/' . $style['name'], $link_attributes);
- $row[] = l(t('revert'), 'admin/config/media/image-styles/revert/' . $style['name'], $link_attributes);
- }
- else {
- $row[] = t('Default');
- $row[] = l(t('edit'), 'admin/config/media/image-styles/edit/' . $style['name'], $link_attributes);
- $row[] = '';
- }
- $rows[] = $row;
- }
-
- if (empty($rows)) {
- $rows[] = array(array(
- 'colspan' => 4,
- 'data' => t('There are currently no styles.
Add a new one.', array('!url' => url('admin/config/media/image-styles/add'))),
- ));
- }
-
- return theme('table', array('header' => $header, 'rows' => $rows));
-}
-
-/**
- * Returns HTML for a listing of the effects within a specific image style.
- *
- * @param $variables
- * An associative array containing:
- * - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_image_style_effects($variables) {
- $form = $variables['form'];
-
- $rows = array();
-
- foreach (element_children($form) as $key) {
- if (is_numeric($key)) {
- $form[$key]['weight']['#attributes']['class'] = array('image-effect-order-weight');
- $summary = drupal_render($form[$key]['summary']);
- $row = array();
- $row[] = drupal_render($form[$key]['label']) . (empty($summary) ? '' : ' ' . $summary);
- $row[] = drupal_render($form[$key]['weight']);
- $row[] = drupal_render($form[$key]['configure']);
- $row[] = drupal_render($form[$key]['remove']);
- }
- else {
- // Add the row for adding a new image effect.
- $form['new']['weight']['#attributes']['class'] = array('image-effect-order-weight');
- $row = array();
- $row[] = '
' . drupal_render($form['new']['new']) . drupal_render($form['new']['add']) . '
';
- $row[] = drupal_render($form['new']['weight']);
- $row[] = array('data' => '', 'colspan' => 2);
- }
-
- if (!isset($form[$key]['#access']) || $form[$key]['#access']) {
- $rows[] = array(
- 'data' => $row,
- 'class' => !empty($form[$key]['weight']['#access']) ? array('draggable') : array(),
- );
- }
- }
-
- $header = array(
- t('Effect'),
- t('Weight'),
- array('data' => t('Operations'), 'colspan' => 2),
- );
-
- if (count($rows) == 1 && $form['new']['#access']) {
- array_unshift($rows, array(array(
- 'data' => t('There are currently no effects in this style. Add one by selecting an option below.'),
- 'colspan' => 4,
- )));
- }
-
- $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'image-style-effects')));
- drupal_add_tabledrag('image-style-effects', 'order', 'sibling', 'image-effect-order-weight');
- return $output;
-}
-
-/**
- * Returns HTML for a preview of an image style.
- *
- * @param $variables
- * An associative array containing:
- * - style: The image style array being previewed.
- *
- * @ingroup themeable
- */
-function theme_image_style_preview($variables) {
- $style = $variables['style'];
-
- $sample_image = variable_get('image_style_preview_image', drupal_get_path('module', 'image') . '/sample.png');
- $sample_width = 160;
- $sample_height = 160;
-
- // Set up original file information.
- $original_path = $sample_image;
- $original_image = image_get_info($original_path);
- if ($original_image['width'] > $original_image['height']) {
- $original_width = min($original_image['width'], $sample_width);
- $original_height = round($original_width / $original_image['width'] * $original_image['height']);
- }
- else {
- $original_height = min($original_image['height'], $sample_height);
- $original_width = round($original_height / $original_image['height'] * $original_image['width']);
- }
- $original_attributes = array_intersect_key($original_image, array('width' => '', 'height' => ''));
- $original_attributes['style'] = 'width: ' . $original_width . 'px; height: ' . $original_height . 'px;';
-
- // Set up preview file information.
- $preview_file = image_style_path($style['name'], $original_path);
- if (!file_exists($preview_file)) {
- image_style_create_derivative($style, $original_path, $preview_file);
- }
- $preview_image = image_get_info($preview_file);
- if ($preview_image['width'] > $preview_image['height']) {
- $preview_width = min($preview_image['width'], $sample_width);
- $preview_height = round($preview_width / $preview_image['width'] * $preview_image['height']);
- }
- else {
- $preview_height = min($preview_image['height'], $sample_height);
- $preview_width = round($preview_height / $preview_image['height'] * $preview_image['width']);
- }
- $preview_attributes = array_intersect_key($preview_image, array('width' => '', 'height' => ''));
- $preview_attributes['style'] = 'width: ' . $preview_width . 'px; height: ' . $preview_height . 'px;';
-
- // In the previews, timestamps are added to prevent caching of images.
- $output = '';
- $output .= '
';
-
- // Build the preview of the original image.
- $output .= '
';
- $output .= t('original') . ' (' . l(t('view actual size'), $original_path) . ')';
- $output .= '
'; // End preview-image.
- $output .= '
'; // End preview-image-wrapper.
-
- // Build the preview of the image style.
- $output .= '
';
- $output .= check_plain($style['name']) . ' (' . l(t('view actual size'), file_create_url($preview_file) . '?' . time()) . ')';
- $output .= '
'; // End preview-image.
- $output .= '
'; // End preview-image-wrapper.
-
- $output .= '
'; // End image-style-preview.
-
- return $output;
-}
-
-/**
- * Returns HTML for a 3x3 grid of checkboxes for image anchors.
- *
- * @param $variables
- * An associative array containing:
- * - element: A render element containing radio buttons.
- *
- * @ingroup themeable
- */
-function theme_image_anchor($variables) {
- $element = $variables['element'];
-
- $rows = array();
- $row = array();
- foreach (element_children($element) as $n => $key) {
- $element[$key]['#attributes']['title'] = $element[$key]['#title'];
- unset($element[$key]['#title']);
- $row[] = drupal_render($element[$key]);
- if ($n % 3 == 3 - 1) {
- $rows[] = $row;
- $row = array();
- }
- }
-
- return theme('table', array('header' => array(), 'rows' => $rows, 'attributes' => array('class' => array('image-anchor'))));
-}
-
-/**
- * Returns HTML for a summary of an image resize effect.
- *
- * @param $variables
- * An associative array containing:
- * - data: The current configuration for this resize effect.
- *
- * @ingroup themeable
- */
-function theme_image_resize_summary($variables) {
- $data = $variables['data'];
-
- if ($data['width'] && $data['height']) {
- return check_plain($data['width']) . 'x' . check_plain($data['height']);
- }
- else {
- return ($data['width']) ? t('width @width', array('@width' => $data['width'])) : t('height @height', array('@height' => $data['height']));
- }
-}
-
-/**
- * Returns HTML for a summary of an image scale effect.
- *
- * @param $variables
- * An associative array containing:
- * - data: The current configuration for this scale effect.
- *
- * @ingroup themeable
- */
-function theme_image_scale_summary($variables) {
- $data = $variables['data'];
- return theme('image_resize_summary', array('data' => $data)) . ' ' . ($data['upscale'] ? '(' . t('upscaling allowed') . ')' : '');
-}
-
-/**
- * Returns HTML for a summary of an image crop effect.
- *
- * @param $variables
- * An associative array containing:
- * - data: The current configuration for this crop effect.
- *
- * @ingroup themeable
- */
-function theme_image_crop_summary($variables) {
- return theme('image_resize_summary', $variables);
-}
-
-/**
- * Returns HTML for a summary of an image rotate effect.
- *
- * @param $variables
- * An associative array containing:
- * - data: The current configuration for this rotate effect.
- *
- * @ingroup themeable
- */
-function theme_image_rotate_summary($variables) {
- $data = $variables['data'];
- return ($data['random']) ? t('random between -@degrees° and @degrees°', array('@degrees' => str_replace('-', '', $data['degrees']))) : t('@degrees°', array('@degrees' => $data['degrees']));
-}
diff --git a/modules/image/image.api.php b/modules/image/image.api.php
deleted file mode 100644
index 6f1ff37acfd124fc0cb2efc8242264598133f9d5..0000000000000000000000000000000000000000
--- a/modules/image/image.api.php
+++ /dev/null
@@ -1,178 +0,0 @@
- t('Resize'),
- 'help' => t('Resize an image to an exact set of dimensions, ignoring aspect ratio.'),
- 'effect callback' => 'mymodule_resize_image',
- 'form callback' => 'mymodule_resize_form',
- 'summary theme' => 'mymodule_resize_summary',
- );
-
- return $effects;
-}
-
-/**
- * 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(
- '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 3f4cc5cd34b748fe54a22559ac26b70278608ac5..0000000000000000000000000000000000000000
--- a/modules/image/image.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $Id$ */
-
-/**
- * Image upload widget.
- */
-div.image-preview {
- float: left; /* RTL */
- padding: 0 10px 10px 0; /* RTL */
-}
-div.image-widget-data {
- float: left; /* RTL */
-}
-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 5171be1d0a6b189d7913ae2c0f95a281441ec5fd..0000000000000000000000000000000000000000
--- a/modules/image/image.effects.inc
+++ /dev/null
@@ -1,244 +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',
- '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',
- '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',
- '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',
- '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',
- ),
- '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',
- '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['height'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
- return FALSE;
- }
- return TRUE;
-}
-
-/**
- * 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 upscalled 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(
- 'upscale' => FALSE,
- );
-
- // Set impossibly large values if the width and height aren't set.
- $data['width'] = empty($data['width']) ? PHP_INT_MAX : $data['width'];
- $data['height'] = empty($data['height']) ? PHP_INT_MAX : $data['height'];
-
- 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['height'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
- return FALSE;
- }
- return TRUE;
-}
-
-/**
- * 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['height'] . '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['height'] . '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['height'] . '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['height'] . 'x' . $image->info['height']), WATCHDOG_ERROR);
- return FALSE;
- }
- return TRUE;
-}
diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc
deleted file mode 100644
index ea895d7ec6b050bbb282dbe13ea285020796e16f..0000000000000000000000000000000000000000
--- a/modules/image/image.field.inc
+++ /dev/null
@@ -1,579 +0,0 @@
- array(
- 'label' => t('Image'),
- 'description' => t('This field stores the ID of an image file as an integer value.'),
- 'settings' => array(
- 'uri_scheme' => 'public',
- 'default_image' => 0,
- ),
- 'instance_settings' => array(
- 'file_extensions' => 'png gif jpg jpeg',
- 'file_directory' => '',
- 'max_filesize' => '',
- 'alt_field' => 0,
- 'title_field' => 0,
- 'max_resolution' => '',
- 'min_resolution' => '',
- ),
- 'default_widget' => 'image_image',
- 'default_formatter' => 'image',
- ),
- );
-}
-
-/**
- * Implements hook_field_schema().
- */
-function image_field_schema($field) {
- return array(
- 'columns' => array(
- 'fid' => array(
- 'description' => 'The {files}.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' => 128,
- 'not null' => FALSE,
- ),
- 'title' => array(
- 'description' => "Image title text, for the image's 'title' attribute.",
- 'type' => 'varchar',
- 'length' => 128,
- 'not null' => FALSE,
- ),
- ),
- 'indexes' => array(
- 'fid' => array('fid'),
- ),
- );
-}
-
-/**
- * Implements hook_field_settings_form().
- */
-function image_field_settings_form($field, $instance) {
- $defaults = field_info_field_settings($field['type']);
- $settings = array_merge($defaults, $field['settings']);
-
- $scheme_options = array();
- foreach (file_get_stream_wrappers(STREAM_WRAPPERS_WRITE_VISIBLE) as $scheme => $stream_wrapper) {
- $scheme_options[$scheme] = $stream_wrapper['name'];
- }
- $form['uri_scheme'] = array(
- '#type' => 'radios',
- '#title' => t('Upload destination'),
- '#options' => $scheme_options,
- '#default_value' => $settings['uri_scheme'],
- '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
- );
-
- $form['default_image'] = array(
- '#title' => t('Default image'),
- '#type' => 'managed_file',
- '#description' => t('If no image is uploaded, this image will be shown on display.'),
- '#default_value' => $field['settings']['default_image'],
- '#upload_location' => 'public://default_images/',
- );
-
- return $form;
-
-}
-
-/**
- * Implements hook_field_instance_settings_form().
- */
-function image_field_instance_settings_form($field, $instance) {
- $settings = $instance['settings'];
-
- // Use the file field instance settings form as a basis.
- $form = file_field_instance_settings_form($field, $instance);
-
- // Add maximum and minimum resolution settings.
- $max_resolution = explode('x', $settings['max_resolution']) + array('', '');
- $form['max_resolution'] = array(
- '#title' => t('Maximum image resolution'),
- '#element_validate' => array('_image_field_resolution_validate'),
- '#theme_wrappers' => array('form_element'),
- '#weight' => 4.1,
- '#description' => t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of
EXIF data in the image.'),
- );
- $form['max_resolution']['x'] = array(
- '#type' => 'textfield',
- '#default_value' => $max_resolution[0],
- '#size' => 5,
- '#maxlength' => 5,
- '#field_suffix' => ' x ',
- '#theme_wrappers' => array(),
- );
- $form['max_resolution']['y'] = array(
- '#type' => 'textfield',
- '#default_value' => $max_resolution[1],
- '#size' => 5,
- '#maxlength' => 5,
- '#field_suffix' => ' ' . t('pixels'),
- '#theme_wrappers' => array(),
- );
-
- $min_resolution = explode('x', $settings['min_resolution']) + array('', '');
- $form['min_resolution'] = array(
- '#title' => t('Minimum image resolution'),
- '#element_validate' => array('_image_field_resolution_validate'),
- '#theme_wrappers' => array('form_element'),
- '#weight' => 4.2,
- '#description' => t('The minimum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
- );
- $form['min_resolution']['x'] = array(
- '#type' => 'textfield',
- '#default_value' => $min_resolution[0],
- '#size' => 5,
- '#maxlength' => 5,
- '#field_suffix' => ' x ',
- '#theme_wrappers' => array(),
- );
- $form['min_resolution']['y'] = array(
- '#type' => 'textfield',
- '#default_value' => $min_resolution[1],
- '#size' => 5,
- '#maxlength' => 5,
- '#field_suffix' => ' ' . t('pixels'),
- '#theme_wrappers' => array(),
- );
-
- // Remove the description option.
- unset($form['description_field']);
-
- // Add title and alt configuration options.
- $form['alt_field'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable
Alt field'),
- '#default_value' => $settings['alt_field'],
- '#description' => t('The alt attribute may be used by search engines, screen readers, and when the image cannot be loaded.'),
- '#weight' => 10,
- );
- $form['title_field'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable
Title field'),
- '#default_value' => $settings['title_field'],
- '#description' => t('The title attribute is used as a tooltip when the mouse hovers over the image.'),
- '#weight' => 11,
- );
-
- return $form;
-}
-
-/**
- * Element validate function for resolution fields.
- */
-function _image_field_resolution_validate($element, &$form_state) {
- if (!empty($element['x']['#value']) || !empty($element['y']['#value'])) {
- foreach (array('x', 'y') as $dimension) {
- $value = $element[$dimension]['#value'];
- if (!is_numeric($value)) {
- form_error($element[$dimension], t('Height and width values must be numeric.'));
- return;
- }
- if (intval($value) == 0) {
- form_error($element[$dimension], t('Both a height and width value must be specified in the !name field.', array('!name' => $element['#title'])));
- return;
- }
- }
- form_set_value($element, intval($element['x']['#value']) . 'x' . intval($element['y']['#value']), $form_state);
- }
- else {
- form_set_value($element, '', $form_state);
- }
-}
-
-/**
- * Implements hook_field_load().
- */
-function image_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
- file_field_load($entity_type, $entities, $field, $instances, $langcode, $items, $age);
-}
-
-/**
- * Implements hook_field_prepare_view().
- */
-function image_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items) {
- // If there are no files specified at all, use the default.
- foreach ($entities as $id => $entity) {
- if (empty($items[$id]) && $field['settings']['default_image']) {
- if ($file = file_load($field['settings']['default_image'])) {
- $items[$id][0] = (array) $file + array(
- 'is_default' => TRUE,
- 'alt' => '',
- 'title' => '',
- );
- }
- }
- }
-}
-
-/**
- * Implements hook_field_presave().
- */
-function image_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
- file_field_presave($entity_type, $entity, $field, $instance, $langcode, $items);
-}
-
-/**
- * Implements hook_field_insert().
- */
-function image_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) {
- file_field_insert($entity_type, $entity, $field, $instance, $langcode, $items);
-}
-
-/**
- * Implements hook_field_update().
- */
-function image_field_update($entity_type, $entity, $field, $instance, $langcode, &$items) {
- file_field_update($entity_type, $entity, $field, $instance, $langcode, $items);
-}
-
-/**
- * Implements hook_field_delete().
- */
-function image_field_delete($entity_type, $entity, $field, $instance, $langcode, &$items) {
- file_field_delete($entity_type, $entity, $field, $instance, $langcode, $items);
-}
-
-/**
- * Implements hook_field_delete_revision().
- */
-function image_field_delete_revision($entity_type, $entity, $field, $instance, $langcode, &$items) {
- file_field_delete_revision($entity_type, $entity, $field, $instance, $langcode, $items);
-}
-
-/**
- * Implements hook_field_is_empty().
- */
-function image_field_is_empty($item, $field) {
- return file_field_is_empty($item, $field);
-}
-
-/**
- * Implements hook_field_widget_info().
- */
-function image_field_widget_info() {
- return array(
- 'image_image' => array(
- 'label' => t('Image'),
- 'field types' => array('image'),
- 'settings' => array(
- 'progress_indicator' => 'throbber',
- 'preview_image_style' => 'thumbnail',
- ),
- 'behaviors' => array(
- 'multiple values' => FIELD_BEHAVIOR_CUSTOM,
- 'default value' => FIELD_BEHAVIOR_NONE,
- ),
- ),
- );
-}
-
-/**
- * Implements hook_field_widget_settings_form().
- */
-function image_field_widget_settings_form($field, $instance) {
- $widget = $instance['widget'];
- $settings = $widget['settings'];
-
- // Use the file widget settings form.
- $form = file_field_widget_settings_form($field, $instance);
-
- $form['preview_image_style'] = array(
- '#title' => t('Preview image style'),
- '#type' => 'select',
- '#options' => array('' => '<' . t('no preview') . '>') + image_style_options(FALSE),
- '#default_value' => $settings['preview_image_style'],
- '#description' => t('The preview image will be shown while editing the content.'),
- '#weight' => 15,
- );
-
- return $form;
-}
-
-/**
- * Implements hook_field_widget_form().
- */
-function image_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
-
- // Add display_field setting to field because file_field_widget_form() assumes it is set.
- $field['settings']['display_field'] = 0;
-
- $elements = file_field_widget_form($form, $form_state, $field, $instance, $langcode, $items, $delta, $element);
- $settings = $instance['settings'];
-
- foreach (element_children($elements) as $delta) {
- // Add upload resolution validation.
- if ($settings['max_resolution'] || $settings['min_resolution']) {
- $elements[$delta]['#upload_validators']['file_validate_image_resolution'] = array($settings['max_resolution'], $settings['min_resolution']);
- }
-
- // If not using custom extension validation, ensure this is an image.
- $supported_extensions = array('png', 'gif', 'jpg', 'jpeg');
- $extensions = isset($elements[$delta]['#upload_validators']['file_validate_extensions'][0]) ? $elements[$delta]['#upload_validators']['file_validate_extensions'][0] : implode(' ', $supported_extensions);
- $extensions = array_intersect(explode(' ', $extensions), $supported_extensions);
- $elements[$delta]['#upload_validators']['file_validate_extensions'][0] = implode(' ', $extensions);
-
- // Add all extra functionality provided by the image widget.
- $elements[$delta]['#process'][] = 'image_field_widget_process';
- }
-
- if ($field['cardinality'] == 1) {
- // If there's only one field, return it as delta 0.
- if (empty($elements[0]['#default_value']['fid'])) {
- $elements[0]['#description'] = theme('file_upload_help', array('description' => $instance['description'], 'upload_validators' => $elements[0]['#upload_validators']));
- }
- }
- else {
- $elements['#file_upload_description'] = theme('file_upload_help', array('upload_validators' => $elements[0]['#upload_validators']));
- }
- return $elements;
-}
-
-/**
- * An element #process callback for the image_image field type.
- *
- * Expands the image_image type to include the alt and title fields.
- */
-function image_field_widget_process($element, &$form_state, $form) {
- $item = $element['#value'];
- $item['fid'] = $element['fid']['#value'];
-
- $instance = $form_state['field'][$element['#field_name']][$element['#language']]['instance'];
-
- $settings = $instance['settings'];
- $widget_settings = $instance['widget']['settings'];
-
- $element['#theme'] = 'image_widget';
- $element['#attached']['css'][] = drupal_get_path('module', 'image') . '/image.css';
-
- // Add the image preview.
- if ($element['#file'] && $widget_settings['preview_image_style']) {
- $element['preview'] = array(
- '#type' => 'markup',
- '#markup' => theme('image_style', array('style_name' => $widget_settings['preview_image_style'], 'path' => $element['#file']->uri, 'getsize' => FALSE)),
- );
- }
-
- // Add the additional alt and title fields.
- $element['alt'] = array(
- '#title' => t('Alternate text'),
- '#type' => 'textfield',
- '#default_value' => isset($item['alt']) ? $item['alt'] : '',
- '#description' => t('This text will be used by screen readers, search engines, or when the image cannot be loaded.'),
- '#maxlength' => variable_get('image_alt_length', 80), // See http://www.gawds.org/show.php?contentid=28.
- '#weight' => -2,
- '#access' => (bool) $item['fid'] && $settings['alt_field'],
- );
- $element['title'] = array(
- '#type' => 'textfield',
- '#title' => t('Title'),
- '#default_value' => isset($item['title']) ? $item['title'] : '',
- '#description' => t('The title is used as a tool tip when the user hovers the mouse over the image.'),
- '#maxlength' => variable_get('image_title_length', 500),
- '#weight' => -1,
- '#access' => (bool) $item['fid'] && $settings['title_field'],
- );
-
- return $element;
-}
-
-/**
- * Returns HTML for an image field widget.
- *
- * @param $variables
- * An associative array containing:
- * - element: A render element representing the image field widget.
- *
- * @ingroup themeable
- */
-function theme_image_widget($variables) {
- $element = $variables['element'];
- $output = '';
- $output .= '
';
-
- return $output;
-}
-
-/**
- * Implements hook_field_formatter_info().
- */
-function image_field_formatter_info() {
- $formatters = array(
- 'image' => array(
- 'label' => t('Image'),
- 'field types' => array('image'),
- 'settings' => array('image_style' => '', 'image_link' => ''),
- ),
- );
-
- return $formatters;
-}
-
-/**
- * Implements hook_field_formatter_settings_form().
- */
-function image_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
- $display = $instance['display'][$view_mode];
- $settings = $display['settings'];
-
- $image_styles = array('' => t('None (original image)')) + image_style_options(FALSE);
- $form['image_style'] = array(
- '#title' => t('Image style'),
- '#type' => 'select',
- '#default_value' => $settings['image_style'],
- '#options' => $image_styles,
- );
-
- $link_types = array(
- '' => t('
'),
- 'content' => t('Content'),
- 'file' => t('File'),
- );
- $form['image_link'] = array(
- '#title' => t('Link image to'),
- '#type' => 'select',
- '#default_value' => $settings['image_link'],
- '#options' => $link_types,
- );
-
- return $form;
-}
-
-/**
- * Implements hook_field_formatter_settings_summary().
- */
-function image_field_formatter_settings_summary($field, $instance, $view_mode) {
- $display = $instance['display'][$view_mode];
- $settings = $display['settings'];
-
- $summary = array();
-
- $image_styles = image_style_options(FALSE);
- // Unset possible 'No defined styles' option.
- unset($image_styles['']);
- // Styles could be lost because of enabled/disabled modules that defines
- // their styles in code.
- if (isset($image_styles[$settings['image_style']])) {
- $summary[] = t('Image style: @style', array('@style' => $image_styles[$settings['image_style']]));
- }
- else {
- $summary[] = t('Original image');
- }
-
- $link_types = array(
- 'content' => t('Linked to content'),
- 'file' => t('Linked to file'),
- );
- // Display this setting only if image is linked.
- if (isset($link_types[$settings['image_link']])) {
- $summary[] = $link_types[$settings['image_link']];
- }
-
- return implode('
', $summary);
-}
-
-/**
- * Implements hook_field_formatter_view().
- */
-function image_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
- $element = array();
-
- // Check if the formatter involves a link.
- if ($display['settings']['image_link'] == 'content') {
- $uri = entity_uri($entity_type, $entity);
- }
- elseif ($display['settings']['image_link'] == 'file') {
- $link_file = TRUE;
- }
-
- foreach ($items as $delta => $item) {
- if (isset($link_file)) {
- $uri = array(
- 'path' => file_create_url($item['uri']),
- 'options' => array(),
- );
- }
- $element[$delta] = array(
- '#theme' => 'image_formatter',
- '#item' => $item,
- '#image_style' => $display['settings']['image_style'],
- '#path' => isset($uri) ? $uri : '',
- );
- }
-
- return $element;
-}
-
-/**
- * Returns HTML for an image field formatter.
- *
- * @param $variables
- * An associative array containing:
- * - item: An array of image data.
- * - image_style: An optional image style.
- * - path: An array containing the link 'path' and link 'options'.
- *
- * @ingroup themeable
- */
-function theme_image_formatter($variables) {
- $item = $variables['item'];
- $image = array(
- 'path' => $item['uri'],
- 'alt' => $item['alt'],
- );
- // Do not output an empty 'title' attribute.
- if (drupal_strlen($item['title']) > 0) {
- $image['title'] = $item['title'];
- }
-
- if ($variables['image_style']) {
- $image['style_name'] = $variables['image_style'];
- $output = theme('image_style', $image);
- }
- else {
- $output = theme('image', $image);
- }
-
- if ($variables['path']) {
- $path = $variables['path']['path'];
- $options = $variables['path']['options'];
- // When displaying an image inside a link, the html option must be TRUE.
- $options['html'] = TRUE;
- $output = l($output, $path, $options);
- }
-
- return $output;
-}
diff --git a/modules/image/image.info b/modules/image/image.info
deleted file mode 100644
index 137acc24873a5a857905fb432949c894cbf2a2a7..0000000000000000000000000000000000000000
--- a/modules/image/image.info
+++ /dev/null
@@ -1,14 +0,0 @@
-; $Id$
-name = Image
-description = Provides image manipulation tools.
-package = Core
-version = VERSION
-core = 7.x
-dependencies[] = file
-files[] = image.module
-files[] = image.admin.inc
-files[] = image.effects.inc
-files[] = image.field.inc
-files[] = image.install
-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 c7ae8c57a1c0cac3ba6e38a25ccba68a09ff1927..0000000000000000000000000000000000000000
--- a/modules/image/image.install
+++ /dev/null
@@ -1,235 +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 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'),
- ),
- ),
- );
-
- return $schema;
-}
-
-/**
- * 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_effect', $schema['image_effects']);
- }
-}
-
-/**
- * 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_ERROR;
- $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/image.module b/modules/image/image.module
deleted file mode 100644
index 739713e3aee098125b34acb5b66d6f76213a476a..0000000000000000000000000000000000000000
--- a/modules/image/image.module
+++ /dev/null
@@ -1,1147 +0,0 @@
-' . t('About') . '';
- $output .= '' . t('The Image module allows you to manipulate images on your website. It exposes a setting for using the Image toolkit, allows you to configure Image styles that can be used for resizing or adjusting images on display, and provides an Image field for attaching images to content. For more information, see the online handbook entry for Image module.', array('@image' => 'http://drupal.org/handbook/modules/image')) . '
';
- $output .= '' . t('Uses') . '
';
- $output .= '';
- $output .= '- ' . t('Manipulating images') . '
';
- $output .= '- ' . t('With the Image module you can scale, crop, resize, rotate and desaturate images without affecting the original image using image styles. When you change an image style, the module automatically refreshes all created images. Every image style must have a name, which will be used in the URL of the generated images. There are two common approaches to naming image styles (which you use will depend on how the image style is being applied):',array('@image' => url('admin/config/media/image-styles')));
- $output .= '
- ' . t('Based on where it will be used: eg. profile-picture') . '
';
- $output .= '- ' . t('Describing its appearance: eg. square-85x85') . '
';
- $output .= t('After you create an image style, you can add effects: crop, scale, resize, rotate, desaturate, and rotate (other contributed modules provide additional effects). For example, by combining effects as crop, scale, and desaturate, you can create square, grayscale thumbnails.') . '- ';
- $output .= '
- ' . t('Attaching images to content as fields') . '
';
- $output .= '- ' . t("Image module also allows you to attach images to content as fields. To add an image field to a content type, go to the content type's manage fields page, and add a new field of type Image. Attaching images to content this way allows image styles to be applied and maintained, and also allows you more flexibility when theming.", array('@content-type' => url('admin/structure/types'))) . '
';
- $output .= '
';
- return $output;
- case 'admin/config/media/image-styles':
- return '' . t('Image styles commonly provide thumbnail sizes by scaling and cropping images, but can also add various effects before an image is displayed. When an image is displayed with a style, a new file is created and the original image is left unchanged.') . '
';
- case 'admin/config/media/image-styles/edit/%/add/%':
- $effect = image_effect_definition_load($arg[7]);
- return isset($effect['help']) ? ('' . $effect['help'] . '
') : NULL;
- case 'admin/config/media/image-styles/edit/%/effects/%':
- $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[6], $arg[4]);
- return isset($effect['help']) ? ('' . $effect['help'] . '
') : NULL;
- }
-}
-
-/**
- * Implements hook_menu().
- */
-function image_menu() {
- $items = array();
-
- // Generate image derivatives of publicly available files.
- // If clean URLs are disabled, image derivatives will always be served
- // through the menu system.
- // If clean URLs are enabled and the image derivative already exists,
- // PHP will be bypassed.
- $items[file_directory_path('public') . '/styles/%image_style'] = array(
- 'title' => 'Generate image style',
- 'page callback' => 'image_style_deliver',
- 'page arguments' => array(count(explode('/', file_directory_path())) + 1),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
- );
- // Generate and deliver image derivatives of private files.
- // These image derivatives are always delivered through the menu system.
- $items['system/files/styles/%image_style'] = array(
- 'title' => 'Generate image style',
- 'page callback' => 'image_style_deliver',
- 'page arguments' => array(3),
- 'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
- );
- $items['admin/config/media/image-styles'] = array(
- 'title' => 'Image styles',
- 'description' => 'Configure styles that can be used for resizing or adjusting images on display.',
- 'page callback' => 'image_style_list',
- 'access arguments' => array('administer image styles'),
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/list'] = array(
- 'title' => 'List',
- 'description' => 'List the current image styles on the site.',
- 'page callback' => 'image_style_list',
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'weight' => 1,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/add'] = array(
- 'title' => 'Add style',
- 'description' => 'Add a new image style.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_style_add_form'),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_LOCAL_ACTION,
- 'weight' => 2,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/edit/%image_style'] = array(
- 'title' => 'Edit style',
- 'description' => 'Configure an image style.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_style_form', 5),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_CALLBACK,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/delete/%image_style'] = array(
- 'title' => 'Delete style',
- 'description' => 'Delete an image style.',
- 'load arguments' => array(NULL, (string) IMAGE_STORAGE_NORMAL),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_style_delete_form', 5),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_CALLBACK,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/revert/%image_style'] = array(
- 'title' => 'Revert style',
- 'description' => 'Revert an image style.',
- 'load arguments' => array(NULL, (string) IMAGE_STORAGE_OVERRIDE),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_style_revert_form', 5),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_CALLBACK,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect'] = array(
- 'title' => 'Edit image effect',
- 'description' => 'Edit an existing effect within a style.',
- 'load arguments' => array(5, (string) IMAGE_STORAGE_EDITABLE),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_effect_form', 5, 7),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_CALLBACK,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect/delete'] = array(
- 'title' => 'Delete image effect',
- 'description' => 'Delete an existing effect from a style.',
- 'load arguments' => array(5, (string) IMAGE_STORAGE_EDITABLE),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_effect_delete_form', 5, 7),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_CALLBACK,
- 'file' => 'image.admin.inc',
- );
- $items['admin/config/media/image-styles/edit/%image_style/add/%image_effect_definition'] = array(
- 'title' => 'Add image effect',
- 'description' => 'Add a new effect to a style.',
- 'load arguments' => array(5),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('image_effect_form', 5, 7),
- 'access arguments' => array('administer image styles'),
- 'type' => MENU_CALLBACK,
- 'file' => 'image.admin.inc',
- );
-
- return $items;
-}
-
-/**
- * Implements hook_theme().
- */
-function image_theme() {
- return array(
- // Theme functions in image.module.
- 'image_style' => array(
- 'variables' => array(
- 'style_name' => NULL,
- 'path' => NULL,
- 'alt' => '',
- 'title' => NULL,
- 'attributes' => array(),
- 'getsize' => TRUE,
- ),
- ),
-
- // Theme functions in image.admin.inc.
- 'image_style_list' => array(
- 'variables' => array('styles' => NULL),
- ),
- 'image_style_effects' => array(
- 'render element' => 'form',
- ),
- 'image_style_preview' => array(
- 'variables' => array('style' => NULL),
- ),
- 'image_anchor' => array(
- 'render element' => 'element',
- ),
- 'image_resize_summary' => array(
- 'variables' => array('data' => NULL),
- ),
- 'image_scale_summary' => array(
- 'variables' => array('data' => NULL),
- ),
- 'image_crop_summary' => array(
- 'variables' => array('data' => NULL),
- ),
- 'image_rotate_summary' => array(
- 'variables' => array('data' => NULL),
- ),
-
- // Theme functions in image.field.inc.
- 'image_widget' => array(
- 'render element' => 'element',
- ),
- 'image_formatter' => array(
- 'variables' => array('item' => NULL, 'path' => NULL, 'image_style' => NULL),
- ),
- );
-}
-
-/**
- * Implements hook_permission().
- */
-function image_permission() {
- return array(
- 'administer image styles' => array(
- 'title' => t('Administer image styles'),
- 'description' => t('Create and modify styles for generating image modifications such as thumbnails.'),
- ),
- );
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function image_form_system_file_system_settings_alter(&$form, &$form_state) {
- $form['#submit'][] = 'image_system_file_system_settings_submit';
-}
-
-/**
- * Submit handler for the file system settings form.
- *
- * Adds a menu rebuild after the public file path has been changed, so that the
- * menu router item depending on that file path will be regenerated.
- */
-function image_system_file_system_settings_submit($form, &$form_state) {
- if ($form['file_public_path']['#default_value'] !== $form_state['values']['file_public_path']) {
- variable_set('menu_rebuild_needed', TRUE);
- }
-}
-
-/**
- * Implements hook_flush_caches().
- */
-function image_flush_caches() {
- return array('cache_image');
-}
-
-/**
- * Implements hook_file_download().
- *
- * Control the access to files underneath the styles directory.
- */
-function image_file_download($uri) {
- $path = file_uri_target($uri);
-
- // Private file access for image style derivatives.
- if (strpos($path, 'styles/') === 0) {
- $args = explode('/', $path);
- // Discard the first part of the path (styles).
- array_shift($args);
- // Get the style name from the second part.
- $style_name = array_shift($args);
- // Then the remaining parts are the path to the image.
- $original_uri = file_uri_scheme($uri) . '://' . implode('/', $args);
-
- // Check that the file exists and is an image.
- if ($info = image_get_info($uri)) {
- // Check the permissions of the original to grant access to this image.
- $headers = module_invoke_all('file_download', $original_uri);
- if (!in_array(-1, $headers)) {
- return array(
- // Send headers describing the image's size, and MIME-type...
- 'Content-Type' => $info['mime_type'],
- 'Content-Length' => $info['file_size'],
- // ...and allow the file to be cached for two weeks (matching the
- // value we/ use for the mod_expires settings in .htaccess) and
- // ensure that caching proxies do not share the image with other
- // users.
- 'Expires' => gmdate(DATE_RFC1123, REQUEST_TIME + 1209600),
- 'Cache-Control' => 'max-age=1209600, private, must-revalidate',
- );
- }
- }
- return -1;
- }
-
- // Private file access for the original files. Note that we only
- // check access for non-temporary images, since file.module will
- // grant access for all temporary files.
- $files = file_load_multiple(array(), array('uri' => $uri));
- if (count($files)) {
- $file = reset($files);
- if ($file->status) {
- return file_file_download($uri, 'image');
- }
- }
-}
-
-/**
- * Implements hook_file_move().
- */
-function image_file_move($file, $source) {
- // Delete any image derivatives at the original image path.
- image_path_flush($file->uri);
-}
-
-/**
- * Implements hook_file_delete().
- */
-function image_file_delete($file) {
- // Delete any image derivatives of this image.
- image_path_flush($file->uri);
-}
-
-/**
- * Implements hook_image_default_styles().
- */
-function image_image_default_styles() {
- $styles = array();
-
- $styles['thumbnail'] = array(
- 'effects' => array(
- array(
- 'name' => 'image_scale',
- 'data' => array('width' => 100, 'height' => 100, 'upscale' => 1),
- 'weight' => 0,
- ),
- )
- );
-
- $styles['medium'] = array(
- 'effects' => array(
- array(
- 'name' => 'image_scale',
- 'data' => array('width' => 220, 'height' => 220, 'upscale' => 1),
- 'weight' => 0,
- ),
- )
- );
-
- $styles['large'] = array(
- 'effects' => array(
- array(
- 'name' => 'image_scale',
- 'data' => array('width' => 480, 'height' => 480, 'upscale' => 0),
- 'weight' => 0,
- ),
- )
- );
-
- return $styles;
-}
-
-/**
- * Implements hook_image_style_save().
- */
-function image_image_style_save($style) {
- if (isset($style['old_name']) && $style['old_name'] != $style['name']) {
- $instances = field_read_instances();
- // Loop through all fields searching for image fields.
- foreach ($instances as $instance) {
- if ($instance['widget']['module'] == 'image') {
- $instance_changed = FALSE;
- foreach ($instance['display'] as $view_mode => $display) {
- // Check if the formatter involves an image style.
- if ($display['type'] == 'image' && $display['settings']['image_style'] == $style['old_name']) {
- // Update display information for any instance using the image
- // style that was just deleted.
- $instance['display'][$view_mode]['settings']['image_style'] = $style['name'];
- $instance_changed = TRUE;
- }
- }
- if ($instance['widget']['settings']['preview_image_style'] == $style['old_name']) {
- $instance['widget']['settings']['preview_image_style'] = $style['name'];
- $instance_changed = TRUE;
- }
- if ($instance_changed) {
- field_update_instance($instance);
- }
- }
- }
- }
-}
-
-/**
- * Implements hook_image_style_delete().
- */
-function image_image_style_delete($style) {
- image_image_style_save($style);
-}
-
-/**
- * Clear cached versions of a specific file in all styles.
- *
- * @param $path
- * The Drupal file path to the original image.
- */
-function image_path_flush($path) {
- $styles = image_styles();
- foreach ($styles as $style) {
- $image_path = image_style_path($style['name'], $path);
- if (file_exists($image_path)) {
- file_unmanaged_delete($image_path);
- }
- }
-}
-
-/**
- * Get an array of all styles and their settings.
- *
- * @return
- * An array of styles keyed by the image style ID (isid).
- * @see image_style_load()
- */
-function image_styles() {
- $styles = &drupal_static(__FUNCTION__);
-
- // Grab from cache or build the array.
- if (!isset($styles)) {
- if ($cache = cache_get('image_styles', 'cache')) {
- $styles = $cache->data;
- }
- else {
- $styles = array();
-
- // Select the module-defined styles.
- foreach (module_implements('image_default_styles') as $module) {
- $module_styles = module_invoke($module, 'image_default_styles');
- foreach ($module_styles as $style_name => $style) {
- $style['name'] = $style_name;
- $style['module'] = $module;
- $style['storage'] = IMAGE_STORAGE_DEFAULT;
- foreach ($style['effects'] as $key => $effect) {
- $definition = image_effect_definition_load($effect['name']);
- $effect = array_merge($definition, $effect);
- $style['effects'][$key] = $effect;
- }
- $styles[$style_name] = $style;
- }
- }
-
- // Select all the user-defined styles.
- $user_styles = db_select('image_styles', NULL, array('fetch' => PDO::FETCH_ASSOC))
- ->fields('image_styles')
- ->orderBy('name')
- ->execute()
- ->fetchAllAssoc('name', PDO::FETCH_ASSOC);
-
- // Allow the user styles to override the module styles.
- foreach ($user_styles as $style_name => $style) {
- $style['module'] = NULL;
- $style['storage'] = IMAGE_STORAGE_NORMAL;
- $style['effects'] = image_style_effects($style);
- if (isset($styles[$style_name]['module'])) {
- $style['module'] = $styles[$style_name]['module'];
- $style['storage'] = IMAGE_STORAGE_OVERRIDE;
- }
- $styles[$style_name] = $style;
- }
-
- drupal_alter('image_styles', $styles);
- cache_set('image_styles', $styles);
- }
- }
-
- return $styles;
-}
-
-/**
- * Load a style by style name or ID. May be used as a loader for menu items.
- *
- * @param $name
- * The name of the style.
- * @param $isid
- * Optional. The numeric id of a style if the name is not known.
- * @param $include
- * If set, this loader will restrict to a specific type of image style, may be
- * one of the defined Image style storage constants.
- * @return
- * An image style array containing the following keys:
- * - "isid": The unique image style ID.
- * - "name": The unique image style name.
- * - "effects": An array of image effects within this image style.
- * If the image style name or ID is not valid, an empty array is returned.
- * @see image_effect_load()
- */
-function image_style_load($name = NULL, $isid = NULL, $include = NULL) {
- $styles = image_styles();
-
- // If retrieving by name.
- if (isset($name) && isset($styles[$name])) {
- $style = $styles[$name];
- }
-
- // If retrieving by image style id.
- if (!isset($name) && isset($isid)) {
- foreach ($styles as $name => $database_style) {
- if (isset($database_style['isid']) && $database_style['isid'] == $isid) {
- $style = $database_style;
- break;
- }
- }
- }
-
- // Restrict to the specific type of flag. This bitwise operation basically
- // states "if the storage is X, then allow".
- if (isset($style) && (!isset($include) || ($style['storage'] & (int) $include))) {
- return $style;
- }
-
- // Otherwise the style was not found.
- return FALSE;
-}
-
-/**
- * Save an image style.
- *
- * @param style
- * An image style array.
- * @return
- * An image style array. In the case of a new style, 'isid' will be populated.
- */
-function image_style_save($style) {
- if (isset($style['isid']) && is_numeric($style['isid'])) {
- // Load the existing style to make sure we account for renamed styles.
- $old_style = image_style_load(NULL, $style['isid']);
- image_style_flush($old_style);
- drupal_write_record('image_styles', $style, 'isid');
- if ($old_style['name'] != $style['name']) {
- $style['old_name'] = $old_style['name'];
- }
- }
- else {
- drupal_write_record('image_styles', $style);
- $style['is_new'] = TRUE;
- }
-
- // Let other modules update as necessary on save.
- module_invoke_all('image_style_save', $style);
-
- // Clear all caches and flush.
- image_style_flush($style);
-
- return $style;
-}
-
-/**
- * Delete an image style.
- *
- * @param $style
- * An image style array.
- * @param $replacement_style_name
- * (optional) When deleting a style, specify a replacement style name so
- * that existing settings (if any) may be converted to a new style.
- * @return
- * TRUE on success.
- */
-function image_style_delete($style, $replacement_style_name = '') {
- image_style_flush($style);
-
- db_delete('image_effects')->condition('isid', $style['isid'])->execute();
- db_delete('image_styles')->condition('isid', $style['isid'])->execute();
-
- // Let other modules update as necessary on save.
- $style['old_name'] = $style['name'];
- $style['name'] = $replacement_style_name;
- module_invoke_all('image_style_delete', $style);
-
- return TRUE;
-}
-
-/**
- * Load all the effects for an image style.
- *
- * @param $style
- * An image style array.
- * @return
- * An array of image effects associated with specified image style in the
- * format array('isid' => array()), or an empty array if the specified style
- * has no effects.
- */
-function image_style_effects($style) {
- $effects = image_effects();
- $style_effects = array();
- foreach ($effects as $effect) {
- if ($style['isid'] == $effect['isid']) {
- $style_effects[$effect['ieid']] = $effect;
- }
- }
-
- return $style_effects;
-}
-
-/**
- * Get an array of image styles suitable for using as select list options.
- *
- * @param $include_empty
- * If TRUE a option will be inserted in the options array.
- * @return
- * Array of image styles both key and value are set to style name.
- */
-function image_style_options($include_empty = TRUE) {
- $styles = image_styles();
- $options = array();
- if ($include_empty && !empty($styles)) {
- $options[''] = t('');
- }
- $options = array_merge($options, drupal_map_assoc(array_keys($styles)));
- if (empty($options)) {
- $options[''] = t('No defined styles');
- }
- return $options;
-}
-
-/**
- * Menu callback; Given a style and image path, generate a derivative.
- *
- * After generating an image, transfer it to the requesting agent.
- *
- * @param $style
- * The image style
- */
-function image_style_deliver($style, $scheme) {
- // Check that the style is defined and the scheme is valid.
- if (!$style || !file_stream_wrapper_valid_scheme($scheme)) {
- drupal_exit();
- }
-
- $args = func_get_args();
- array_shift($args);
- array_shift($args);
- $target = implode('/', $args);
-
- $image_uri = $scheme . '://' . $target;
- $derivative_uri = image_style_path($style['name'], $image_uri);
-
- // If using the private scheme, let other modules provide headers and
- // control access to the file.
- if ($scheme == 'private') {
- if (file_exists($derivative_uri)) {
- file_download($scheme, file_uri_target($derivative_uri));
- }
- else {
- $headers = module_invoke_all('file_download', $image_uri);
- if (in_array(-1, $headers) || empty($headers)) {
- return drupal_access_denied();
- }
- if (count($headers)) {
- foreach ($headers as $name => $value) {
- drupal_add_http_header($name, $value);
- }
- }
- }
- }
-
- // Don't start generating the image if the derivative already exists or if
- // generation is in progress in another thread.
- $lock_name = 'image_style_deliver:' . $style['name'] . ':' . drupal_hash_base64($image_uri);
- if (!file_exists($derivative_uri)) {
- $lock_acquired = lock_acquire($lock_name);
- if (!$lock_acquired) {
- // Tell client to retry again in 3 seconds. Currently no browsers are known
- // to support Retry-After.
- drupal_add_http_header('Status', '503 Service Unavailable');
- drupal_add_http_header('Retry-After', 3);
- print t('Image generation in progress. Try again shortly.');
- drupal_exit();
- }
- }
-
- // Try to generate the image, unless another thread just did it while we were
- // acquiring the lock.
- $success = file_exists($derivative_uri) || image_style_create_derivative($style, $image_uri, $derivative_uri);
-
- if (!empty($lock_acquired)) {
- lock_release($lock_name);
- }
-
- if ($success) {
- $image = image_load($derivative_uri);
- file_transfer($image->source, array('Content-Type' => $image->info['mime_type'], 'Content-Length' => $image->info['file_size']));
- }
- else {
- watchdog('image', 'Unable to generate the derived image located at %path.', array('%path' => $derivative_uri));
- drupal_add_http_header('Status', '500 Internal Server Error');
- print t('Error generating image.');
- drupal_exit();
- }
-}
-
-/**
- * Create a new image based on an image style.
- *
- * @param $style
- * An image style array.
- * @param $source
- * Path of the source file.
- * @param $destination
- * Path or URI of the destination file.
- * @return
- * TRUE if an image derivative is generated, FALSE if no image derivative
- * is generated. NULL if the derivative is being generated.
- */
-function image_style_create_derivative($style, $source, $destination) {
- // Get the folder for the final location of this style.
- $directory = drupal_dirname($destination);
-
- // Build the destination folder tree if it doesn't already exist.
- if (!file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS)) {
- watchdog('image', 'Failed to create style directory: %directory', array('%directory' => $directory), WATCHDOG_ERROR);
- return FALSE;
- }
-
- if (!$image = image_load($source)) {
- return FALSE;
- }
-
- foreach ($style['effects'] as $effect) {
- image_effect_apply($image, $effect);
- }
-
- if (!image_save($image, $destination)) {
- if (file_exists($destination)) {
- watchdog('image', 'Cached image file %destination already exists. There may be an issue with your rewrite configuration.', array('%destination' => $destination), WATCHDOG_ERROR);
- }
- return FALSE;
- }
-
- return TRUE;
-}
-
-/**
- * Flush cached media for a style.
- *
- * @param $style
- * An image style array.
- */
-function image_style_flush($style) {
- $style_directory = drupal_realpath(variable_get('file_default_scheme', 'public') . '://styles/' . $style['name']);
- if (is_dir($style_directory)) {
- file_unmanaged_delete_recursive($style_directory);
- }
-
- // Let other modules update as necessary on flush.
- module_invoke_all('image_style_flush', $style);
-
- // Clear image style and effect caches.
- cache_clear_all('image_styles', 'cache');
- cache_clear_all('image_effects:', 'cache', TRUE);
- drupal_static_reset('image_styles');
- drupal_static_reset('image_effects');
-
- // Clear field caches so that formatters may be added for this style.
- field_info_cache_clear();
- drupal_theme_rebuild();
-
- // Clear page caches when flushing.
- if (module_exists('block')) {
- cache_clear_all('*', 'cache_block', TRUE);
- }
- cache_clear_all('*', 'cache_page', TRUE);
-}
-
-/**
- * Return the URL for an image derivative given a style and image path.
- *
- * @param $style_name
- * The name of the style to be used with this image.
- * @param $path
- * The path to the image.
- * @return
- * The absolute URL where a style image can be downloaded, suitable for use
- * in an ![]()
tag. Requesting the URL will cause the image to be created.
- * @see image_style_deliver()
- */
-function image_style_url($style_name, $path) {
- $scheme = file_uri_scheme($path);
- if ($scheme === 'private') {
- $target = file_uri_target($path);
- $url = url('system/files/styles/' . $style_name . '/' . $scheme . '/' . $target, array('absolute' => TRUE));
- }
- else {
- $destination = image_style_path($style_name, $path);
- $url = url(file_directory_path($scheme) . '/' . file_uri_target($destination), array('absolute' => TRUE));
- }
- return $url;
-}
-
-/**
- * Return the URI of an image when using a style.
- *
- * The path returned by this function may not exist. The default generation
- * method only creates images when they are requested by a user's browser.
- *
- * @param $style_name
- * The name of the style to be used with this image.
- * @param $uri
- * The URI or path to the image.
- * @return
- * The URI to an image style image.
- * @see image_style_url()
- */
-function image_style_path($style_name, $uri) {
- $scheme = file_uri_scheme($uri);
- if ($scheme) {
- $path = file_uri_target($uri);
- }
- else {
- $path = $uri;
- $scheme = variable_get('file_default_scheme', 'public');
- }
- return $scheme . '://styles/' . $style_name . '/' . $scheme . '/' . $path;
-}
-
-/**
- * Save a default image style to the database.
- *
- * @param style
- * An image style array provided by a module.
- * @return
- * An image style array. The returned style array will include the new 'isid'
- * assigned to the style.
- */
-function image_default_style_save($style) {
- $style = image_style_save($style);
- $effects = array();
- foreach ($style['effects'] as $effect) {
- $effect['isid'] = $style['isid'];
- $effect = image_effect_save($effect);
- $effects[$effect['ieid']] = $effect;
- }
- $style['effects'] = $effects;
- return $style;
-}
-
-/**
- * Revert the changes made by users to a default image style.
- *
- * @param style
- * An image style array.
- * @return
- * Boolean TRUE if the operation succeeded.
- */
-function image_default_style_revert($style) {
- image_style_flush($style);
-
- db_delete('image_effects')->condition('isid', $style['isid'])->execute();
- db_delete('image_styles')->condition('isid', $style['isid'])->execute();
-
- return TRUE;
-}
-
-/**
- * Pull in image effects exposed by modules implementing hook_image_effect_info().
- *
- * @return
- * An array of image effects to be used when transforming images.
- * @see hook_image_effect_info()
- * @see image_effect_definition_load()
- */
-function image_effect_definitions() {
- global $language;
-
- // hook_image_effect_info() includes translated strings, so each language is
- // cached separately.
- $langcode = $language->language;
-
- $effects = &drupal_static(__FUNCTION__);
-
- if (!isset($effects)) {
- if ($cache = cache_get("image_effects:$langcode") && !empty($cache->data)) {
- $effects = $cache->data;
- }
- else {
- $effects = array();
- include_once DRUPAL_ROOT . '/modules/image/image.effects.inc';
- foreach (module_implements('image_effect_info') as $module) {
- foreach (module_invoke($module, 'image_effect_info') as $name => $effect) {
- // Ensure the current toolkit supports the effect.
- $effect['module'] = $module;
- $effect['name'] = $name;
- $effect['data'] = isset($effect['data']) ? $effect['data'] : array();
- $effects[$name] = $effect;
- }
- }
- uasort($effects, '_image_effect_definitions_sort');
- cache_set("image_effects:$langcode", $effects);
- }
- }
-
- return $effects;
-}
-
-/**
- * Load the definition for an image effect.
- *
- * The effect definition is a set of core properties for an image effect, not
- * containing any user-settings. The definition defines various functions to
- * call when configuring or executing an image effect. This loader is mostly for
- * internal use within image.module. Use image_effect_load() or
- * image_style_load() to get image effects that contain configuration.
- *
- * @param $effect
- * The name of the effect definition to load.
- * @param $style
- * An image style array to which this effect will be added.
- * @return
- * An array containing the image effect definition with the following keys:
- * - "effect": The unique name for the effect being performed. Usually prefixed
- * with the name of the module providing the effect.
- * - "module": The module providing the effect.
- * - "help": A description of the effect.
- * - "function": The name of the function that will execute the effect.
- * - "form": (optional) The name of a function to configure the effect.
- * - "summary": (optional) The name of a theme function that will display a
- * one-line summary of the effect. Does not include the "theme_" prefix.
- */
-function image_effect_definition_load($effect, $style_name = NULL) {
- $definitions = image_effect_definitions();
-
- // If a style is specified, do not allow loading of default style
- // effects.
- if (isset($style_name)) {
- $style = image_style_load($style_name, NULL);
- if ($style['storage'] == IMAGE_STORAGE_DEFAULT) {
- return FALSE;
- }
- }
-
- return isset($definitions[$effect]) ? $definitions[$effect] : FALSE;
-}
-
-/**
- * Load all image effects from the database.
- *
- * @return
- * An array of all image effects.
- * @see image_effect_load()
- */
-function image_effects() {
- $effects = &drupal_static(__FUNCTION__);
-
- if (!isset($effects)) {
- $effects = array();
-
- // Add database image effects.
- $result = db_select('image_effects', NULL, array('fetch' => PDO::FETCH_ASSOC))
- ->fields('image_effects')
- ->orderBy('image_effects.weight', 'ASC')
- ->execute();
- foreach ($result as $effect) {
- $effect['data'] = unserialize($effect['data']);
- $definition = image_effect_definition_load($effect['name']);
- // Do not load image effects whose definition cannot be found.
- if ($definition) {
- $effect = array_merge($definition, $effect);
- $effects[$effect['ieid']] = $effect;
- }
- }
- }
-
- return $effects;
-}
-
-/**
- * Load a single image effect.
- *
- * @param $ieid
- * The image effect ID.
- * @param $style_name
- * The image style name.
- * @param $include
- * If set, this loader will restrict to a specific type of image style, may be
- * one of the defined Image style storage constants.
- * @return
- * An image effect array, consisting of the following keys:
- * - "ieid": The unique image effect ID.
- * - "isid": The unique image style ID that contains this image effect.
- * - "weight": The weight of this image effect within the image style.
- * - "name": The name of the effect definition that powers this image effect.
- * - "data": An array of configuration options for this image effect.
- * Besides these keys, the entirety of the image definition is merged into
- * the image effect array. Returns FALSE if the specified effect cannot be
- * found.
- * @see image_style_load()
- * @see image_effect_definition_load()
- */
-function image_effect_load($ieid, $style_name, $include = NULL) {
- if (($style = image_style_load($style_name, NULL, $include)) && isset($style['effects'][$ieid])) {
- return $style['effects'][$ieid];
- }
- return FALSE;
-}
-
-/**
- * Save an image effect.
- *
- * @param $effect
- * An image effect array.
- * @return
- * An image effect array. In the case of a new effect, 'ieid' will be set.
- */
-function image_effect_save($effect) {
- if (!empty($effect['ieid'])) {
- drupal_write_record('image_effects', $effect, 'ieid');
- }
- else {
- drupal_write_record('image_effects', $effect);
- }
- $style = image_style_load(NULL, $effect['isid']);
- image_style_flush($style);
- return $effect;
-}
-
-/**
- * Delete an image effect.
- *
- * @param $effect
- * An image effect array.
- */
-function image_effect_delete($effect) {
- db_delete('image_effects')->condition('ieid', $effect['ieid'])->execute();
- $style = image_style_load(NULL, $effect['isid']);
- image_style_flush($style);
-}
-
-/**
- * Given an image object and effect, perform the effect on the file.
- *
- * @param $image
- * An image object returned by image_load().
- * @param $effect
- * An image effect array.
- * @return
- * TRUE on success. FALSE if unable to perform the image effect on the image.
- */
-function image_effect_apply($image, $effect) {
- module_load_include('inc', 'image', 'image.effects');
- $function = $effect['effect callback'];
- if (function_exists($function)) {
- return $function($image, $effect['data']);
- }
- return FALSE;
-}
-
-/**
- * Returns HTML for an image using a specific image style.
- *
- * @param $variables
- * An associative array containing:
- * - style_name: The name of the style to be used to alter the original image.
- * - path: The path of the image file relative to the Drupal files directory.
- * This function does not work with images outside the files directory nor
- * with remotely hosted images.
- * - alt: The alternative text for text-based browsers.
- * - title: The title text is displayed when the image is hovered in some
- * popular browsers.
- * - attributes: Associative array of attributes to be placed in the img tag.
- * - getsize: If set to TRUE, the image's dimension are fetched and added as
- * width/height attributes.
- *
- * @ingroup themeable
- */
-function theme_image_style($variables) {
- $style_name = $variables['style_name'];
- $path = $variables['path'];
-
- // theme_image() can only honor the $getsize parameter with local file paths.
- // The derivative image is not created until it has been requested so the file
- // may not yet exist, in this case we just fallback to the URL.
- $style_path = image_style_path($style_name, $path);
- if (!file_exists($style_path)) {
- $style_path = image_style_url($style_name, $path);
- }
- $variables['path'] = $style_path;
- $variables['getsize'] = FALSE;
- return theme('image', $variables);
-}
-
-/**
- * Accept a percentage and return it in pixels.
- */
-function image_filter_percent($value, $current_pixels) {
- if (strpos($value, '%') !== FALSE) {
- $value = str_replace('%', '', $value) * 0.01 * $current_pixels;
- }
- return $value;
-}
-
-/**
- * Accept a keyword (center, top, left, etc) and return it as a pixel offset.
- *
- * @param $value
- * @param $current_pixels
- * @param $new_pixels
- */
-function image_filter_keyword($value, $current_pixels, $new_pixels) {
- switch ($value) {
- case 'top':
- case 'left':
- return 0;
-
- case 'bottom':
- case 'right':
- return $current_pixels - $new_pixels;
-
- case 'center':
- return $current_pixels / 2 - $new_pixels / 2;
- }
- return $value;
-}
-
-/**
- * Internal function for sorting image effect definitions through uasort().
- *
- * @see image_effect_definitions()
- */
-function _image_effect_definitions_sort($a, $b) {
- return strcasecmp($a['name'], $b['name']);
-}
diff --git a/modules/image/image.test b/modules/image/image.test
deleted file mode 100644
index 3c0c9ca930484c989b005cc5308fe80606061425..0000000000000000000000000000000000000000
--- a/modules/image/image.test
+++ /dev/null
@@ -1,833 +0,0 @@
-admin_user = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles'));
- $this->drupalLogin($this->admin_user);
- }
-
- /**
- * Create a new image field.
- *
- * @param $name
- * The name of the new field (all lowercase), exclude the "field_" prefix.
- * @param $type_name
- * The node type that this field will be added to.
- * @param $field_settings
- * A list of field settings that will be added to the defaults.
- * @param $instance_settings
- * A list of instance settings that will be added to the instance defaults.
- * @param $widget_settings
- * A list of widget settings that will be added to the widget defaults.
- */
- function createImageField($name, $type_name, $field_settings = array(), $instance_settings = array(), $widget_settings = array()) {
- $field = array(
- 'field_name' => $name,
- 'type' => 'image',
- 'settings' => array(),
- 'cardinality' => !empty($field_settings['cardinality']) ? $field_settings['cardinality'] : 1,
- );
- $field['settings'] = array_merge($field['settings'], $field_settings);
- field_create_field($field);
-
- $instance = array(
- 'field_name' => $field['field_name'],
- 'entity_type' => 'node',
- 'label' => $name,
- 'bundle' => $type_name,
- 'required' => !empty($instance_settings['required']),
- 'settings' => array(),
- 'widget' => array(
- 'type' => 'image_image',
- 'settings' => array(),
- ),
- );
- $instance['settings'] = array_merge($instance['settings'], $instance_settings);
- $instance['widget']['settings'] = array_merge($instance['widget']['settings'], $widget_settings);
- return field_create_instance($instance);
- }
-
- /**
- * Upload an image to a node.
- *
- * @param $image
- * A file object representing the image to upload.
- * @param $field_name
- * Name of the image field the image should be attached to.
- * @param $type
- * The type of node to create.
- */
- function uploadNodeImage($image, $field_name, $type) {
- $edit = array(
- 'title' => $this->randomName(),
- );
- $edit['files[' . $field_name . '_' . LANGUAGE_NONE . '_0]'] = realpath($image->uri);
- $this->drupalPost('node/add/' . $type, $edit, t('Save'));
-
- // Retrieve ID of the newly created node from the current URL.
- $matches = array();
- preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches);
- return isset($matches[1]) ? $matches[1] : FALSE;
- }
-}
-
-/**
- * Tests the functions for generating paths and URLs for image styles.
- */
-class ImageStylesPathAndUrlUnitTest extends DrupalWebTestCase {
- protected $style_name;
- protected $image_info;
- protected $image_filepath;
-
- public static function getInfo() {
- return array(
- 'name' => 'Image styles path and URL functions',
- 'description' => 'Tests functions for generating paths and URLs to image styles.',
- 'group' => 'Image',
- );
- }
-
- function setUp() {
- parent::setUp('image_module_test');
-
- $this->style_name = 'style_foo';
- image_style_save(array('name' => $this->style_name));
- }
-
- /**
- * Test image_style_path().
- */
- function testImageStylePath() {
- $scheme = 'public';
- $actual = image_style_path($this->style_name, "$scheme://foo/bar.gif");
- $expected = "$scheme://styles/" . $this->style_name . "/$scheme/foo/bar.gif";
- $this->assertEqual($actual, $expected, t('Got the path for a file URI.'));
-
- $actual = image_style_path($this->style_name, 'foo/bar.gif');
- $expected = "$scheme://styles/" . $this->style_name . "/$scheme/foo/bar.gif";
- $this->assertEqual($actual, $expected, t('Got the path for a relative file path.'));
- }
-
- /**
- * Test image_style_url() with a file using the "public://" scheme.
- */
- function testImageStyleUrlAndPathPublic() {
- $this->_testImageStyleUrlAndPath('public');
- }
-
- /**
- * Test image_style_url() with a file using the "private://" scheme.
- */
- function testImageStyleUrlAndPathPrivate() {
- $this->_testImageStyleUrlAndPath('private');
- }
-
- /**
- * Test image_style_url().
- */
- function _testImageStyleUrlAndPath($scheme) {
- // Make the default scheme neither "public" nor "private" to verify the
- // functions work for other than the default scheme.
- variable_set('file_default_scheme', 'temporary');
-
- // Create the directories for the styles.
- $directory = $scheme . '://styles/' . $this->style_name;
- $status = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
- $this->assertNotIdentical(FALSE, $status, t('Created the directory for the generated images for the test style.'));
-
- // Create a working copy of the file.
- $files = $this->drupalGetTestFiles('image');
- $file = reset($files);
- $image_info = image_get_info($file->uri);
- $original_uri = file_unmanaged_copy($file->uri, $scheme . '://', FILE_EXISTS_RENAME);
- // Let the image_module_test module know about this file, so it can claim
- // ownership in hook_file_download().
- variable_set('image_module_test_file_download', $original_uri);
- $this->assertNotIdentical(FALSE, $original_uri, t('Created the generated image file.'));
-
- // Get the URL of a file that has not been generated and try to create it.
- $generated_uri = $scheme . '://styles/' . $this->style_name . '/' . $scheme . '/'. basename($original_uri);
- $this->assertFalse(file_exists($generated_uri), t('Generated file does not exist.'));
- $generate_url = image_style_url($this->style_name, $original_uri);
-
- // Fetch the URL that generates the file.
- $this->drupalGet($generate_url);
- $this->assertResponse(200, t('Image was generated at the URL.'));
- $this->assertTrue(file_exists($generated_uri), t('Generated file does exist after we accessed it.'));
- $this->assertRaw(file_get_contents($generated_uri), t('URL returns expected file.'));
- $generated_image_info = image_get_info($generated_uri);
- $this->assertEqual($this->drupalGetHeader('Content-Type'), $generated_image_info['mime_type'], t('Expected Content-Type was reported.'));
- $this->assertEqual($this->drupalGetHeader('Content-Length'), $generated_image_info['file_size'], t('Expected Content-Length was reported.'));
- if ($scheme == 'private') {
- $this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', t('Expected custom header has been added.'));
- }
- }
-}
-
-/**
- * Use the image_test.module's mock toolkit to ensure that the effects are
- * properly passing parameters to the image toolkit.
- */
-class ImageEffectsUnitTest extends ImageToolkitTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Image effects',
- 'description' => 'Test that the image effects pass parameters to the toolkit correctly.',
- 'group' => 'Image',
- );
- }
-
- function setUp() {
- parent::setUp('image_test');
- module_load_include('inc', 'image', 'image.effects');
- }
-
- /**
- * Test the image_resize_effect() function.
- */
- function testResizeEffect() {
- $this->assertTrue(image_resize_effect($this->image, array('width' => 1, 'height' => 2)), t('Function returned the expected value.'));
- $this->assertToolkitOperationsCalled(array('resize'));
-
- // Check the parameters.
- $calls = image_test_get_all_calls();
- $this->assertEqual($calls['resize'][0][1], 1, t('Width was passed correctly'));
- $this->assertEqual($calls['resize'][0][2], 2, t('Height was passed correctly'));
- }
-
- /**
- * Test the image_scale_effect() function.
- */
- function testScaleEffect() {
- // @todo: need to test upscaling.
- $this->assertTrue(image_scale_effect($this->image, array('width' => 10, 'height' => 10)), t('Function returned the expected value.'));
- $this->assertToolkitOperationsCalled(array('resize'));
-
- // Check the parameters.
- $calls = image_test_get_all_calls();
- $this->assertEqual($calls['resize'][0][1], 10, t('Width was passed correctly'));
- $this->assertEqual($calls['resize'][0][2], 5, t('Height was based off aspect ratio and passed correctly'));
- }
-
- /**
- * Test the image_crop_effect() function.
- */
- function testCropEffect() {
- // @todo should test the keyword offsets.
- $this->assertTrue(image_crop_effect($this->image, array('anchor' => 'top-1', 'width' => 3, 'height' => 4)), t('Function returned the expected value.'));
- $this->assertToolkitOperationsCalled(array('crop'));
-
- // Check the parameters.
- $calls = image_test_get_all_calls();
- $this->assertEqual($calls['crop'][0][1], 0, t('X was passed correctly'));
- $this->assertEqual($calls['crop'][0][2], 1, t('Y was passed correctly'));
- $this->assertEqual($calls['crop'][0][3], 3, t('Width was passed correctly'));
- $this->assertEqual($calls['crop'][0][4], 4, t('Height was passed correctly'));
- }
-
- /**
- * Test the image_scale_and_crop_effect() function.
- */
- function testScaleAndCropEffect() {
- $this->assertTrue(image_scale_and_crop_effect($this->image, array('width' => 5, 'height' => 10)), t('Function returned the expected value.'));
- $this->assertToolkitOperationsCalled(array('resize', 'crop'));
-
- // Check the parameters.
- $calls = image_test_get_all_calls();
- $this->assertEqual($calls['crop'][0][1], 7.5, t('X was computed and passed correctly'));
- $this->assertEqual($calls['crop'][0][2], 0, t('Y was computed and passed correctly'));
- $this->assertEqual($calls['crop'][0][3], 5, t('Width was computed and passed correctly'));
- $this->assertEqual($calls['crop'][0][4], 10, t('Height was computed and passed correctly'));
- }
-
- /**
- * Test the image_desaturate_effect() function.
- */
- function testDesaturateEffect() {
- $this->assertTrue(image_desaturate_effect($this->image, array()), t('Function returned the expected value.'));
- $this->assertToolkitOperationsCalled(array('desaturate'));
-
- // Check the parameters.
- $calls = image_test_get_all_calls();
- $this->assertEqual(count($calls['desaturate'][0]), 1, t('Only the image was passed.'));
- }
-
- /**
- * Test the image_rotate_effect() function.
- */
- function testRotateEffect() {
- // @todo: need to test with 'random' => TRUE
- $this->assertTrue(image_rotate_effect($this->image, array('degrees' => 90, 'bgcolor' => '#fff')), t('Function returned the expected value.'));
- $this->assertToolkitOperationsCalled(array('rotate'));
-
- // Check the parameters.
- $calls = image_test_get_all_calls();
- $this->assertEqual($calls['rotate'][0][1], 90, t('Degrees were passed correctly'));
- $this->assertEqual($calls['rotate'][0][2], 0xffffff, t('Background color was passed correctly'));
- }
-}
-
-/**
- * Tests creation, deletion, and editing of image styles and effects.
- */
-class ImageAdminStylesUnitTest extends ImageFieldTestCase {
-
- public static function getInfo() {
- return array(
- 'name' => 'Image styles and effects UI configuration',
- 'description' => 'Tests creation, deletion, and editing of image styles and effects at the UI level.',
- 'group' => 'Image',
- );
- }
-
- /**
- * Given an image style, generate an image.
- */
- function createSampleImage($style) {
- static $file_path;
-
- // First, we need to make sure we have an image in our testing
- // file directory. Copy over an image on the first run.
- if (!isset($file_path)) {
- $files = $this->drupalGetTestFiles('image');
- $file = reset($files);
- $file_path = file_unmanaged_copy($file->uri);
- }
-
- return image_style_url($style['name'], $file_path) ? $file_path : FALSE;
- }
-
- /**
- * Count the number of images currently create for a style.
- */
- function getImageCount($style) {
- $directory = file_directory_path() . '/styles/' . $style['name'];
- return count(file_scan_directory($directory, '/.*/'));
- }
-
- /**
- * General test to add a style, add/remove/edit effects to it, then delete it.
- */
- function testStyle() {
- // Setup a style to be created and effects to add to it.
- $style_name = strtolower($this->randomName(10));
- $style_path = 'admin/config/media/image-styles/edit/' . $style_name;
- $effect_edits = array(
- 'image_resize' => array(
- 'data[width]' => 100,
- 'data[height]' => 101,
- ),
- 'image_scale' => array(
- 'data[width]' => 110,
- 'data[height]' => 111,
- 'data[upscale]' => 1,
- ),
- 'image_scale_and_crop' => array(
- 'data[width]' => 120,
- 'data[height]' => 121,
- ),
- 'image_crop' => array(
- 'data[width]' => 130,
- 'data[height]' => 131,
- 'data[anchor]' => 'center-center',
- ),
- 'image_desaturate' => array(
- // No options for desaturate.
- ),
- 'image_rotate' => array(
- 'data[degrees]' => 5,
- 'data[random]' => 1,
- 'data[bgcolor]' => '#FFFF00',
- ),
- );
-
- // Add style form.
-
- $edit = array(
- 'name' => $style_name,
- );
- $this->drupalPost('admin/config/media/image-styles/add', $edit, t('Create new style'));
- $this->assertRaw(t('Style %name was created.', array('%name' => $style_name)), t('Image style successfully created.'));
-
- // Add effect form.
-
- // Add each sample effect to the style.
- foreach ($effect_edits as $effect => $edit) {
- // Add the effect.
- $this->drupalPost($style_path, array('new' => $effect), t('Add'));
- if (!empty($edit)) {
- $this->drupalPost(NULL, $edit, t('Add effect'));
- }
- }
-
- // Edit effect form.
-
- // Revisit each form to make sure the effect was saved.
- drupal_static_reset('image_styles');
- $style = image_style_load($style_name);
-
- foreach ($style['effects'] as $ieid => $effect) {
- $this->drupalGet($style_path . '/effects/' . $ieid);
- foreach ($effect_edits[$effect['name']] as $field => $value) {
- $this->assertFieldByName($field, $value, t('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect['name'], '%value' => $value)));
- }
- }
-
- // Image style overview form (ordering and renaming).
-
- // Confirm the order of effects is maintained according to the order we
- // added the fields.
- $effect_edits_order = array_keys($effect_edits);
- $effects_order = array_values($style['effects']);
- $order_correct = TRUE;
- foreach ($effects_order as $index => $effect) {
- if ($effect_edits_order[$index] != $effect['name']) {
- $order_correct = FALSE;
- }
- }
- $this->assertTrue($order_correct, t('The order of the effects is correctly set by default.'));
-
- // Test the style overview form.
- // Change the name of the style and adjust the weights of effects.
- $style_name = strtolower($this->randomName(10));
- $weight = count($effect_edits);
- $edit = array(
- 'name' => $style_name,
- );
- foreach ($style['effects'] as $ieid => $effect) {
- $edit['effects[' . $ieid . '][weight]'] = $weight;
- $weight--;
- }
-
- // Create an image to make sure it gets flushed after saving.
- $image_path = $this->createSampleImage($style);
- $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
-
- $this->drupalPost($style_path, $edit, t('Update style'));
-
- // Note that after changing the style name, the style path is changed.
- $style_path = 'admin/config/media/image-styles/edit/' . $style_name;
-
- // Check that the URL was updated.
- $this->drupalGet($style_path);
- $this->assertResponse(200, t('Image style %original renamed to %new', array('%original' => $style['name'], '%new' => $style_name)));
-
- // Check that the image was flushed after updating the style.
- // This is especially important when renaming the style. Make sure that
- // the old image directory has been deleted.
- $this->assertEqual($this->getImageCount($style), 0, t('Image style %style was flushed after renaming the style and updating the order of effects.', array('%style' => $style['name'])));
-
- // Load the style by the new name with the new weights.
- drupal_static_reset('image_styles');
- $style = image_style_load($style_name, NULL);
-
- // Confirm the new style order was saved.
- $effect_edits_order = array_reverse($effect_edits_order);
- $effects_order = array_values($style['effects']);
- $order_correct = TRUE;
- foreach ($effects_order as $index => $effect) {
- if ($effect_edits_order[$index] != $effect['name']) {
- $order_correct = FALSE;
- }
- }
- $this->assertTrue($order_correct, t('The order of the effects is correctly set by default.'));
-
- // Image effect deletion form.
-
- // Create an image to make sure it gets flushed after deleting an effect.
- $image_path = $this->createSampleImage($style);
- $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
-
- // Test effect deletion form.
- $effect = array_pop($style['effects']);
- $this->drupalPost($style_path . '/effects/' . $effect['ieid'] . '/delete', array(), t('Delete'));
- $this->assertRaw(t('The image effect %name has been deleted.', array('%name' => $effect['label'])), t('Image effect deleted.'));
-
- // Style deletion form.
-
- // Delete the style.
- $this->drupalPost('admin/config/media/image-styles/delete/' . $style_name, array(), t('Delete'));
-
- // Confirm the style directory has been removed.
- $directory = file_directory_path() . '/styles/' . $style_name;
- $this->assertFalse(is_dir($directory), t('Image style %style directory removed on style deletion.', array('%style' => $style['name'])));
-
- drupal_static_reset('image_styles');
- $this->assertFalse(image_style_load($style_name), t('Image style %style successfully deleted.', array('%style' => $style['name'])));
-
- }
-
- /**
- * Test to override, edit, then revert a style.
- */
- function testDefaultStyle() {
- // Setup a style to be created and effects to add to it.
- $style_name = 'thumbnail';
- $edit_path = 'admin/config/media/image-styles/edit/' . $style_name;
- $delete_path = 'admin/config/media/image-styles/delete/' . $style_name;
- $revert_path = 'admin/config/media/image-styles/revert/' . $style_name;
-
- // Ensure deleting a default is not possible.
- $this->drupalGet($delete_path);
- $this->assertText(t('Page not found'), t('Default styles may not be deleted.'));
-
- // Ensure that editing a default is not possible (without overriding).
- $this->drupalGet($edit_path);
- $this->assertNoField('edit-name', t('Default styles may not be renamed.'));
- $this->assertNoField('edit-submit', t('Default styles may not be edited.'));
- $this->assertNoField('edit-add', t('Default styles may not have new effects added.'));
-
- // Create an image to make sure the default works before overriding.
- drupal_static_reset('image_styles');
- $style = image_style_load($style_name);
- $image_path = $this->createSampleImage($style);
- $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
-
- // Verify that effects attached to a default style do not have an ieid key.
- foreach ($style['effects'] as $effect) {
- $this->assertFalse(isset($effect['ieid']), t('The %effect effect does not have an ieid.', array('%effect' => $effect['name'])));
- }
-
- // Override the default.
- $this->drupalPost($edit_path, array(), t('Override defaults'));
- $this->assertRaw(t('The %style style has been overridden, allowing you to change its settings.', array('%style' => $style_name)), t('Default image style may be overridden.'));
-
- // Add sample effect to the overridden style.
- $this->drupalPost($edit_path, array('new' => 'image_desaturate'), t('Add'));
- drupal_static_reset('image_styles');
- $style = image_style_load($style_name);
-
- // Verify that effects attached to the style have an ieid now.
- foreach ($style['effects'] as $effect) {
- $this->assertTrue(isset($effect['ieid']), t('The %effect effect has an ieid.', array('%effect' => $effect['name'])));
- }
-
- // The style should now have 2 effect, the original scale provided by core
- // and the desaturate effect we added in the override.
- $effects = array_values($style['effects']);
- $this->assertEqual($effects[0]['name'], 'image_scale', t('The default effect still exists in the overridden style.'));
- $this->assertEqual($effects[1]['name'], 'image_desaturate', t('The added effect exists in the overridden style.'));
-
- // Check that we are unable to rename an overridden style.
- $this->drupalGet($edit_path);
- $this->assertNoField('edit-name', t('Overridden styles may not be renamed.'));
-
- // Create an image to ensure the override works properly.
- $image_path = $this->createSampleImage($style);
- $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
-
- // Revert the image style.
- $this->drupalPost($revert_path, array(), t('Revert'));
- drupal_static_reset('image_styles');
- $style = image_style_load($style_name);
-
- // The style should now have the single effect for scale.
- $effects = array_values($style['effects']);
- $this->assertEqual($effects[0]['name'], 'image_scale', t('The default effect still exists in the reverted style.'));
- $this->assertFalse(array_key_exists(1, $effects), t('The added effect has been removed in the reverted style.'));
- }
-
- /**
- * Test deleting a style and choosing a replacement style.
- */
- function testStyleReplacement() {
- // Create a new style.
- $style_name = strtolower($this->randomName(10));
- image_style_save(array('name' => $style_name));
- $style_path = 'admin/config/media/image-styles/edit/' . $style_name;
-
- // Create an image field that uses the new style.
- $field_name = strtolower($this->randomName(10));
- $instance = $this->createImageField($field_name, 'article');
- $instance['display']['default']['type'] = 'image';
- $instance['display']['default']['settings']['image_style'] = $style_name;
- field_update_instance($instance);
-
- // Create a new node with an image attached.
- $test_image = current($this->drupalGetTestFiles('image'));
- $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
- $node = node_load($nid);
-
- // Test that image is displayed using newly created style.
- $this->drupalGet('node/' . $nid);
- $this->assertRaw(image_style_url($style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style @style.', array('@style' => $style_name)));
-
- // Rename the style and make sure the image field is updated.
- $new_style_name = strtolower($this->randomName(10));
- $edit = array(
- 'name' => $new_style_name,
- );
- $this->drupalPost('admin/config/media/image-styles/edit/' . $style_name, $edit, t('Update style'));
- $this->assertText(t('Changes to the style have been saved.'), t('Style %name was renamed to %new_name.', array('%name' => $style_name, '%new_name' => $new_style_name)));
- $this->drupalGet('node/' . $nid);
- $this->assertRaw(image_style_url($new_style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style replacement style.'));
-
- // Delete the style and choose a replacement style.
- $edit = array(
- 'replacement' => 'thumbnail',
- );
- $this->drupalPost('admin/config/media/image-styles/delete/' . $new_style_name, $edit, t('Delete'));
- $message = t('Style %name was deleted.', array('%name' => $new_style_name));
- $this->assertRaw($message, $message);
-
- $this->drupalGet('node/' . $nid);
- $this->assertRaw(image_style_url('thumbnail', $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style replacement style.'));
- }
-}
-
-/**
- * Test class to check that formatters and display settings are working.
- */
-class ImageFieldDisplayTestCase extends ImageFieldTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Image field display tests',
- 'description' => 'Test the display of image fields.',
- 'group' => 'Image',
- );
- }
-
- /**
- * Test image formatters on node display.
- */
- function testImageFieldFormatters() {
- $field_name = strtolower($this->randomName());
- $this->createImageField($field_name, 'article');
-
- // Create a new node with an image attached.
- $test_image = current($this->drupalGetTestFiles('image'));
- $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
- $node = node_load($nid, NULL, TRUE);
-
- // Test that the default formatter is being used.
- $image_uri = $node->{$field_name}[LANGUAGE_NONE][0]['uri'];
- $image_info = array(
- 'path' => $image_uri,
- 'getsize' => TRUE,
- );
- $default_output = theme('image', $image_info);
- $this->assertRaw($default_output, t('Default formatter displaying correctly on full node view.'));
-
- // Test the image linked to file formatter.
- $instance = field_info_instance('node', $field_name, 'article');
- $instance['display']['default']['type'] = 'image';
- $instance['display']['default']['settings']['image_link'] = 'file';
- field_update_instance($instance);
- $default_output = l(theme('image', $image_info), file_create_url($image_uri), array('html' => TRUE));
- $this->drupalGet('node/' . $nid);
- $this->assertRaw($default_output, t('Image linked to file formatter displaying correctly on full node view.'));
-
- // Test the image linked to content formatter.
- $instance['display']['default']['settings']['image_link'] = 'content';
- field_update_instance($instance);
- $default_output = l(theme('image', $image_info), 'node/' . $nid, array('html' => TRUE, 'attributes' => array('class' => 'active')));
- $this->drupalGet('node/' . $nid);
- $this->assertRaw($default_output, t('Image linked to content formatter displaying correctly on full node view.'));
-
- // Test the image style 'thumbnail' formatter.
- $instance['display']['default']['settings']['image_link'] = '';
- $instance['display']['default']['settings']['image_style'] = 'thumbnail';
- field_update_instance($instance);
- // Ensure the derrivative image is generated so we do not have to deal with
- // image style callback paths.
- $this->drupalGet(image_style_url('thumbnail', $image_uri));
- $image_info['path'] = image_style_path('thumbnail', $image_uri);
- $image_info['getsize'] = FALSE;
- $default_output = theme('image', $image_info);
- $this->drupalGet('node/' . $nid);
- $this->assertRaw($default_output, t('Image style thumbnail formatter displaying correctly on full node view.'));
- }
-
- /**
- * Tests for image field settings.
- */
- function testImageFieldSettings() {
- $test_image = current($this->drupalGetTestFiles('image'));
- list(, $test_image_extension) = explode('.', $test_image->filename);
- $field_name = strtolower($this->randomName());
- $instance_settings = array(
- 'alt_field' => 1,
- 'file_extensions' => $test_image_extension,
- 'max_filesize' => '50 KB',
- 'max_resolution' => '100x100',
- 'min_resolution' => '10x10',
- 'title_field' => 1,
- );
- $widget_settings = array(
- 'preview_image_style' => 'medium',
- );
- $this->createImageField($field_name, 'article', array(), $instance_settings, $widget_settings);
- $instance = field_info_instance('node', $field_name, 'article');
-
- $this->drupalGet('node/add/article');
- $this->assertText(t('Files must be less than 50 KB.'), t('Image widget max file size is displayed on article form.'));
- $this->assertText(t('Allowed file types: ' . $test_image_extension . '.'), t('Image widget allowed file types displayed on article form.'));
- $this->assertText(t('Images must be between 10x10 and 100x100 pixels.'), t('Image widget allowed resolution displayed on article form.'));
-
- // We have to create the article first and then edit it because the alt
- // and title fields do not display until the image has been attached.
- $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
- $this->drupalGet('node/' . $nid . '/edit');
- $this->assertFieldByName($field_name . '[' . LANGUAGE_NONE . '][0][alt]', '', t('Alt field displayed on article form.'));
- $this->assertFieldByName($field_name . '[' . LANGUAGE_NONE . '][0][title]', '', t('Title field displayed on article form.'));
- // Verify that the attached image is being previewed using the 'medium'
- // style.
- $node = node_load($nid, NULL, TRUE);
- $image_info = array(
- 'path' => image_style_url('medium', $node->{$field_name}[LANGUAGE_NONE][0]['uri']),
- 'getsize' => FALSE,
- );
- $default_output = theme('image', $image_info);
- $this->assertRaw($default_output, t("Preview image is displayed using 'medium' style."));
-
- // Add alt/title fields to the image and verify that they are displayed.
- $image_info = array(
- 'path' => $node->{$field_name}[LANGUAGE_NONE][0]['uri'],
- 'alt' => $this->randomName(),
- 'title' => $this->randomName(),
- 'getsize' => TRUE,
- );
- $edit = array(
- $field_name . '[' . LANGUAGE_NONE . '][0][alt]' => $image_info['alt'],
- $field_name . '[' . LANGUAGE_NONE . '][0][title]' => $image_info['title'],
- );
- $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save'));
- $default_output = theme('image', $image_info);
- $this->assertRaw($default_output, t('Image displayed using user supplied alt and title attributes.'));
- }
-
- /**
- * Test use of a default image with an image field.
- */
- function testImageFieldDefaultImage() {
- // Create a new image field.
- $field_name = strtolower($this->randomName());
- $this->createImageField($field_name, 'article');
-
- // Create a new node, with no images and verify that no images are
- // displayed.
- $node = $this->drupalCreateNode(array('type' => 'article'));
- $this->drupalGet('node/' . $node->nid);
- // Verify that no image is displayed on the page by checking for the class
- // that would be used on the image field.
- $this->assertNoPattern('', t('No image displayed when no image is attached and no default image specified.'));
-
- // Add a default image to the imagefield instance.
- $images = $this->drupalGetTestFiles('image');
- $edit = array(
- 'files[field_settings_default_image]' => realpath($images[0]->uri),
- );
- $this->drupalPost('admin/structure/types/manage/article/fields/' . $field_name, $edit, t('Save settings'));
- // Clear field info cache so the new default image is detected.
- field_info_cache_clear();
- $field = field_info_field($field_name);
- $image = file_load($field['settings']['default_image']);
- $default_output = theme('image', array('path' => $image->uri, 'getsize' => TRUE));
- $this->drupalGet('node/' . $node->nid);
- $this->assertRaw($default_output, t('Default image displayed when no user supplied image is present.'));
-
- // Create a node with an image attached and ensure that the default image
- // is not displayed.
- $nid = $this->uploadNodeImage($images[1], $field_name, 'article');
- $node = node_load($nid, NULL, TRUE);
- $image_info = array(
- 'path' => $node->{$field_name}[LANGUAGE_NONE][0]['uri'],
- 'getsize' => TRUE,
- );
- $image_output = theme('image', $image_info);
- $this->drupalGet('node/' . $nid);
- $this->assertNoRaw($default_output, t('Default image is not displayed when user supplied image is present.'));
- $this->assertRaw($image_output, t('User supplied image is displayed.'));
-
- // Remove default image from the field and make sure it is no longer used.
- $edit = array(
- 'field[settings][default_image][fid]' => 0,
- );
- $this->drupalPost('admin/structure/types/manage/article/fields/' . $field_name, $edit, t('Save settings'));
- // Clear field info cache so the new default image is detected.
- field_info_cache_clear();
- $field = field_info_field($field_name);
- $this->assertFalse($field['settings']['default_image'], t('Default image removed from field.'));
- }
-}
-
-/**
- * Test class to check for various validations.
- */
-class ImageFieldValidateTestCase extends ImageFieldTestCase {
- public static function getInfo() {
- return array(
- 'name' => 'Image field validation tests',
- 'description' => 'Tests validation functions such as min/max resolution.',
- 'group' => 'Image',
- );
- }
-
- /**
- * Test min/max resolution settings.
- */
- function testResolution() {
- $field_name = strtolower($this->randomName());
- $min_resolution = 50;
- $max_resolution = 100;
- $instance_settings = array(
- 'max_resolution' => $max_resolution . 'x' . $max_resolution,
- 'min_resolution' => $min_resolution . 'x' . $min_resolution,
- );
- $this->createImageField($field_name, 'article', array(), $instance_settings);
-
- // We want a test image that is too small, and a test image that is too
- // big, so cycle through test image files until we have what we need.
- $image_that_is_too_big = FALSE;
- $image_that_is_too_small = FALSE;
- foreach ($this->drupalGetTestFiles('image') as $image) {
- $info = image_get_info($image->uri);
- if ($info['width'] > $max_resolution) {
- $image_that_is_too_big = $image;
- }
- if ($info['width'] < $min_resolution) {
- $image_that_is_too_small = $image;
- }
- if ($image_that_is_too_small && $image_that_is_too_big) {
- break;
- }
- }
- $nid = $this->uploadNodeImage($image_that_is_too_small, $field_name, 'article');
- $this->assertText(t('The specified file ' . $image_that_is_too_small->filename . ' could not be uploaded. The image is too small; the minimum dimensions are 50x50 pixels.'), t('Node save failed when minimum image resolution was not met.'));
- $nid = $this->uploadNodeImage($image_that_is_too_big, $field_name, 'article');
- $this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'), t('Image exceeding max resolution was properly resized.'));
- }
-}
diff --git a/modules/image/sample.png b/modules/image/sample.png
deleted file mode 100644
index f22e0df98448bbaff3282f86ea5d14fdb256551c..0000000000000000000000000000000000000000
--- a/modules/image/sample.png
+++ /dev/null
@@ -1,627 +0,0 @@
-PNG
-
-
IHDR X ' uIDATx^Ah\UsoI6iFVZiNJUl RB.\ .Ep'+JT*"hciN3I;L&d2UBiSxL~gBr{p>=K4?~߇}ѯ[$}p*k]h r;V_KJrJ$c06O*fM)iA1ZfL13c3ai? 0fLgfJ2m)>6fL 3q
҄xR fb 3a&̴``ĒL 3a& 7"- ,fL 3AXfL 3a&"h?3AXK f"n 3a&-0#MlYLD4aH 3a&DDfb&1M
`&4fYQ"L
`&1fJa? lG
`&0fL X̄hL 3ahрUQ0c 31C ,01h 3a&"8L XQ̄0f"n 3ѧ4f&̄-VfLlD47hLi0S l{
`&"L 3DQFq&̄0fV̄0f<3a&eY8fL`&ˡfVE70g٩i?UTj3:78s)
L*:2B ذfbo3a&r0hfb)XYʎdcTUƨޚj|V=WϊgŦuSDDAm? oELͅ-Yk
O:v٦DՈ͎;YI>;:#hR[{WLD4a&̄0fD4YVdzXޜatf+v{_Q#w_ [gl _<'䑪uniҬ79:j5Ә2=0S 0H^m`&"'տ]U
-@:Lm M (.>V⍴pby!i=9ҳO(Ued; TP.3)fL)9LD4a5]f"n2wMh$"9yjkB
iЭj]o-{co- ʕL '7eoQ t1ܔR!=y%;WL 3AD fVסdf$%2Ήs/yqWf sYg*ڏòjgzWz #AoK r/;Ԫvr|-AK0M 37Lֲ.zmWy"K?1֓jwtRgv5Cګ ~) !=w) U"VǧE^-`j',), Qhiڿ# E< E*:z;sZLtog r&r&h"g"1Pptb-iL9{0Щçk0V}eV p|zO1ɶ ٹ֕7Ο {V*Sv $`g~Ӂ3^L7@qL$LiF8b- |s?{!# r]ީoּS6<˪i~ Ar I&ϿͿ\DܥV 7g8}8{ șșșƅ38,KC_cY{r
-^`=j1Ç)#ؕi/1[g(fDS,zD/WM-~A8@vB_鑽{NrQ)9
3
qL}^_=߿N%9Ek
-Ę<뙻{N`WX#A-> Tkۍ%i!Q
-;~F_ރumnr&33er&r&<*9v_Ѹb'v! kv}jW|VFa &9Tpy/
ԝEػݘ 27X^ST{9Jə(nVƺªLv}IW-/^ut Bίa9ܮj W|r5s:KP=K%{y3ʉ|_vg8X{Ot/=ߝGMLL7@MLc,T$gʺw_\ۑs|I7,vҧr( u]E2%i*?wܵsT7A" [_.|.{sn軟}kCZ'g&rMLt*`^OҬ-(8
AтavT!#ݯ\(UR^_wA2{бŭVexg4zV_86 bșșșFqD {i#ZkGnqMWp2#9뾜:"0Et R%zS 6_S70 F\0sr=_*,ӫf^LDqLLLc
T dzf7tgh{}v ?rʱ 9/Gr^n{Jǿrr= @or~~PBvP8RH [g ?bV.ÉG[I^o[nYU߿gvs"h
i JCY梽o^u
Ç01ߞdx! S 0{wi`Ui.ΎGgFōÎg#:7z .xtՁ~`T&r&[or&ϑ3`VFixl?w[(koH:Yߊ9sA Su
mhyi2wV '=0R}D#?v}ąP }[7 ꍃ 33 h"g"g"g63gHp͛?{~~m\߉3V3 ȭsz><|H7=ՇN^8k=$C) h|.< `dzۥNuəڟܴ7衸r& g"gHߥ1*}Ls .}ǭOeqջ
| dW,i"w!MQT[?2MC2+};E+`$NE#?vis*5žo/7-&g&r&r&j3E5-(Ņes}_ysWuus81-UG>d'^6dF:H 2m_sW nBDqLLj"g=b"3Iሆ{r։]W.4h5- 90=xQuw@ ygWK~
$b9킩H 1rƗnk7 KM7@$E4x)mL2xh?@<\Ϟ]!oYOLvBt#i|0;2KO5_?sVH
/.$8eÈ ~CgVX&;!g"g5p
-ITA/ ^; VWΛ(8i̗= ٰ, tgnN;L)B Go#%mɚ|3N?mC5pr&ϑ333*ig% spCrs|# @\k0 ߑsNoFy9HZAsĈ)hR>n}ɍwD
) LLLL ;B(1k#Z4WĜqCߌ>Jʖ6.
D%BdvԽw,ijx=kVrq天G:UW[r'FqLCDqLh
-3%[O_(a8 ɜtI!_>Sʻ\|X5Bx7 O;z,e]GU~Xm__mZ5 LDDDDdqHΔLQ4l^<@~谶82I)EtP2a:,"rm`nUA VV*C̨h-o꽻JqLLDqLWFI}hcɫ/8 ەMKnN`L(\?8{xFqǾ~8> >Xr~aEDDDMLLY u8|I6 ! _~'*}M1HC3ŀ}ΎBڮ1i[jUZ ,/urj;Vox>eq5Ԡr&h"g"gG>h'W
-j F O~ sk~& ,ygPRvGp]] v?Y=فd߽pko g"g8ș(nib~Kф x+ ˞/^PkC|
B#ٜƏE3QP;$ !9u3S=_+)˹qޒ=P@ g"g"g"ge bnW j k{dKuɮgv ,
M4qHZdCh@ ~[q_vܿlC);W%g8A)ϽXA7oX6e
-ʏ3T73$ë~ocgx| _|r&r&r&V9f^UqL\yW3/2 \9+z$1Uln[NgfU=` Ħ]/
-^Z:xW~ú333 DDΔxu&?}N5 ؾ:V_ɏde>qC SNး{o~
-S]qq79Jəhș2} *N$gB{
@\ 2q~Skώ UoZnZJbRq/`pDwcU
-M?zg m"g"șșș2?O/ ] OX+}Ov[? 0c#BdسhJT.y`= \}K7vNs)"șșFsT($8jKfó= D+<, d c<'AGBck!`[՚`yp9s3t?>s4(nI>hT v?趹~`{9 Bvh.hw;$3 |p39{-9S!g"gLSǓ3ɓmoc jox zӼW
-40nxZ}5ayw yy 6-zLǴ@99
3338Rin+T
[\R0;^JQyjAy,YSL
|U V;0gGP\WP]/7~3Q 9
89&
-LxjޱZ@ Vr@|P9&.x[3T&7%χ!%~>XT!\k 9t~>9
33Q܀<^6:2ܐZb>V C"nCLܮ%`eX4p/HHÝQOawoA>\ڰThr&m3Ѩ4WUCiwh Pq1P{YCD`1īK43
- y뽧 |)(; _EMLLL70~PGeiwj3
-EWDS*$)Xz
- ,
zMϹhdssn.sk\xh
|9999lC $^ra $.Hp G6N ss@FMy4!Oy˥ow33Q 999S;Ъd?}sND5'y`K Vcu2$X2P^ CBCnȇ5cS+r&r& gg7@';V}WwCb ,,Fi
-;k{{+
-3o; "g&r&r&j3 u8SWDpb,$[dFX=0TkYCD}s' )QDș()-Wm,,ۿ^1
8.Cz惈r+"0}酮FcF'`$Z+_w.h"g"g&r&r\T4W \۰_o :Z_WD
wGǹwjyJe=Aŵ{7 DpJ9899MW%$
-O: ,ԕ)5흨ؒa F Zxa힝Vcg"g9E43ɗ A Fm!joK8 {@TmdV҃{jHK + 09ђbmO_9qg"g"g"gr&V O0+< "M 8VG
-~ !'g`M .qi ǵ brQN욆c-ə(F7@$Yu:(e;xCs- ^UĊ
-F@ ,9999h3ُ+kj5v
8w gktG>tS"۳A`l.(V8>m"g"g 9D$j3ٯWL@ف ,`. g
k
-CkVՑMCa9
Ыsי˦=ggΉ] %
-ׅ@C͕ cl4 txayT %8lEXp9VL>tRr&r&r&rQm;7ХVu*Ղ )һh!?
-a5"lNi~{c,r& g&r&rn'Ri>Y!pьKeV^3
-mE#}Hq7LNDe* /,XVh1 ue l@t&@.øSy^r&rԠ&r&r&Z/SǼQW-9x|$e,
Y¹` `%5w/`*&r&r&RXնaԹL,`Jm , G,$q 0lH Q?=\]7@DD4:*@4 ^QLV vkg~fyæ~șh)cʙЌW8"DBfyDj-"0 Hq4#g 9Sz ǁ3a#B yLe ;8WjecXi \*P4șșGd\Ӡc% PA VbE8 ,Js$8ց2@r&r&r&r&49xWXHr ޢ$Lle. ,#,X `ULLDDDΔ*NhoQeRH3H ,\iz bk 㕲;PLCCqL 9SJ7:}t$G,wwd*>/# |zp>pDHDMLLLLF QqEPH&:XG[ ,Cɀ`,SX4ajP!NԈ&ϑ3Q 9HΔ*%g*w^H{˧K
#Bd&
-aq
"А33Q 9SZLc1eElC}
- f/ AÐ
-!9MDM7@qL){:Z=wG +9rl=ꀱK LYp'g"g&r&Zi"gJmp&{@Lz}~\\tց "^P}'rh1j_Rəș[^*vFa VF*
- 9q!f$Õp ,0ݑmSəșșșșșR
-8vIi rKHA 56xD=,
-0GaaR̈\f b'o醳_HM^FDq7@4"TꮘRLO3LR_p
-L(eÈn&\0Mc
qiM\&r&r&r&r&XN,1LN9$Xk)N ϫB
-| CTZY`o2@}NqL7@D$SNg:eւo照'ud* c uPDCv Z{ꐜ"(n 'teGhCi썄kak@ zcW? mPl
i4" nڜi2ur&h"g"g:IPN~oqeMlP
-}jYRUlT a(RT {_5\LDDq7 k*AgmLA*7/Z~Rn:XY aHK9XV惵HdGoPE@gG# 33㠶j3_)3g bG;ι T)3guKpO+Y[i"g5p 8 0}θΘԎECEƤ*߬Pr&*@$ 44g0"{dB*zI
KS^3B#g"gP9pA-8Ю
-S0p{&={*SL'jVHu#(=\ 8 pG #tFdMbhBn^kZug<̊mwܹl"m";3N$3IydAӂ)L۽,ZEqzU\eǝ {bgEsw| d{: #.ْd 콬H T!&^zMd*G{? l6h ¢V W ?:FEg7Ғk2ge3CL$3
h~Lp^7uo<#G!]%{uV#X8<#X:@M|)eYD()ɲĐ2z4O>2!DASv[f
-}2Nz jU%#P7
-2g欋'|bO.y5F5!GU*!$I2SB)#ɎT<1cqQtkmYLσ%,5>"1+;c N ved&Ѫ!PIŧcSW c
-.{T!'v62dǎBr Qg ,B0"chP";#pg7/]v ]YyDfrmLoEoHN`lRmHf&)/
WqlM]0+9mA_\!x T;fN `aX2T"cePw4OEL2 t Z=vRI;]A /q ]LKgM =+0 EGn%ϗX/zdz@Ԫ('~ënj CmoU۵2i*骃:lERŗ \:#Jfk.̲i%
͝d2 o.yyN.!]DJ i M v%fx @ہEgz M_^
-) `koyo,hPm(K4Pd9 e0Svt80^_$ ! qՄT Kd̲6,pLCm ɩfL SkS˞w!~pz56 }?-ousO(ʪ1y([OL$bG|W]8 hjvONGnO\DYI2dBL[M,.i+K`kە|
-ˏn z04<f C6ޗ0GgF+]W[.AcO+ ,O s`ol^qiw d&L[2JZ[ _{4/;a]4`MlL` J`
Ȍca?<pD26[Pw\I d>i19oT_;}E(Bº` 1#XM`Dk v!.ͯtw?s6T BU~};e/?}dW>/KKf4zi SpU
7ڎ_jֻ/X7sN&ȱ
I &. .`9 Fp8lXU <44U OvH
]vԮ {mO bʎUόV@ = ^#~$q7% ";/1FV1oA헿,cǗv[_T 믽mjxA1,$) fJݎ-\;sAB
j$k
-RlY @QG!3I
Cuw.%?! hC?i|:T|OO8zDeg: k/T)RP̰"b]} G8{J>7wVut1d&Lÿ(^[sdစ Y n/vV}G*MnPBJ?Tg۫,ZSvGj#yaJfe5[`aIE
-3S3 _$n }m:9qD[(;b F@APǣPmGP֛MV5!M[M9G@ij$N}_
dmd%
4l ؒh|0: ,&d$3O-OJLJ*yGOGl8 .vXc.'=6 `1h(g8Nbp
Kqt\2ΌߡpYD '$f[{ogF vy'4sNo q [
Tn̘O}vOJY՝gl#`هwx~4f$ߥRF3J1ہnZ? tmw\ʿ.ѣEIƠ1,');'~~IȰf2s˷M/N;Nt:WW!
-* }Q y˝0&M btXt̵{㌅p.-Ď-Sa >mBO a8Ox;G,7 5
dLX=o?jXVa d Ӭ6;Z kpKA]d
SiNO`,V.we
i_ G>3IyٔI+
-8 tqۉ#HN3qHBhe_8L
dawHfdr[h;w~g"r!]s%ux-ƽנ;ub:@H< +r\d&L3UE82oY5t|&FqEeӱY#X@rXL+%.wD 9y/1IIC
,0d?2 <"`ڶ귍6g.&W.2 e@UCq8 ZO#v~|Xb/fh ڛGsⱀL2d&*` |ƿd\X>pXԪ 6,aZ7&8{N]Sg1(+AlO
-+œNgkUР j bѺx_3sOLq([C$瞳j `2
v04!J {U]tG _ ;uQ?[2~3}
ڠ2 f% Av~ɳ-ܠxbR&=r
=>" Dx=1U77nwׄ2@}[vyxYgPש>r{LC^$6F ,53ws:^n W V~:_áv$1A)=\yYn;WdR/g 1FOD/
-xL,|ܠϵ8zeI2w
-4/^M\̔Nl4 } b);CC ´ w @XWg`|<}$3)tQś
-! |4uͶw*ZPIɰ"XD @`\1|%Yy-; (CH.er < L$3Y}bQپk sdgf'?:I^_7GKTs #u m6ďgEr!adԿ$ͳhʋvޟ!uo{u PPiw֖nf_ґ w0"R=_ &JO ttpAoҳ>o QG@T2`eWj3뎮N s-|^ѮO "#
f]v:#;GSZ2LIsS l 7?7+!q nOIʐNBJRX-4
-.._sRÈyvL}8 --3Ud&*M_,Wd)Ř#,\]sCnQ4 <-|vKq[I;/my4)´KkՔ ľ3y9's"=V"x1hC"<9hsOK.j^& XA 5a%-";K { [^A,܋k
-<avD㰓gkNur 1:'i_VdM؆ϭy4 / {IXGsۮ] yǴזX8Pq(fp+XQ Yc!3IfJ):I2|KD5 xd}vIWm m`QY
7*o ,?̑PɝQ $h
[2U
@sS̐4ߥa͊½YuШ@<Imt+2$ %4J Ϳe 1Ig,ټiVo^|?ǵG `g PU=>bSBNss՚[ޙ$BE&(F,2 (K`*R[
&Mi9zhlYa/=h[08w]mc}a͍ĕaLde RF3>= ?9uǝ 1*_R!ji~*VӚ\os1<"XgYD;ݨ;!q7]W,CMI
-3k QW "7i;ܠv=DJmL `2= 'v 5=XUR% y?*;k憶h d˫mW .$I2^hT2Νw|~[1ZԺXޅ̮m S'քCl_]*Sm _rpWLR73T {:,W m=q@Aԁ]:A-:cb\o{kVD`%y ĹZ}gJd4 l6\mSqS\s v2&l\4'+?KxLXRC[!A{[w/~t{$8Jfyw)?D~F BIY4i'DXDx_ h i3 q#D灀}BMnXĺ
-)j+8[{mY|g$B&i`M2p*U7 Wpttu} X {qtz 6O0V Kܬ- n @ \)42jq4ycT(щVH1lf aD ZӺ!w& ͡eX!MqW.:GVoEsPdۆ12LiKfJPDALIۿti5ؿTk2ßc 35=Sq;3+XgCw{E*u9 tB'wLͨ/ʪFDzp$`|bq V/~j)LH*}˃ c4qrM FT)am
-Kߋ B Xs?%3]&L+;km_Zoۭ_v-Cdu `1.b(CSNpkzF y*" \Kpb|3cj =D" }QvSl!y &\*9=xL% 2M'Mn; (?h[Կ?`p #MR.k(()ۧέZ}7 {s 8qBSLPg# &/L,?xp %Zj;ѯuw͢OH
5gD8(bT~2uݢ {ʪ@8WD`h"X 1#BS7 :PJ1bZQnV"RjZymȝ9JJ4IfYwV ̩9!Ct+B/ɪ`
- q=aA i^H6)wI|w dY DF*/|3_Ն֡)&hA{` 8 NDC^RL%7M~BX?-.` Λ&;o%kc0$3it&X/::[-T# Ο{w+
¦*XJX W cFךZ`Fl]ʘ
_6 ^Ù$3܃"tL ,_n&1(&>/|z2A#%LĄu;32]Q| u"X .v0d&L)ǩ@3sv|-W|h>=9O =q*S4`;es*`Ek謼~𪐡$3
d0Ү `m?%^XHHS kL5,5C1#Y3 )d1 ɋ zV:y+Ld!N̔yo.zh|oKK"Mgme ٳ0L6W.p3~ncuz S$3acs"Vm0=E 0%.j3 $Lt"1)(ę3FSg4~o,zx^c^oDaY3@Q)0&I2SfHfwNs{&,AbMuv4 p.$CMRTAL6g[ӘoDE
sZG" ~!i:.9x{~ ,WVzPQ۳2|Ak0 j|Kʠ_XN (n*&@)B7Y4(HMfrS5e[BqR FYCcK_H̔)cn97jo'qlx~sf}JmIJ{/ z0uhK wdgw-u?l2@ȁ Ae#Rv ꠟ(½6 qk eҺ a`1c;
->n~T3DfաS^G\4IfJY(P2L\OXtOFtA~S?|rB`iy=|fvhzkPAY ^ QOe+=xBLa6"Sdv^ P0ȒQ@i EMz '5-Ӈ($x֜ ?"Z{2@
-z&d& 4Ct?f:3v:Ua}k}_nRX{&@j8XcC^n닳w )Wfgcj/fSO1MKUs M |&ׇ^ FI|J>@]j qOxjnO"d$3P$3
,ޗf4TGtX`nY)+/vͷ K`+PZMHAeyS^mFd
-gR}^=yJfA
vY}B~+kx ehR\'!>1@Jlrr=dq1Q
-E<-wcgܤ.fd1ݝW3*#:ܨ?Yزp9쭟}q&MR Cu1 !T +/vnp(2
)^f$䦎@~΅[")S;y6 PWC
-4%M2Hf<
-7\{xY}8ҷ/ 5i%uyߍ_~,mQ++{* ͟oufaOB)j d,{SQS`NDI0Pk( \>Ǝ`% g jIEYپ`j6PKZ@ w $]I2L*qõ߾уUu0U^(ܱgj^æɧ6WP/N{ό^q
-r&UZrSd|)~'D cDY:$S BA Cm"f3ijmɲ?`/l]mHp$h$e
-plJ`t89?zѽwm_V{]A[ p} xJmp|D~1Gjxr*w y
%o YB.̘`3m166zL, He% v @VFCDMHrr}DV >O S e2U:r@!;߾;>+uN(l{g JEmmE^gCDA8kY -$3
OlA
,4Dl*"X ʴ.Dd7S }%{&58z1Âl]<$i24$K)
-U;ߙ-z7B] Y~
{-u }Z Xi.>y쌖[h M ސ˕3|\R|A(iH
lD,Ia")@d4Xz-[(ÂC:
X ɴR?iD6Of& \HQUϸIOM'?H}/7VqQl|:U=Yd& c]~33M~v;
w l̔~E[7Zv@ A2z` ydbrZ3(joHe&)i`ȭR'lⴟ/p)7!Pױ^*
-WGΧ胤̙ Ucܧ@x4]**^=P ̔Zm>#52$pݢhM wz FD +c-W^ $I"fKwO[םU+skBE|Jw[s$n5tGbv%:c^F ̼ &>:Dk) f̔A! [@!Pl)I.HR$kJB00gtWņI2`d#RO0x7~67?nC!lb7;7C$&zy'yYo bW> s1#oͮ桋Ovf ̔AFdIXHnceG\<$W>H a <
c?TBCwʨ(?8 ^>-08 %iS2j -=6ߕM VQ@-PeݜqR9x+k k{ %3
Y8tBô 'r#]f,Գp)C[c-`״i$I2S>0[#_mȭq';Jo92o!lǥg 6|?/"ȭkfk*~{2`>0 cwGcO~}vK/? ޑ,K Ε^-\x3ZzG \2S_"`
-!xN%q<@5Y<-i a)BuN֦nj6Dt3Kf'5FNMұor0QVW}Q*ۘ~͕tVz Y 4LRiX,2B&VAL@?
- pQ=brBhi#@$`fJL*a:\wc|pa myw: ۶ ^= #C-5NU+~\Q'>])k ]
<5&l#d4X,p1xP+Qڸx (h IIco'_4CDÕ qD3d "@Y1 G^& L |0ݓzM{yWoxqⳐawI6r! ǒJ
-}mJL0v@v >8̔(N|z.Zψ!Um n@Ġ@!LfNLAb`tB@C ( @k,щKhv#3%3IfJ6
Ió8ٴ}sŕc~8kf ȃ/6x_'Ztq_7£ΣD234 U]o.䋀[QXXPPTTU(gAΙIDeL 0d£b懱,Tgl9YN☏| Cz6`!NT*bӝK8 bܓpv 51$QdEȂ( Ù$37
-Jfƥ哫rđ ܳ3$~R /δ1яn>97u 1iǴL2EME`3y1DOt6#I=v ?]e.:6h_),I2IrTC|[Lv)@ɥi Z*X㈙1 Qs+DDyuN3¦ީ2BO&L? ?vV *y}o'=U0 it?g}z6dl|nU/ A+_ R*) * sn̤AjzA``Dsʙit-Vl ]^,Ɖ _ .zf&L?EG3l{ߩ,&Ǻ_x˳[z7^u0֪?&JKJŋs3c2/G˘K59fr43]庥Z/gpbsA( 8.OETk
-E~͇n٘t#Fiw Tz@ mt]
6f Lm'?_ >~{[w3+71B! ,iƚ[ShIg6әI9[~%l! ̎/0<@!mqh_u5"]VGVyopR]t7jfB3
-U7mgۗ=}s[]Ayʃ⇳Nlf[#=[k |rn,%#ZZJgX1-) ņ$MLڼ^'si#ݾ(hvOJ Is$ 2CA
hfZy-ў(h+p -_x%YBA20|i }0Z pK&L tqsܞo'ypٖF;Q2*E'j#tu1H8@>8{6+)D8 \CivE̤I3S!) n49<{~ XW(az!4 a-ii?CW
-(n&UK)>6h?QfXF+?fâҸAj gbd'eԒș6Vq] sG89xf*61pt3if Ċ4B[^4&g =84i43-Q.ReM͍x!XJ].w$ {L`u!)BUFU0 (+*O& h_QZLK3S [m8fVݽ&8C ] M?j
-[nIyIeg3%Y8Y8#ULYX#I~L.\I5vIep`52fUW&VFqZ6Iy?Xh3(|֘E lgfLvK zU)җ2X d\ ``AFEIlLNR`w3VFehMVL2#J3{DS)p\jf̴3-` hv?ۉrBufD0&e0 N$qLdPs bkZs
-w @
f` CFw9roJ ~)%B-̴hb.wܔgsw$ߩ$0=1V1RȄoΜE&Z6f*hc=)+2s\7MMӔ պKWx\szT+VÀ[3St6"C54 s{C~YJT؈X43ifZ*̓Wsy]qGg%vL@| <Sv$\&e
-h@mTj2ƉAXL@JxX%Xhi7 1&# M9NxGx#1O!]F5qB6`rq^[ַk# {k31+۔ K d?e=aI3Q,kn32`X̤-
BR;ʹx AI3S##]k/6~H4B vfsfI5`MŎV $c*IHb.tS}937 " lOnFsDdgK_rl::uΝ Ldr ]ߝ0qF묩5 -E6{n h',F9m7 /iٱ&W63M+.7 )] y3[vHʼn"-݃mЇDJeCp֘bJ_ښkdi$_r2S!43`y#raa &+S[dtD|TO`B }ciQoM^a6kق DxmgA+\ѽ煝{l/gfbHDžijP`m Hj3b(d?{s 0UL|Z
k F`
|@jk_lhQW
b%Wlpgo &tMF̴C92qpyP=}gfa[%1UȚcZwj9#wQ#*;9Ej|ҷ
hzA0g8b%X4)928>`_wmT_zܧPqP(V]ט+ Ux¼U"@`h ãȀ
D.i92;[q4aF ${;5Ƙw
Âsbʱ5%L!GmCf Jn2c'j@OMrj1P=6 .iƮBf27KJj
- 1
깾Λ+|0 "JHľM9 kcDT]PO*5ȪA`އ1}sdYA::NOR{/?;;qΩH.Lô0iq4ax&k0 .L.j#D2 A!` nHbf vڵ-N~^3fu'9:o}ϏXtϟK7wvp/m`%ZL;ޗLA! ,PcS.T7-6>y"):?/
y=5[ 'R-][*VCho_y^:Wj/LƷw W3f%xtFǹɃr/3x*J`- E3=1zf5 ' 5;Yp%Xl{y[ sӟDc@hd {R5?dl\K0@7bP/w:scJ&!K>O[^6T 6T>n;_L.OVeP*b!
/S¤`s8*aF536Gr[nԽnȻhfRI3'go(W{g źg*tZlsE N&pb];
VҨu7lp] rnX)F@u
7mcbso\2O B" 8?a
- DY~JE&
-DŊSuf&u BP38qd}bnhײnf2g]2Owúo$,UBց̭3v&FޫEczejs
RD(A_ԤM s6j8GOvMvJgs*j\u(10P`ITc2y ^IZg'+0euktfMTqb8
-c)O'Ή43]C{ bxi'tWק$ɛҥt[t -^ R '`IW7J@rZ?9fZ>e}6֓jdy
-@݇zxkL#iŵF<>}lϏ33y>}b6wf'ykp3ygDa)ц)XJV`- rW6 nt\K6l(`&S b>P|ƻ3y $0ЇE;BX.e(FE[do32nbI,m7iyVUHSM| p潩ާf \-M(1g8OC}E}r G+U/4:ݬbGiu\#n]6uC:f
-XCB|؏\kҦwrMEL +e K@pn@ݕ: YuܹJ]:V|C6fMsv)qTm7zK|=_ ʥN(~>\1_!*9NMfJ:v&Οʼn
-D=BLVGj6I |fy;⾃FY
)ӊ&LO
-)^ ͩ4
-lE
-M? P ,nlavLkbݑQED ,"fM8hf̴C^Rb};qAq`'}V%'{ x|˖z숟{nf71cELH;"]wQ%1|m `٬_):7
sa<
-x> ȏT}4|IJ6 m(30$#T H"r4GZs5[
D53O' LR) Ɖ]}1 ]?.THz`#} smņjgZ!XpZ
dǏs{4漲ҭ at\_m#/TB B 'OF+FhZ(0c*"՝+f}R^}ζ}8-T?V^]Z #\^fja
-jB-hVw*DXpt)#k T6u'ɷgk+RMїꒁkWSi
-,: 6LTl 8H&=By(%ŤW>շP(rGbp70]FBujF0 ?V@Q,T{_,@= w_ݼ8 )j]LbOEK݃?XcRD(p/Dh@cqOoũБ` V3i&Ǖ'Dڼ
0hL{^"䁁|n[kXz;;M\cs{Sw'G~Vܺ(2,Í> E* |~ *O] 2IL/YGڂ;^Qȏ$
Q =),B0gD ʇ%],V ` V3i&ץ3$ hf z]i M&9=btӽ78mY0 O~cnwOu ,\P$8Z5;_p_ `Ϩ!f> b+sqYM-R"N`z|x
L
&P
5 %s6$ I
mѤ43]K ӥn ̾!=o3O=3qnIkkBxe 2f\]4.40,i`2-9rxhl4)o7{Wi17G}?̈́~ \!)Hfr(;@0Dꉔ":І#J`ބ"@E;(TF*S`SO|V(U!f&m743]gzŬ)$?85S ?7tJ#ԉյ1\]\Ș^DWBm 4qCB;EQ ɏA
-sx u. 0
5 cAP ?T#$_#ErrPolRudgD'4̴o`3Sā:5v'
qK]k|jD*WԍCc''i6xGm`\FAU H " 3plc¹{wWn>@謢0Лb&^ "0Rl8[+jA_ f L0jAm^c͕ngN*C`It Mf&jZ>fޠpl\xm04v BiZIZO}4N^oOZg pcK[ uj+jjuxVG!%@f{kҲ:葎h
-`C И0A
- ('Fc<)m;3Uee` V \[4A[4-t}\JéhҞnj ;VU$gsg ?s4ޖ>5cH0kӪV=j| 5$DK?溜ú? raZ/жw@OҲW;
-s
EB ?H!< tCdѥ``2.l-&x4>Z[͕5j b3hR' \3>NٳQ4 f' Lzm~~\(gdX2a m-E`^֨%sQ<ܮR
-{A9 䌄( v[egmd<:ɴI`Q% )ݰB~7C0_60$,1# 9TSX]̤-vs_s=437ᱻhp 5/Wf]xޞOenp^szrffjgv.R4{_s?_)Eed|u8.C#R%D#e @`,5O
- "K#O0eOwBHI/Օ֒ژI
o}Ϗ ;T
-᫂7ff43-?3 _ZSTU%iyϝ|3ĺ-u\ _FXJ{;yh3l sOdSl ;[FwBۦStFP" 䈅O^?"
-J
-"$#>( ~@WLcbLkK *hv>Վ3sW9ѤxQdZQs>3(*5}{3\Y ((kV9µ[#
; γFq+ `Jq7yw\H._ D8** AZf% 4G S jŒ#eR}X6` -݀f&L+%^CO2h7~%Omn^x!bY0v õ07;g6KJ ν՝P[1VpE^_yL LG䙸hp7 ,FaUPP0hY)GBޫUZ)@ 1j;ILM-5LESg43E |]C/p*VK5_:t^tu2{Kԡ[ڬz e;E-ZpSWw;uisɭ{#W
-e gm@wL9],6b QgJ$:N`h_[t;+A I
-W,H2#iI@ e7I43if>g[벯b0ܗ9Z)ZJO>恿 n`0u{] U
-6`'j Xr]ts\y\ڕҲg?M(lє.N!>*xFb[ #0L`!AmA@`
b =eHZB #IڢI3fuI)ES.ǺNNzw{r7> {÷4\(kuݟy8ԝ
m&vϼYV4aUS!G
LFfQ_+
-Vyr<{_e W,NJ yRn3#0ٵ>H! -B(P[|TY
-Z݀w63Eo]s9唂k'jd _;p߁' {T79Gֹ2
-Hn7kwj)CWH~+Ζ OQ %ƠpPm'Ps
X7[#V'GG[6z u@P E4t*3ifҩ&Lg҆}bf53p^̚-oO Fړ ^kG6bW3KFo٪\ ' 1v9O~wjɄed ZAHjUj{h_NV6~V-ↄ UwёBhhf̤}[K2& CxC6ng.է 5F=>
-yG1Chîw!ЎLFi>d@C}g, q g,ozLs9)z2`Rn`JPz]E`T~8}nPDF%B<%̰]c 1E34if̤)z|i cX}˨2,`]Hevīɋ
H/SeW4%չ)X;Y`wf<]D =rsb%.|cM,9{GD潷֥VZ;Y$ a@^]_d,eghPѩgo͙kJsa.'-O/.̻^w
!.~W1mf4RDdш"S R>TPd9QH 4ʦMe`)M 4 h٭ %rrf.۰1Enw{3AG:{P!#+oC
-x:T{ v>
;NV/5l\f~~jv) Iن̔`̹
,i%%*>iQd BGȨ\JV!0Xmk `"̙)grfH?zV>pG
-NyEK
-Dz]zү}u .ftxO2!+zg7`~
إ%OD u7/; ̿T=z|]ZVG΅m5P$?1iH0 ٦E.l#Xbd1=#P` sfrfZtljf֔zzz
g~the zMD e~0o =C7IYOye;|uA!##m]sC&fy7/SW>Zw
-})"ҟ2D,Y2 {9"i`3QL)Ҩ0$! c $c8fʙ)g<)giԼgw_~ٳk6s KO^߲fh}Ֆ Wqvi3SI*D9 !H7t3 d~ɽ
qV̔}PE'0(kT#%E1!R9" H[oPV7# ` _ fʙ)hʙ)gn?t|pI'0Ћ]jF|
nٳH,{|u +|0F,⌇&,+JjUs}ŦV+Ι`il.u[hOf~DB7/YeK7Y38sO) Â2ltL93ewVVl5/ @ z{sľcΏ86 ECWmzx<Ƅ=* T]Tb<,ثo~{`J]¿O'?h)%Lg Ime,̃Ș:>Ȓ& ڲy/8u[2>,d.73SL93-6uX@G X{ʊJ# 麽w11ݧhPxʩ- _
>wEhT<$5]]߾zMauёuu̔c^BX粈$ &sp-H 2 :f5E=.J ,
-1NZ(Aw\n O̔3SdmYKb?U;
y[Ϻ>0wz 1=
[ ꑗsC)ż*g^IHۡ5 ރ|p/ ƹEk :ȸy{F`{UkWc"@#e_s >/ iLH. 9 G+8Rr{ThT!Qp! F_Cu\>.;䬗 @%g /x9-p[o1ա^_=9f˟>t'>.)h`>ʕSM&ŰPj , 9#eY~|\n m̔3SLռҎg;zkj;N[>?.Դu? 8T')\ X 8C]y:'5+, z]w7
-E~ug]B,ZE+s%e TB>y?8ew[Gz(a d٢6$6Q./D@(X93r93[rfb GN7nM{& :[N9xO6]~q϶^.#SǛ,c출 t&luׄJ_e_5*8ɹϿG: Ц̔` IyM ` nLq,#
-,,Ab19XR t` ֗̔3Su)ښU~xî#'Fݷ y㫻οs} ]e0BH & APG`diRࠠem\tѧ ytH' ?t!^{;/fB{SJՅe|md b 0q e2@e^, MӋǴ EجT 3SL93̔ |bC!)ϸg8v˶vs6`+OVL6 o{~mvӊm«$]):02 ޞ8=!k!Mk-ڄ<ގ'9X=H 93̔
vش%^!>?kӓ/4m0
_ʹ$K. mf~Q
- h
Bɶu:yְn;v$Re6cUY " o|&08^@I E̔3S.73S{e&b`V_^&|I *#ΠtLB 4B OEVBg}t\]]Ũye#Fq^7/3$O;"AP8"#C:EL ^GHeBAܐ93e93̔3Ӣ$glp )+ V `%P̛VXAxR%
-EqKn!ٰ6#+S0Q漘 ő
SMMfJo#}
-) X%crdtʾN3Srfrfj[
.s9Rspp%#Oeqn!tQBqJ= 3x"+MH@K|k`4Dff: k\`ǃ4C_d 4o&eleQMB`Zr9+rrfش3ܽQg2SL C]ǬU$ AL_A*1_ۭ8)Π_y^ ur]d4=[
e Zf"cd~y_否r&QrD˝pT_U?Vu'/P u.g݊EĘ2KK'O! G.t8螬
- pڞǴ}eÌLBs*1KԺߐ`@K/#Z ,ܰ^2b-ж չ̔3S.7 ޢ rRXE 177ƫxq5:3ynr*cV*3!t8G;s2M}J! Q @
L#/ae@a1D
0 }:B]#%z aS.SE8 Oc?`Pr W͍q,9p qNK &l"jfʙ)b8Ԫ
-^i 0ĸ f6^E W< .:02i2Lz)Fв] QL':WtBD8!C>>DG^+ aZń_c+K93rݮvz
-
-J3nYC#ub1Ȇe]%W L!(%#Y~]*
p;c%Fz|rV:!̔K4(nWLa"
- ̯#bw_rD$bܚDM zjvjw EŦN vw3zɲA0P˭Cݔ k*\veG h4a4AM` M/}Go]0Aӑ;(3NKkS
+EI{A+a Zk!S{\ EH#/;~U4!b]! ң?,Srf:
u; L1}【Чؾa6'DK)qTn"ld뗕*~PT ԑRpYa446sRDJ0u Soo" eM3r50ng
aj1Q }-2b|"NDz04j
%"2 5/"-f-+ %^:Pn%߽c@U[S1 1.)َgCyՠxV̴#VpGD&#~"ˌ5ny6P#aK~3SGJeWã#A+&Ac?1{LS`Խk~\^uOd2f´iYFdxBZ!fu([:;B=hA79FXfFfMH:, %=8,~S e ّrE9hm14 0 h`ً~Aa7;?J;+ɩ]uIG D4SXA bu% ` ꩺ:]et]O
4aA;KɅn;GFu }C =݁9/fo@f^ҭVVV+d@I`ce!L (2_dBÉ@ܾ&))5b)rI4Ղ#w ?{Ċ.\!T |XmkD lV *#q8
;S
-({
-B),
6&7b"(ySD7MLrjW䘍*^+p!qU}7G80m@ g9'?rdc9C+6Ԗ :I/ WśYGȔ-uDa3(҉ &h
gVpZ wͬҜ=ºDQ-C. 4o
܌EB /]+ %Q9K_
~rhj`vW^o'3=3{[`oR)e I[V7/3Y熺mMiN=IIa\Eb2@.DW8 ɋ VH xD y my/gEzU}.j!1 I`G˞(gP"UF7>on.f7KQ$o7f<${ax(CX,p42{ X1| P6(d
08F1
-i
$%ڷTvwOx\;ҭVcy!dJL_YQ շm XE)
-E9l |cș)˸(K{ Y9]Hd5̓ `AB D-){@tcI7=Nzp1E _=?{ ,UfJ DaʄA`ɬ Ė٘e"02¡M7X8R._ sфj0s^a,h8$vo}ǡXɝ-i HԽCJf{mjrUzlpE'/~n}+K4)˒ ⚜2 %G .y$!`HbBAYc %bG&3ӉW|e7.[ um{G-;Jp)Ѫ>&1H=)Cl3ւp JH`Ѡ"\N`vF4 5`3閡hjZ:r/= i0s()$\x~}21:6ҫ8cTZ>Q t){zș) ak f3[VCf=Ц)H#ʙ3~Kop\D_\8TEPe122:Ǝ(D37+>2:`,B`S֦eZl9llG;iĔ>mK)8˨kH4xmw5ZMVլ9hM~du \TS(&-a,(|L̴ û [iH Hqڛ#4~@
SP[0}Ԏ7GD~ugw[~GH3#KX=\i"
%q.$ ,AB03a e拘N`V K躍 {ahZ-!
- v-!'Cl|5
[52:.DĦ,ȁ R%8S &|?`(BVA*|Y
Ȑ 2䦦ET# ?k ?=
-\̑{ouW~ w
-`\6!,Pq$hW b\ɹˈ{5`x}=r8Mhu,0k~Rd]8x+Z !IM]% + c6jՑc
-ZDF~LUsW rH!}ş/= .:ѫ\>C۽z(Ȱ:,5,ab_q+,f~L e;]̏)T8X: lH"~
-L8f!¬`EG]aKBnP^|[.=3'ɹV+ T}="2oi Vx)ڞcN ÁÁS#CdYׄyr xkAW93-D?;` i D Xfʨw=Z=+aH TD
-BwJx?n vs0Ǐ]`٪gmf9YS=EEKBioHE9|%g xqǦ P V3)%- fn #"2;@ m}*م3#Zu6}s^u|RŊk|廸K (;<=(dWHB `U/LH#
e~.f $1ۙծYj4=?fI_#@kMDW6^(SWxGƹpZcr9cCpX!ٔӷ2QN&Lh:Si^{~$Bg|MR3cJWg٢"5/c u*"I>AFW8j#D&j&aϟXxȖJr,X-bPOp,- 6ͷ l4.'lhTt`ClD !b]FW'34Y!= t\\,R<^P@(u{mMp؝]ƅ8ڷ\hf:SFbJx0m҆81_4Ze<
-cu`#z,7 ƙh/E$W!ZˎS3 {u Ų ^O
X.70Q߽c?tޞ$f{ ٪7w<:/ˎkBst (C(
È1LFl"[X`5kC_$o-Bf\n^ >vh Knz{/N3SGeB>8<9IQ B`%#QDWԀJ 99Ez>
OS]/&D{c
⨖:Ml_X̜*/ZWfRfI$͔}ɰ4Ʉ XdZ $xDWT(g,9ӂ: /xbѲ,FWl SF,9fڬTmvywe 6f(k6ڸIK4=[Oa38]/ZƏ9IJ%2*8?62m9z߇^Y(gGv%+o,t:3e;V
8 "$ɟXu$kFh +Td=8@`[Ѕh n=
XKR{x'P*b3zvŇ"Vg'ombmϜcV8$%LpĭcuՐ?fX'E93<XHXW5Db̶@=c: M0@0D 2-Nj=T
-$
-KL U!26%ǺV VI4m:Gw&4ko<G}k.b>.nM"aVn\潩ݘ){O{[ #xr10 5##WK4%`[bۯ|rosSӎM'%k
4Cabmc3 !V.V6zLH-ܜj
a
Ku$=5Z@9~LluW i٭g
+&{y TA54sNu'+\
-o8kWh+f~ oXED sE\)* v. [?poB3-';0Vۼ<4]5GZSV'B^(`4
±&2d.0k4l&,dJ2)|Nhnkӛy \[qDɕ]s_O +d=s{￨uW ]~}JQSXΏyqpQpCAwБnXtB-I)l2r
-O})J1F XdZ"'ੁhb1UVfT?lQbXw+BWo2<ƫځzN̤])"6=Ϡ)a2"-a Vo9Q}0 ud u; kz@I4o ^P%(ͻ^z)>1/.?wuIv# |d1O_S4j 8BH,|:y
-i~T 0Y
-qc[0V8AU`p
ȺyO93- *P ZB3Sэج9VH&K
-8SuGuJ"s7ʊ7cN0Ȃ%A`e2tYu:,Шn"8V
MQi" V{H4-~ݏߵonY;sYɤyl~STDh*5_k GdDf:Ua6 R&/
-Ⱦ9bLQLm 093e4PԠъ Ѫ?^
T n&391yRp,Փ܀I'A Cjq(B GEl E~!]gvVt%8!_VgH4w?t-y3?ooyc |↯N1E;7jB c !paM5=fG =DG"?b0wb"l84 ?rB31ʙ&gLD}jrD&IT#vKY$lՂf闛EWbVQDc2-^ Af C]PcF8&q߇_~> 'O֮U;yȦ_#X*t]>n L'3e?F+h 2CiPK T ؤP'U"v剗X<rWi;y<ڬUiMW |E~3+63#N*f0E+.$A YtnQz@G0I?WVnXuɜV}Łʝ\0X/Uz6 { U._o_̔=D TUQ(( 0q4n[y5
-F/v8?b1{() Xd,b<ҞM93(|5^Y{a#2G$f
Zt9 XX*DS?W^4&D"4 t#Xh1ګ-mb`hĠ`0ST)`
W% !80 a34o5*u_l姵 uOXX;@SxcQ*<%4{74xHG >uko녞s>l'sͶ]M/Yz^^ 81{dMʐ3֦Yqt ӷ`w"<鲌
-Y]CLDl{]P#` c0b$zirsKrfʙ)5_MS
l` ~ނ q8C]8A;,1wWf, ={ۦ(~FiS4J*̔PD{Gj;T n1&hB72 $ CTH pHO'Hc<)g7m=H
Sa #5iU:.Y&}(?˿Ќ qGDU(y^e+>`i 7Q2Xw$[`,4!M 0-˰iShFqE%5/qG
a93̔_SMQ"FlWeMK l%'7ੱBQ~pbaiw r3$aX=ڗck%bS['˺xT `CLpz=B^S"Y"2#2<=2 ޱYSmFKqF{z=@oQ- 93̔3Sv{eW_ˋu3-D"' s&Zi7+ = &xMSdXewW4 FhӦIa(MDP
d 4 wVdlrŚbs:&N`Stf91PYTYpD_rgKEZr?; o<;ŗ̾ҿ뮍r{InXS^^"oGvpGX\>_Yfձm(t9jkTWّ)RMǨ%\l.U!")dAC=g ș)g>Կ$rsNDĉ1#\ILb&iM7e &cuEd1pFӐoͣ 88yYAW 3Su.gv}?G &bý m ɎӃ
/? ިw }Tֵ&jž̖ŒYuΪ+V.8z DShOVj;lA5ɘ 2 (طc>>e`I&3Lhrn?p7,CdǠn f|bpR o=rUգNi户GLǧJsW0̄
L `3LQ#ɀñ"!DĠ8[iQPXgp }tTwxWEI f`&
3L'# Ku큚VI=0y@Ck },YF*Pn; _n f`&o
Ѹ"XIX7pr쮕 \p}Ԙ?e- f`& f@L
x(؊&Q,"c7_s/>({`QEDfJ<`&T4L0"/S+2 '7vz+/m 3n:2UWw fPф f]bi[ _[e9adAoV`D6[fݩ/zØ¡n M0̄&
L!lJFhm5+9CZv&Ze/v^^DfB fP7 3L0SCOmխx?== p't{EΛ 3Li4bW*yϳcS"b[[Aqy.,~gXUbVo9"vwxXiLP3L֬(ؖWahq)#O'$JYϦTʥ'P7 3!3 1~CDR`[ڊmm*woSEF>6oh$1J^erQI
f`& M0z~֥W*/u3'=bKMBX=k&B+K& 1p uL!"K͊"zV? ~YBqVXV} )-#o73#b03L0wTK6DL
Ŷky %ƶ"Ib͔Y&>,dUf-0̄&
L #,̄ "ST[}fx bVD:NMwѽ0̄& f`+FX䧳"I(c[FlHe
-6D iPф)v`E$m7k9͘GxlB>0.1 fP3,*Yc[IVP̄8`&a&)vQ`ݣOI ROǶ(R4-& f`&T4L|P$,#JlBI Bld+tua uWtk
-
1p f4PjH$EMfHì@c`+ZX~W]993Z=tӽ P7)AlLwDŶۊ [<#wJ^Ek~ ﾸmͪs|j`.[[H_Vu53L1 ̄HKBC4ؖ @ϴ*0)`.,2gٛVk{L03L
Sz}) ZM=՛{ݯ%|lKnj!%f#WO_zhQzyw_^[-zUnc&;eҿ'=%an M`&MS"zsD)=*D [j\_'l₭H:V{Z xkKE_ .ö́&N! :U64dT f4/]idџd
ĶGl!M̧ZvgL#
7=x} >9Ϭ-VESPn1>d=izn706,Lh<0̤p-YpIؒUm!l4 Lx#`ГuX |MnڊW78]$J(:,Õ{ :n{
-n>fBE̔F
-U +жuE/mqHZp1Wqt !dMJp
Soq=?CV |4~NE9?Fn:8v7GuC0SL0"M`{][{t
-3 `,rw8P
-m[h":&
_MORx{4ѯU -KX8f!`:K;uK.6:ucsVC+Ygjt7NSue' 3 f.a/N
,ˊ4)) eyRy
-l! 2r!iI-g>uQ6N5>"YyƜL1O6V{U ;$c >k z mmV xYY1'k/ -?Euʂw*Jpw ITv_emUK1` |wk%ARk/Kp;[|`&D`&MZ/98~Xƴ ycs %Μ03wP<b[X}\DZ6~ =_zm? Gܰԟ&GcUD:4[yX])(M͕on}Бa1sP!G tԵ/T_`RUuq煊=/ϧYp 8̤ yMe>on9j1y{R/Z'g+0oDBl+ 2,j /sgsx'g79F.o+q#
-;jKw>yQhmnp =\^fȷr2' e%:]_A *00'LKl`i_G:{u{\ͭ_^rSm y-V[ l֑+mĶ}tvkr9RdQ W+(ֆ?f':L遒 WR`Ig*fgMI]cJ H +s{rFΘ4/ݜ m|4ܿ@зt0gUhnY伐n
8j;ё 2ls6L(ۍU}Q OyF}~TfmϽᎇ]7Q2H3`&)"OufoMRU(0'|o:٪c ]S '1P,3% jO 6Dr?*?
-̮Jgϝo
!5e!FŶ[}TZۖ ^O#"L @RU!u(A2$ !bC_5
Os}ŢKW%b[#qXGvQ;k;9L4=0422.L@z e0RN1,EӴlnO&^23S4S4]ێϬ(켉$)I_mS]v ql2RT唃-2%n|Ęxڋa3am;rYy$IB(j[l4i{M^=-Ď%ƞ*E14PX!a{TgR^ )4CQ¦pާ Ii*4ֲSs<{S7Ҽ54Q-ɱ택AH{+ftb҂k9GS?V̈́m-{8z1 ܳiYڶg4Ea(V0E0J,zR7_inXq CzÁC/կh:((nڪCgUS5]MGL否23]`FOn> {q ڳLf4,}RS_<<:8+ A,FC14q tn9Q p e\ܽӭލ͵dg[gU*m!R#1E jy %@bAv>:Z/mmK I1JCs
-95ƒ3YM$车[>c4,
#ɪ(CO>7ayɴa{ǡDo۠')MT Z<$ض"H R*'$ ) J70V M M+,*98TY O$l[u9 KWߴsQ^;]Zw /^7}#gwCVf`y ER4ŐpLUEMנHs#0D5ŭٙQ[K=f +<+yu'q\-a3f[9m:W ҇h˧.xbVDxB_p F!EQT5- R9IId% ` OjiyYH@{a-mkڷ"ˊ|,{X6) fl2Ód|2%hc:JL/[4SbH߯xW?۪K{Ǟd)瑺 N ,v, MOdB`tuśi^lr8Vh > f Ny @]
-T-a%Gz`{^s4+.?0gh9!O %?w?4* m=
'Lef:!P%87} ۶-6A1( =te"0˂G)纺ɶt$:q=U:3FzZB<;*fID5]23S$rK+IJj>s܀d
-
-5v ڕ/EY%tp}m3i4٘iTBUdQ!鸥q9! ɍ+=
-4^]cl-9݆b DR:xVPƻ&7.&5|LQ 9|
s&oݓC5N&|vjjC9(LfE-M~DB0 Pv ~ע=<ǦRr\XS/ߟ ۿfɝ9MJ̧a7 1-C|/?n\Ls+3ͽx7V,X3X8əa0_:(m6R+pt r5G9g ڸ¶a[l ]Q-OV iD@! t#Ԝ xXq1
-뚫r] 6TUۊPHwFUθ. d
$ U,j
ލ
-ڕ # RmB9y2v6! 7pUfr.IE3ΞwQ
%S9UV&8}b(φ\)Dm`G=3v4>h͝Ĉ |2 FA+@T|lbim lNJ~%bG_In^biY| T_w1eHN++X@'>iV1q9Rfҹfabމ' ]' ZH )qL eUW3
- F,=d˄adJg9W
; θa[-F Lm$3IOǤDG8FuON )#|DSoy4̈mQ4],:k]=!7JmW_'Tx}z] [ّgb#q.8a{9mX3
-q({OZvY-|Ѕݒ̪? .uTUx< ,y[nSi$)Y1
-xN_m bKt,LN݇0_WsVԼj/o{`,b$2)U#U#C A_m )&V Ұ9BZqq+^r =w7 :MґKj 絡*վOaI&xJTSjfC9 H./+3 `EDZ >VVɈӍZ, Blm
Wc"'F`tN8 .4 zmöH
-;8uD
!UPhFi j3 B<H6LJ=KJ hZdϰ4Mt \qeѡؕ~VW,7/2H ܆"td~L< O]:Ie:v(, soKMJB \"Udv /Evc#ՁK>ETl ?{#X< gK)jy |p?TO(0 C]5mwg:x
-o_mfR'ض{Y濅ST=7ܤѱTߎC $zz,aLKR$',hYӗRzWB]~w1;Iph!]ꂣ]0}~c{w).
Z 1^?wNt Vߧ>/cs EQק Gv4/39o4vݗ?$`X;oo
`m=Oj.\ }ZY 3oye +A(B=ޯB <*sݚϮj&R瞵"?23]t/3Ӆ7=J`(YY-hXjj@ZîC>:?ɽwcm:k)Qھpޛ/0c3+`ǜmMHöfn @0bG,8˒' TA 25i4)s Wݱ $Ee*"_Q#f5 .qDZWSP$^`wخd.59*J IUVڦM#8m
]!jNr8OTH+@6*_mH=F*0Xuf c!4.A߶;&3Z
-u*d[A C.[pdc?" HgdCoϿxDԪ vbzAmh\MrI_(z(3S.Fj\ GUwV\MadAO2q5hT v@Ep۶!aDc0 N -)FbY%}ogTgl0\\BXH
-=>l#!¶ ]5K Kb*fe .+kBUn`rfςB:NsNTW
$)&,@ʠ'n:$ /5 0 CiQI":%
,< ZW22IfvEIvTUQ,s\t>3Dw揠X,D5I c@9zh[M/'3X$ vwJ!B -iA2)tUVXZBQÐK*?v .qcwb8б\rx>y@l٢(5 <} '0e+ڮۚZ";Cd.JS_;Oh0,%=?p"/oa> D}ċ-E$AQY RN7//) AJ?ٰj]|KDz,E k
--ov~:8"`(3E%pfKW/#0V_~\BY,/ '\N*BA%O 'gJ/ V0˗U3Rt0{~:wؚBٶJmsmȫ`^
-Ȭ` 2hh
yW#!Q1qTP sgʶd$S0,. c~ĝx2^u6"Ț(UӶD HFB<XRxRHxc̒QATUIU ZI%
-L0!l%3ӛ
-yA[VAσ!dn8xؗa"{ٲ㓲,BmsYN2Ƕct6I ,n,h+#h[[}s"E
0I2cGQ Hb,
+=+/;Ȟ7~+?<$ e$(y*d0S0Nmg9Vp#YGL{5&jW& V5 yIܖod,džR|X!ShZ:\(kYQK6$jIG*ۮ jx)/DzQ9b5HWveSK->}>|ȴ5 E ^QNT65e[~RrT#}~
-o=)Z 1!Ă2ƈU 6Ran 3 ۹?=ۖ6ٶ0Vqn \4l[()A.gyGaYpс&HgmKden#mH )q
m ]s6~HІt]wl+= 9D"7Ϊ2ET#owހ~Le_8hol <Vz"MV{=GވfA3 O>y|>ߴo*r-dѷp [hwDoaSC!1I}^y3/hqqM^w= \Xs3
qstLefYPq_3#S7]MEU0l-(ڎ
d%Sł ^V ]Xf`ƹ܇mö9-)6l 0P$"e(6& tYɫ`de\9#ENXFfzh߮54&r}/34sxEwImXl;C 9`too?2 E&c{xk^LW,[g)-W+;+>Pz;c}k wlNl8KS4Ei۷5~3䑡&!*lq ŵ-í$$+dqI]5MMMefOAW0t4;e@`$c ]9fe߃FTF,*}x_^sA-gaV9lkζE1:r 3 @6bmcfږ, "cs#B뉏~t|" 3Ueg4ʒ eQ+TðZt~[5 K2cېbm:EPPG` 1*!&|OF@ ;%hfZgU3xSM9yN0Q0pl$ EMPhz -=0 y>>RN zClX94yl6f,}/)xBq쟩.#s L栅Z%o :XD/hWM_w^ K8gX_zQ]GGƷ[..Ӏa:> `23VҧK
-AX&$A.BTn
:mXmwҘw]3G ,**Z=a[尭#0yx s]؎~fKbAFTU t3 նT{|wH4# J,2;: L RE <heǎeSe#E '`x
-~xݠ8yj2*2XJy^p̩KvTUVUn414d&ljS|**&Ga. MJCwx0hoa'3an9?[q bˮ +,@.yc]+!#%=ʒh u1n
EDe"6aq
-v`$Io
-P%D;[4!/ie+Tf23^/kX
-j> Phw˥+ Qs
-'㸣ѷ5|E l8غ¶a[ UP _X[==1OAΖ8 08Ι $X :ۗ E>և#P:VTE"h6 9-Mci(b^/V0KlɉxC0.ZV:JdGQ 5*W4m\M IҽUgq[&2+1% IpP-}h\Yf֎
ت]
-j#sUsZ@[l 'AX醉08#ccUDj״ڪeII&i
9;
-l (< PrvW/='\V Ψo։Wwߟ,]|VeX[oCIa +A7*7?l!-m,[feY"0UrΑ#^yypȱܵ ր|?0e&EEB]h #ef L)3\N}a[B UymA
-Y G_"*2T80 8C#e~Mcv47SRN39n[V3QjtL2bm)un}jL!(v:S^#H!i$LUXfL (f0Py6BztۺvǏ' 2p՟CͳNa*o|)B d Ѹr_LJ]!;pR Ȧ}p "DY$饽tU5+qN/ȿ.w?^nXVΏ',Xv" VOHmhݾHZx`#uAvig* ^g TnJ<0e@QO2 AriRfCWҕG}4_y5 , k-i]24{=攚X5a[-Ђ+jpo *T'` =5KesH@qLHru ap!ߞ d:gF ٖ3=~`0(U$)۲DxϿ`^S"yJ*?2[*a
E![T)T~<7 W6F-UQ7B>R^D-acypciBT11!Sڱ0Z0 8,9l&c*( P`"㖐R5CP QMہQر 6 \sԽS em'VmO?TӤlm,Q?|vE9 Dr!wJnBsLXQ6ā
-]Mbaڥ,CEUM-Qce#B% D^%)od`TV |x-(r?SPV U|bXW0+; \i @iℐ[=ClzLy D{c统 MȰ%1537zō 0U J= }Gw >/S+miìO{U-E{wPմ: Pvwx}2 +ȕĚ4UA?j; ~zE͵״
-Y%l7c4CT%:wE7{>!۹Ni7'
-}# ŦCE ,Uefey
i2琊vo?,)愙_fipf[s UrW MD%d3-=_ P%*i٥Q1pN38!]t!#R\5_z֨TL{{p
K54weHKI,i C[ `T$\:t0b85wWK)s BaP5CE` . rB5h4_v J,TUkmB^yaC[ X0
-*$Y$CSt^R@'EAǶ|}&XYTݴ(?iF2)j'bXTP
-*ϲLZ5Q(\e.(o2EUŰ8ӓU' bbBC)E7xO(sF:{ѿ->7=*@
S}rJW5?xs{_*CbP=v,RnS_\}eZ{N#w,*PS}/ 鯫 S X\Y5])tsj>1d7~1fEW?< :;غ a[尭 Hd}pD5eMW{3ޯg
p ARGAHDD~)C $Y{vߙ kڛ&/:{{zfv ܫH={B)(%D&,^6/(I5ma)"RIQ\Z l[ "Xi=h\ e{/fE
-vr2+UREO `bxa` >>ITd Z?XY[X1;Z'?4]Ĩ+ގ*8@\_ RJ(Mgh0xmVrP>;RLUZ: D(j|G 8H LА:+>H@{7{4J \5꺠 [Yٽ^n6}ش `e|N,,W$XJg& ;˦_5kj:$=0 6ѥh} j
-j(t/6|U%92Vkl:: ^api
_^~%nb7~pZ~ٳ 9;B1[' 9jKG$Z>0Du@ZqjT$ +ɕ'*! eVq}҅)NWXn9o ;O :v3 ~7>`!\+N%KhG_x7:&Q7nvb@Z[8
˿q~ȠϧK<( 6矽8+Pi:m7
-,ɣǮݶTl+`U / Vn'»ϾZTi > Ii7'[f3l,<
bEpPgo_ ̪EB
-V3vE -_^+?MBy\ cU & !x/=Mڙ,5B J !(X
-PgDY D9VFP'$VX'2=s?]iCv&"EN]E7ϯz#H8.-۞?>dLfS/
-# tJmEcqή3.*yȠniul|ÌeC"B>'WkkKB']8Jޡ Rf/RznjgftBĶ T%=kƂ7.dDNkSGr ?t[V=f~K??W)N`&.N Wbjd ;%y@ gB"o
-e] 03d;Ve$zn`K3P^,`-҉Ui])kMv/z%p~ĄveQ@ZV˥RF.lPmbJG AܸC#iԞkM>@%-32z</vǎ뚹%]ͪ XA*w?xS;w{0
-Dn7f83]~XJw8H8(LXb 0(M(EU-c'/̮Ew,4?A-V5Kᅶٶ |[SvCv+"Dt\ >.<%ѮVL/q7ޙobH)e n6Zn<$Զm?\^SH@x6a@&lYKjxP0;X5VR7K
vb( 73I١L*K
-] 2QJ̢} 9 7ƺQS[B& AJ'U"ô^`L'҅"Ny+l%{FOör<}5b
; Y IG|_m0(UtUG1mKRVYaDEP+]UcLT[Vˊ0&`v2u>YaX>[W: g'a K b)f?
-h| )-䡑\ғWxmw7 `ZܚHB*1ҊZkTrޭ5 BzS1v*Yy`}6TV[4ok$B mcYEcr~LչW>
[`%´v%'bH~o}BIeuKP@; :uU0"~+ՋU5@CˣVV R C{Fm8bHOdb hP1Y((3''.BD6aͫlZ*B ~ I *N3ֹ߸*F V 0QHA_Dٷ,Ç!!nWD
-˖ÓحVQJsvcSzˮshǩVmBT mBaS)Wm[: VkKz0+>|, }x ua
--¥yC1tv
-4d@@̴f&@nyfw( <"#o1uioqD[? ۺ5
-c q*tAmI du/
-+QhLo k!%Y ve)lL0亦c$z뢀 %wIx较,|}wot^D9J١.><9qiva\ݬRO4@~|RI4ClJy1WRRS\?1c~*I {@@% fAHm 9RV]7 "pVǵc8 yNRDQtk#)4IVr+-\t<3xFc<3qjV+ QXͅg{0r"Zj5Ji!71
1 nAMa4*`!C%]B=`eTE* &-Vζ03(ҹ cj"@$현caף^!a[OQ⸶(oY_llE)ͳ\/ -nD) In"~6C 1E
$BQ@Bw==%<)P"kc$(91WJ Ҽʵ45rb˿e B]NH^Yy7 \SQ`({ceO tMj6[r}?3'SH!U=6
-Vi Kc+F0tc 쌯]H
-G0<öeZ^tMɫ\)rҀ0zն:|bϿ|'θy^JUK
-Vf|/۷aF
-A"/zeR* ]DZL5~ف$[.V̨ypLufճlݖDtt4#o9:?
-&\-Lael6@P8}iX/B& CP LQW&ҹ ǁ:81<,; ĩу(_=
-D繃
88v,-~F "xc %m:E\'tx6] ,'u 4VSZ[WdLxu DgM$쑪Y0.[ϳva0*' V_1"RJhl \'CLPT0sp!FR/M`8x
-`Cͱϯ
-CO
^١ +@;#' 8:/Qwd֝ g9p+ոL "r@x+`!v(3T,LQ!Qd)`H5%I5 =%w$ 'a=VX413cСĉ)x!rrZH}|7 Wa ./j͙\I DRҠN4Τ2zV=/$gue,vi;뜍f 4
-ڑ S8]ѭ G : ȔJ{N
]M0Jiulbɒ̊XφƖ U,*V("NJ'`۳\w#-t-!as#yw[-r bZf;ZҰ/%p8gJcJJMH ty侙0XiNR^
yͦSFButҪ#L]9" !ۗӊ(+wS؇uci:h)(p3M҉(!!~{F a_| ۲Zcp F`/"AO l7ʲox B8 >Rz{ w(!Bԃ$!N܈E( dSW i5(Y 3"$Um.eEZV}a
-YWmל]achZ5V ;fU[J vKF阭.ʥ82lWuc ti
J_ *}V.D0|2oa <5X#]$a[@ ڻqPܢ|$U}m[ =',?\V|V04r*%k"@GpDS3r
! ?fy^텘̌Ogَ^mךD 0*ꖝKkHO$%V,
\}zHikK86 RʰE|u-C0y|ld
A2P<XI4[9TeG3'B
(츠IiPUU#|{ Zk͍@ۚ&gI ˤݬ3A L O36_KeC\y[eIeٗ}^aA*`a]+2j$:!TXu_b.GJiwd x z7lȕ2p4U;qt~e}>@q V*-D8q13Z~DA.t͏ X`ᔑN:ͽ~ Y{1
-GMVvꀀ*d%ۢxpO|Q5N`x+spm{a#WR $CduEQ^W8fk\W` l۞9Z>LgjNHKbPz7VO..$ ll;~SWT
-UR,kV:͜HMaY CG&=}%s_ލz;+u{G-cb A'SG&j5
r Y68M,UĊ <>|d+ B Bo'
-̥b?>vmozU`f$cMM
iиV=3L:y<&$Q=ĝ̑a>ac(c 2/9}ǷPpǾ8<n$2ɡ|_JmF q {\& >o}qm pJo߸Ovq ^&RJoJྤeݦF$d3 ~QN`tK_ Jzn]
-2B$@|Íc"DCCtޑ\SZf#EAD ./Rl<e51CK5eC{v
-Jf3:ݹTG e&]T̃ LY\T Ed5]ϕrZ>܋ ],:ɹ#{ zû5G̺{zPt5n !+ff: P(&⸀ rB2^4-FA)~o99+W_Z־҈{KHmߪ))uu0}XI>]@{ JHqŵHR崦Z`Yd%Vzd<.JФTv64vPUW`8+aZoN6 -3$H5@'; "(5HA !0qԨ6َ휭*tnnɅ+Db |A9\A[3o lnNPRo rFSҔn r#җqH(?9&tR1dCX؊.}B > ¬ԺZiuܦs%, $KwzHްS 67ɹsŴ5TZBj*cPr}2Bo'+ˍM? bt58M??&(%* }' |b|y.
-#NNRª|906hblwIb8@߷XxO Ň}lqi
yA"nux a%z æFxX U\4GC;aXDRY%өի bݻ1eC!UcP6Xp 6t*~]p^\2aNCYw~Q{!KqPm7e9 2.q)rWcL\njQ+c˫E3ZA mPJT`duX^J ì.Kr_ 8 R9l2CF k0qQk4#cw}u53]"HRU(0Zi}u7iK}BvWSݵs^bBD؈(7l XF@j&rI@{kםㅘxQznM@XmѴ30r<$T w˔
-묑ϲ-3Rw|>s' )"zFGF
- 4욦yDneK]r5'K$I0h l<
-"O@V
-E
-O vT4Ŵ~ǥGg=Sj.{G)-d5t8'
-div \l~
Q@CBQ5ӂ66 uQԤ& ӟ!4\W>?&D ĀB_j(GG[n`HP83?5(4uQ [#/Ԃ(e$8artXzy455>@#L(wMg%kȹ)1c]y=1[?o%D5 YIJ?559~Ç&V̚ ]{( }TM{s\
g?u/>=d2O/kDYC,JG?| {"
L0}1˼V q Z>`q]i^&[^A@x;z[N v:J!6¨ayG~?])n 4QEM{{:MSVP,o RfT* b>779"2 ?/="ng%!e d $m8P*]`:kv'a L L~zh"CA!
-8^%BDP _x9`&L$i/HQ.6Һ
-Ȳ@ʕ̽eXjUi2j,cb_.~Y4Y$eH.ߛgK,"xNNJSI}~ȩz_"@Y,!s_~?̐bM hD$X
Dؤ tv8]qUpѱbr~_zs7 ӥN=r
fk#y>!Dͨ.qIqZ 7w&'x`NF9B} 2KgA"(и4Fq4__i퀕BןPֈ*j'\ &I-1p̒$\lY ?vش mŬq$cVⱇo,C?\W B}ޝ?|W^}%9%'`>w?ԛ\[p o:**䠦kyHtrOuiYOР
-" ,c艘
-{AaJW,n֬H| \dT k]]:)(m_fQbB"L2~J_gO>tyM=][4"Ln,9SG>
-Q#DQ7= iXkUcUY ,Ƨm|²R VfZbcz.Pw" D!~ٱE_[tFk@%N̒*-܆"& -5?VLaʆF+B7XH@/eT1?/)PwꎺÏDm3+ ҕUFѤFsD@, J+i`uN $//ۮEnTRO [ĬJmO%d\2!r$H.5= mT_Z^t| GJ0Ͷ c""-J[ǡ6)H
-i1"lCa+n 1T,xK);cց}%._eәd҇~|7|7>UʕX$T4~_= %
-M'D`9U0$E(FϚIwȍ6Zj )L0@%+:f'ΰ:êfj\jl6;44Ķ`}}-;>4JT6Q9lWm5eѾJ341=y$fj*! ˄ :;γ DtŌ_^c8NpqqhB2N>r ; X LQU0[BC LR2 EgJWLH(>,\ե v-R7s8ƘPց%=__Fx۸S# ꙴ| KWW'/QLG'jSꋋ[
4zQG 8 x=#ѓ~jeEWŌ&' F>yVkv" ki4V>70$Ĥ8Q ԙH3i ^1ؒձ%vAbtkUi60F
-#2Z!V|
-BދP0G tՑxAE
0I;O [S IvĬG /SGG ` h'?o|sum5#= h` LNF(aOIA˳fiV(@ɒO兓GNꕵ*!!ͮ1|̲dwau
+Bn"(7bJ"}74^_9 / Ģs"ȴW{1Xo|Ͻ90QXahkh^ԖeFUfIy
-\X"|c{fkVWA̝_RD8VkLjjtI_X&vsZ彷 bܬ{ 22mٶDy$Q
-[ACp2 /tR[b]UB
گS`n@N s㏏BH 1 0], (=s9$4) S=T] q6_nOc`]w
-~wjE: zch# 9u}=" I%; ծ,A4qC3@O >pua1_Bj N˶Õ }r
-h?"LS'rG ]l7Ujv)ą4ɋ@ ݔ_@ /]Xt:.;^GKS$,(7[>Y% QJ8T $ '%#t)p|k !æ
-lɨ{¬'xD7,I'&8w>e?feҩ ^}^|92Daǐ&MEI;rm/"I [ 0 Zɡ. _@"?&rzSI:J<]*%J"m \R,Ax'c=_)0?Y*;@uM[yİhoYCp#5Y P%ޞ ɲ o_K{jہG 8vPcC呜B ͮAiC aId &D)0 @\R Q? (ǀ0XmأI; @[!á'hYQ;t+# Js6L@ 6Z.SCuUUQrC!dm5XUvlc7Ȍ~>$v`m()14HAEW44#HFY J1 ZL8$Ҽ|=3jT dP \>c̑JAD]̱Ռ GuZb
-p!{`|u܅՚* bf_T/fU1qC5恵 & J'56
aQ4.O?qnQNJ!|g } ,u"/@*-5$x2@h `5F2&1AJy,tw4Is24o)CZ 53f U, E;v3=5gh4āBc8Tu6} &-A/Ow{˴)9z {uZakl
v=DƏENWwzǏ b|Jʁw~ dGk^>0T^enF,@ʡ8WĐ,BɱVU<Ñ'=Q 98 `gT@t4 N%bםHAB T@}sYmeUPR@`fduAZ`Fs*,"Owyg "7 YWԕL|"KP$C*<5SZ+Y7n XB (<1|yUm$MDp|x8Od抝>2* dNvmO'HBF$C@3G'Ls LCjLx#b&8w;D>S``G`Ks>s0:kM'CO|tO]<7 eeBO <7PxdJi/3S 9Ɨf=8:^ ;OQuxi1bOb B◟Z~A,5ַφ\e{f * qDлܼ~vUҚ4\0 u=tZ<{u_Dj.Sig Lf!
IS0 &VmǮ6ZX%*D XLkcL˹v`@_ lqV$\h,TvT
U;t݅9m4оVQ[-m@do./y=z}}xCR]q Vק<^OXrdwӲV5~Ey7DLP)s@;oL/4b5 :292J}m5 UY/FYQd
X< pݏcVҺuh@ubH2>n{ yh.\
`-BY+-r J=7/>{I$ |ɍ@Ev 5,)C cVV U(p4X;4t `[V={vOG2 ̦\=D08`[J X3?;TbUcS6`֩X6 ,IW^GH" eb&ų3^}O# @]JiD : -h9:v ubV9`@-VٲC/($Ew",T.*f1{bYr>7}|q(~H0!YNMIp9 Av6RЫ-' 6 ;Upwb8> ͔3/ Sռ H#K``!T mOu'OjÙ ;83n EDR"`>DJ@°_-ԭn
W>Prr -e8'f2`#{`>&WD]qKR=I%f]bK?x 3?mG8s
IP!A睜0RʕK}pF 9& }$ ൳L ksMqƤr~ O$=pݼ$.`
/;H{RpӊM[t oy[ ȡ 9H뇑:6R`/F =Y*)Ҁ] zi1Z%N#ʼn3naXXVP1tPO N /HTNf.0Sec '?ʝ TU[E =
-X$?%rp ||X 94LA]V4%oC $F~nZ2*B57n_l;̦uY
s~ό}kզc-9g߿ *'| n.p#8"_K~&x͙̓>= MP.]_Z- ? t=K$*Ѝ]aú8{Y]e\ ;մ.tV t*.toyR ڑ tŮ a$^mQ¶M"m|&aC_B6 zdB`6S1 3zX2
A\"ՊW;~ . lt Z
-H1)ꇰ7Wǖì!SRK=Uw>-~3NlYV< 5zFX.|G~y'gf8-
} wzF
Heztt5u`Q~w~h` ILQp ?_ɩiuOL}> m$tŹnXj=P*dS{P)evˎsdhH<+h[5^Hl;rdvXp*RPtPǏ :+ob+V OWBFM&+~qaJ0qj->Qͽ]wѶYDAD! n0pr$ o73 -)q4U=7#+rz}/ RG&]ٸCL
-믘 r A8ꕜ&4SܳVńxUN:aܹaҚ4
hftջ;-u i(Jk; fSjHuRJdgJrcޝ /H"az+#0 MdY_x /k zmYAUlBd O0WBF$P
;vmM5Q2vP! .eT?p 8W%[|
-}'
-Ep$d "E+zb !I϶PbH)L$|`oN"m;ohM#Xc7JZv%tәf
-l6Aԣq+ .f(} _|7d_TD7t&?v=ƿ d7<7 x_fJv,Z¾c 3dz؍;6gFmY}aia<3 $?xϽ3.nKH
-]D8K_}`V9wU""Vg|Q'C.Wyۇ M
-v ^~pr RL?L1@` iHк9C"RJ(D0jQDd $ްie
ԉdH]˵[YC`R-P`k6fe_d.U(ϳS }<$iS$
-Wc|1qsx5{y
-T~rm;\ X!`)]+L4& !%
-=DvM_ l!nQB.,ÍWLzᕵ?:GY \ڕ ~6.-10TeC.]^NPV?Pٗ?OSF?05ȤjȲkbpvfiuWs ѣ>MDz\OKk Zhղ[s(H݊$NzeEa.tB1>m Ν4MBRztf˿ pC'Y%`~a\Ki6D,8)aWYC0}df vk
6[ C 8-1$o
x%. ɢ}
-V5ВT7ZZjVJ"IbIM_y,N dofQB<{>4+O'_W* Ӏفm!5J٤Z7D,
*`1jt*-IGȗ2#TؑJC YfĵtN(,>ه@& w ЕxJj_]{eQ{ έ4kiXK`f5ssIRp߉#Q :^c;kƥT
-IɎK ABBASzz W `e4O{+#CAż+H$ EIZ NM56 J`\ 1`]
`T,y/qޒGjF_}j NbZ5)BckPS<^~賭B, c )YNH HO
-xHS(| Ke[cd`.`h XP_ߩwHDF ;ȸ|e:_eBN\Qb^_퓣S芙Lp2M̜܀R
-(Ks]ө" آa4{}gJ]I"+".?Tp'ujo^3g*E@RZT@7B! J ''NqqbqPe!ْ@ܽ3=l2Ix= 3TISDf+]='DcQYI±* -`mQ բOF<2ɘrf ɢ7'&=0-ClM1wW_;lt]]vYoQcBHy%_?~G?4tL{ E $)ɥ%ئÂ#s{@a-U7
-JGy#e{G19Bq($B:+Ʉj"woLE* I1d;Yow'ho1]O ю#:5Z+ b)^H!O2աvmMS>e(lfv>:$ᐜ!.?Yl5zb)]JPݡs^<b5mE\ Rx~ªҎޓ?Zk{H&2K7Mw~"eXі[W,q\OR1
3
-{F.% d(Lt(&JYyxh ˛NG*q gtHap_zp<'y( vsW= vru2 `)eR KT;sXgy9Ug
v˲*9> ;=p-;hۋ*
UΟkԉoǀuߓ*ғEIz{/G9U|5]ǚp}F39& לӿAwg@CI]!6~J*ǰD2X.[F.lrJ+%>6kOR,]w?7ϽMdEV֢4+**﵅dcGl[(;=z )^!fQ tZ9 כ aQXRbb-5'=VGt< +@Q1E&G `yt-[ ti>7 l0*ARNVEU< yQzi' 8`łxý`'Jw庠pqqF/% 钪ōږ(V)ڎfX)ò=l:ș,#;qfbawҐ:<'+Zn {q[GȐM0 o=J)mT$`H8x!i5+MG2$ Eu\eUk9M;ȓu4RSDm_QW ?pC'%EH+X2guг䆐Vk\ $һ2JXRJm^?{9zǟ>^^ԎAHDm6[)fbV<\M=C 0%"W
<;f%e>E' t_y&ֺy ^ߦVG D%C60kv9-nh9FJS
]V~ &
? `݊YIsۢ(Ɵ5E
-[[
v:rK&'a
-JknUfQhE]U-Ud&FZJ#!eo5D }SE/H障c=D!-<;ϫhrQ4$@8H8pt0<
-1YZ97 9&,
-j)"֏yg9Z%jGΜl6Ζi
3NϦ|thl$ _>(҉#BVVmYWnzw:3̋ܝ$^cI?tX>\ ;3H$SBKjDׄ0tO`') vAbWGÜL`8'bxRdt *AQ@E X 5n F f*VAQ10N0b "yֵ.a5ÌC ʌ*UE:ppZT]dNU*~'?ߜ20>@#E#`
-w`;1i~Y首Md 8 ˊP,Ft]SY"M ^/=cȚ~I0Ju1/[ ]^3G|V_apӔI%Em ޝV4W)PL<˶?]1\mȧd@!&PU #P!q|lhhu >k@WP.Cvl9
-IFAdR*S"̦ Rt (2〵 dc`q(Q!$a#)MB)dLDPoVK aD=>n(rJUX!
-]Surdm[{S p(PH+iC[qR RX0Mn!ݑO
-Q2/37{ ZD]-<9͌
+
Ei6M1|F+γ:D>tx4@s 8d%iIT-P(
-lo4l^|LՄcEҿpdHۂ- ќ%LX
_dP۲X}U_k%sz *
L/\->"RYseym 8@q3jcf(b BLw[~坸 DXiV-. 8yF`Ƙe>ѫf1 0 k!$W_S^r&2 P;djV7ff?NCQ7hM=<1wtC·ZW*'vg%?Il2>88 k {ӱ[vb5m,JXPŷ;R8__~($oGMʒ:LM _[R:Y
~g)|1 6HOiVW{9(Ţ@2txX;.I*ѱ,ˢ] Wlcu5Č a u? (fUxr2aw!
!/,6=$M|.409s`mn$t8V2/&$1.$s)?[bl0w&z[c?\ Jy&0WZI2;~ 虖 eRɪUN:m잹/nsH5d \WG!V5LplkvqnQFX)Q3],^[!KzոWj ٵeGXc96նkxd őLxԨyC`b .6 8~ aobl$h[ )wx} *l0)ׁu#b-!YQV0p*nX_ 䈎ѪZ UJz ӧ]O8zФ1驉^xW^'rtlL ~Rr9{$_=Bh!?} Y]1Bȵk;AӈYEx˄P1XkQ+-I,jZwM.ŎBX
-: 3;
TanvFX(Nd9.pQ UHtlW^֧vL)PCT)w!QumײcB) bGڥ\~ +ّp1H5Դ6ɡ*ŷH4, a)v ?\V|! f%i13[h \m č |5J?xzܻAnר/#a27t_i5V" z}i8x7D)3P˿V}
- ~4ibB )̚~pf%>!UEPD˶Ҋ8"/wȲnFizEhDBII]UE ɋǰ5d {ͮ
Q̥JHK
- AUnK.儥Q#<֓D!a) _zc C ,KaM_[ɪ!7b_#]Jy\y(/ zgD | |#̂Gx1-@j'[x-c\%2 u/^djWJF3Q#f
-K?nu\ .QKD' ahV[dD&G2$CJO*՞d-Jo3=1sa~/wjz'N )LO*h*~b6DA( /^RbV_^a H
- aV<yG]O0-uBr}DvEh3c%in~*(M vyVB?ڝj+p0m$bՈd{ޙe!"\kH3,LDaw7205uo*#jnY
-)2
- 4: @SD]5YT.f!T_l=Q!qZ ɉs3+qĞ̹zg1 s
Ҷ oCRE˨#C #E顧ԍxKT@VaA
x}Y[a p {ps+*$q,H@@y0P>% (3 + , )y J+0wڸӶ3CһXd,֬S]DϥeVL.g۵۵b[ &3^ZQn%$ 4 Бl@8G ;' I+u]/!9f12+(蟋IDb-qf}>{U ?X3!oY bH) h[f,NNxG}E\N-Em1 ?*{Ƭ\!?K}߷,k=Ƚ? g?iQ]|qL'Yb@wኘ ;s,/BsF#X''?s>%%c 7,zfu-,e%V ,ǟ>{+KZ+i0TXH9!
-YoW^'*1HD
- Њf[Q;մ<Ǎ0^R5Ś[J2'ms݀'Dibts2XI W/./=9Qqb)H2U}{ Hh 4B`f gu+e("J_k?DE܉DzE vBV ƓA,[z^?2q=G fp!L0PQkKK; {h?}
-n#@`ż\⡿KB\)dN vwѷF?~"W
-U=?dhձG =VԂ#x pԽWzt
-G+yw3/g_Np||V+\BҬ.P "\ U }x~ o]0{:P Ն@7͛lYbt$ ~qMWMM}77 Od&'@Ǐ'Ǝ
sPm^KMd]!!q ]u`
X'xH聦wf0ID&Ike,S/9oix}Kw 9!aH74??U(dC}; wHݔ/`MhX(qx ]iu`NQYUC 92xN |6⒨%f (WqT`q|sԴZy4c0e?BZ8"\}ru{jvFnY 9<+.-0 ,
-\{9S=9ðuڲg:bլbL8>=.f|^\ykyga& D 1CxLs:O=ՕWgM/?#n=g p̬ZFOjT
3@F'e
-=/h7O e(0ۻ? kЅ,ne+].EA@$Kғ_c? MP̫vùOe /;Z XFNΘFV?dQzϺ=D"CE-6~K@e(D(6,]!10zǠkfӮ- Vq lӲx=v鲡J2g& s Aݠšݶ<ۥJʧ~k ң ܿzYhz(bO\\owViFA]b&+|k:^۴0 F(U;l*6 4=vԜԱK˝1%jwKVF>m<4I(0,V~u=Cg
-ّq暶.F>۬~x1`䒥/zuL=cO IjVP #@7k5 C`X9&*auN"rF*ꂔf0," WA[вjr7JZ s fF۳o^1.r:*㉏ =)nq~Y7빣jñP@hfmp3$u)@ mK2K\@:u^
yKON {_?#W~JCSKR@ϒ!+4BrŘ-%ɢ4 kn[b}$gRq@CRr ,aVFWo־{ s5?z
-BH#!XzER8-F#JΛ
~ `AN ZѪ^~e1 ݲqxAͮ1Syo Xlĩ%B_ BfJ
#mLjO f`y~ЂQӱF A?v߶S
-}9%R:+^,ϯ5Zn:o_vx=K9`1t9|pj ks#_l,( #ʦӗs}#>PMo`q0fk矻F@i%:<^WfAk6y+x&
-ao-8ё3]sBo/cq I :f]< l3?O&z3~ROt7pRR|' +ęɉ3i(RJp):UhŤmA/{Q$l=}K&8&^GE 43
;)MIM0ھs0 &\Ru: +DJ9k 0V #SĜ鲂,q5;I iuZ̐(q)p=o| th "&|?ARZfֶA@96]sGe2ܣDa˵*0*t0Bhdf9&$b0-Y ^KbnE}$vJ]ɖ "G!YlǡW<6&,zgPB#; A0/HE @q}OO6f. ( Q
-M}:IkP$d ,Ԏ0WeX^812ai D0R]OV
-vUsZoAJ{I