Hei!
\r\nVastaus Kysy kirjastonhoitajalta -palveluun lähettämääsi kysymykseen.
\r\n\r\n\r\n" + format: email_html diff --git a/config/mailer_override/symfony_mailer.mailer_policy.asklib.new_question.yml b/config/mailer_override/symfony_mailer.mailer_policy.asklib.new_question.yml new file mode 100644 index 0000000..ede3b42 --- /dev/null +++ b/config/mailer_override/symfony_mailer.mailer_policy.asklib.new_question.yml @@ -0,0 +1,13 @@ +langcode: fi +status: true +dependencies: + module: + - asklib +id: asklib.new_question +configuration: + email_subject: + value: '[Kysy kirjastonhoitajalta] Kuittaus vastaanotetusta kysymyksestä (asiakas)' + email_body: + content: + value: "[asklib_answer:body]
\r\n {% if has_answer_details %}\r\n[asklib_answer:details]
\r\n {% endif %}\r\n {% if is_admin %}\r\n [asklib_answer:author], Kirjastot.fi-toimitus\r\n {% else %}\r\n [asklib_answer:author], [asklib_answer:library]\r\n {% endif %}\r\n\r\n\r\n\r\n \r\n\r\n\r\n[asklib_question:body]
\r\n {% if has_question_details %}\r\n[asklib_question:details]
\r\n {% endif %}\r\n[asklib_answer:signature]
\r\n
Hei!
\r\nKiitos kysymyksestäsi. Vastaamme siihen kolmen työpäivän kuluessa. Vastaamme vain tietopalvelukysymyksiin. Käytämme kirjaston käytössä olevia lähteitä ja vastaamme kirjastoammattilaisen osaamisella. Kirjastot.fi-toimitus, toimitus@kirjastot.fi.
\r\n\r\n [asklib_question:email]\r\n" + format: email_html diff --git a/config/mailer_override/symfony_mailer.mailer_policy.asklib.new_question_admin.yml b/config/mailer_override/symfony_mailer.mailer_policy.asklib.new_question_admin.yml new file mode 100644 index 0000000..b516d80 --- /dev/null +++ b/config/mailer_override/symfony_mailer.mailer_policy.asklib.new_question_admin.yml @@ -0,0 +1,13 @@ +langcode: fi +status: true +dependencies: + module: + - asklib +id: asklib.new_question_admin +configuration: + email_subject: + value: '[Kysy kirjastonhoitajalta] Ilmoitus uudesta kysymyksestä (vastaajat)' + email_body: + content: + value: "[asklib_question:body]
\r\n
Kirjastonne alueelta on saapunut uusi kysymys vastattavaksi Kysy kirjastonhoitajalta -palveluun. Kirjaudu osoitteessa https://www.kirjastot.fi/user/login
\r\n\r\n\r\n [asklib_question:email]\r\n\r\n" + format: email_html diff --git a/config/optional/search.page.asklib_question_elastic.yml b/config/optional/search.page.asklib_question_elastic.yml deleted file mode 100644 index 19f1d2f..0000000 --- a/config/optional/search.page.asklib_question_elastic.yml +++ /dev/null @@ -1,12 +0,0 @@ -uuid: a9ae4234-3efd-48fd-80b9-863a8f7455a0 -langcode: en -status: true -dependencies: - module: - - asklib -id: asklib_question_elastic -label: 'Ask a Librarian' -path: asklib -weight: -10 -plugin: asklib_search_elastic -configuration: { } diff --git a/config/schema/asklib.schema.yml b/config/schema/asklib.schema.yml new file mode 100644 index 0000000..4c94db0 --- /dev/null +++ b/config/schema/asklib.schema.yml @@ -0,0 +1,3 @@ +entity_reference_selection.asklib_question_municipality_selection: + type: entity_reference_selection.default + label: 'Question municipality selection handler settings' diff --git a/public/js/kifiform-tags-custom.js b/public/js/kifiform-tags-custom.js index 73ac3cf..cdc296e 100644 --- a/public/js/kifiform-tags-custom.js +++ b/public/js/kifiform-tags-custom.js @@ -1,10 +1,8 @@ (function($) { "use strict"; - $("form.asklib-question-edit-form input.form-autocomplete") - .once("asklib-tag-insert") + $(once("asklib-tag-insert", "form.asklib-question-edit-form input.form-autocomplete")) .on("kififormtaginsert", function(event, ui) { - console.log(event); if (ui.item.autocompleted == true) { // This is valid as long autocomplete is configured to match only Finto terms. diff --git a/src/AnswerListBuilder.php b/src/AnswerListBuilder.php index d635864..0093c89 100644 --- a/src/AnswerListBuilder.php +++ b/src/AnswerListBuilder.php @@ -17,7 +17,7 @@ class AnswerListBuilder extends EntityListBuilder public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) { return new static( $entity_type, - $container->get('entity.manager')->getStorage($entity_type->id()), + $container->get('entity_type.manager')->getStorage($entity_type->id()), $container->get('current_user') ); } @@ -45,10 +45,10 @@ public function buildRow(EntityInterface $answer) $row['answer']['data'] = [ '#type' => 'link', '#title' => $this->trimTitle($answer->getBody(), 80), - '#url' => $answer->urlInfo(), + '#url' => $answer->toUrl(), ]; $row['rating'] = $answer->getRating(); - $row['created'] = format_date($answer->getCreatedTime(), 'short'); + $row['created'] = \Drupal::service('date.formatter')->format($answer->getCreatedTime(), 'short'); $row += parent::buildRow($answer); @@ -82,12 +82,12 @@ protected function getDefaultOperations(EntityInterface $answer) // } $ops['edit'] = [ 'title' => $this->t('Edit'), - 'url' => $answer->urlInfo('edit-form'), + 'url' => $answer->toUrl('edit-form'), 'weight' => 5, ]; $ops['delete'] = [ 'title' => $this->t('Delete'), - 'url' => $answer->urlInfo('delete-form'), + 'url' => $answer->toUrl('delete-form'), 'weight' => 10, ]; return $ops; diff --git a/src/Breadcrumb/QuestionArchiveCrumb.php b/src/Breadcrumb/QuestionArchiveCrumb.php index 2e82ef4..08969e6 100644 --- a/src/Breadcrumb/QuestionArchiveCrumb.php +++ b/src/Breadcrumb/QuestionArchiveCrumb.php @@ -81,7 +81,7 @@ protected function from() { if (isset(self::$sourcePages[$from])) { $route = self::$sourcePages[$from]; - list(, $view_id, $display_id) = explode('.', $route); + [, $view_id, $display_id] = explode('.', $route); $view = \Drupal::entityTypeManager()->getStorage('view')->load($view_id); $display = $view->getDisplay($display_id); diff --git a/src/Breadcrumb/QuestionFromCollectionCrumb.php b/src/Breadcrumb/QuestionFromCollectionCrumb.php index 24d4311..8ca62d3 100644 --- a/src/Breadcrumb/QuestionFromCollectionCrumb.php +++ b/src/Breadcrumb/QuestionFromCollectionCrumb.php @@ -15,6 +15,8 @@ use Drupal\Core\Path\CurrentPathStack; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Routing\Matcher\RequestMatcherInterface; +use Drupal\Core\Path\PathMatcherInterface; +use Drupal\Core\Cache\CacheableMetadata; class QuestionFromCollectionCrumb extends PathBasedBreadcrumbBuilder { protected $requestStack; @@ -22,20 +24,20 @@ class QuestionFromCollectionCrumb extends PathBasedBreadcrumbBuilder { public static function collectionIdFromQuery($from) { // Variable value should be 'collection/{nid}' - list($foo, $nid) = explode('/', $from . '//'); + [$foo, $nid] = explode('/', $from . '//'); if ($foo == 'collection' && ctype_digit($nid)) { return $nid; } } - public function __construct(RequestContext $context, AccessManagerInterface $access_manager, RequestMatcherInterface $router, InboundPathProcessorInterface $path_processor, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, AccountInterface $current_user, CurrentPathStack $current_path, RequestStack $request_stack, EntityTypeManagerInterface $entity_manager) { - parent::__construct($context, $access_manager, $router, $path_processor, $config_factory, $title_resolver, $current_user, $current_path); - $this->requestStack = $request_stack; - $this->nodeStorage = $entity_manager->getStorage('node'); - } + public function __construct(RequestContext $context, AccessManagerInterface $access_manager, RequestMatcherInterface $router, InboundPathProcessorInterface $path_processor, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, AccountInterface $current_user, CurrentPathStack $current_path, ?PathMatcherInterface $path_matcher = NULL, RequestStack $request_stack, EntityTypeManagerInterface $entity_manager) { + parent::__construct($context, $access_manager, $router, $path_processor, $config_factory, $title_resolver, $current_user, $current_path, $path_matcher); + $this->requestStack = $request_stack; + $this->nodeStorage = $entity_manager->getStorage('node'); + } - public function applies(RouteMatchInterface $route_match) { + public function applies(RouteMatchInterface $route_match, ?CacheableMetadata $cacheable_metadata = NULL) { return ctype_digit(self::collectionIdFromQuery($this->from())); } @@ -48,7 +50,7 @@ public function build(RouteMatchInterface $route_match) { $node = reset($nodes); - $request = $this->getRequestForPath($node->url(), []); + $request = $this->getRequestForPath($node->toUrl()->toString(), []); $this->context->fromRequest($request); $crumb = parent::build($route_match); diff --git a/src/Breadcrumb/QuestionFromKeywordIndexCrumb.php b/src/Breadcrumb/QuestionFromKeywordIndexCrumb.php index c45995e..601caa1 100644 --- a/src/Breadcrumb/QuestionFromKeywordIndexCrumb.php +++ b/src/Breadcrumb/QuestionFromKeywordIndexCrumb.php @@ -15,6 +15,8 @@ use Drupal\Core\Path\CurrentPathStack; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Routing\Matcher\RequestMatcherInterface; +use Drupal\Core\Path\PathMatcherInterface; +use Drupal\Core\Cache\CacheableMetadata; class QuestionFromKeywordIndexCrumb extends PathBasedBreadcrumbBuilder { protected $requestStack; @@ -22,20 +24,19 @@ class QuestionFromKeywordIndexCrumb extends PathBasedBreadcrumbBuilder { public static function termIdFromQuery($from) { // Variable value should be 'term/{tid}' - list($foo, $tid) = explode('/', $from . '//'); + [$foo, $tid] = explode('/', $from . '//'); if ($foo == 'term' && ctype_digit($tid)) { return $tid; } } - public function __construct(RequestContext $context, AccessManagerInterface $access_manager, RequestMatcherInterface $router, InboundPathProcessorInterface $path_processor, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, AccountInterface $current_user, CurrentPathStack $current_path, RequestStack $request_stack, EntityTypeManagerInterface $entity_manager) { - parent::__construct($context, $access_manager, $router, $path_processor, $config_factory, $title_resolver, $current_user, $current_path); - - $this->requestStack = $request_stack; - $this->termStorage = $entity_manager->getStorage('taxonomy_term'); - } + public function __construct(RequestContext $context, AccessManagerInterface $access_manager, RequestMatcherInterface $router, InboundPathProcessorInterface $path_processor, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, AccountInterface $current_user, CurrentPathStack $current_path, ?PathMatcherInterface $path_matcher = NULL, RequestStack $request_stack, EntityTypeManagerInterface $entity_manager) { + parent::__construct($context, $access_manager, $router, $path_processor, $config_factory, $title_resolver, $current_user, $current_path, $path_matcher); + $this->requestStack = $request_stack; + $this->termStorage = $entity_manager->getStorage('taxonomy_term'); + } - public function applies(RouteMatchInterface $route_match) { + public function applies(RouteMatchInterface $route_match, ?CacheableMetadata $cacheable_metadata = NULL) { return ctype_digit(self::termIdFromQuery($this->from())); } @@ -48,7 +49,7 @@ public function build(RouteMatchInterface $route_match) { if (!empty($terms)) { $term = reset($terms); - if ($request = $this->getRequestForPath($term->url(), [])) { + if ($request = $this->getRequestForPath($term->toUrl()->toString(), [])) { $this->context->fromRequest($request); } $crumb = parent::build($route_match); diff --git a/src/Breadcrumb/TaxonomyCrumb.php b/src/Breadcrumb/TaxonomyCrumb.php index 2a92583..cedf76f 100644 --- a/src/Breadcrumb/TaxonomyCrumb.php +++ b/src/Breadcrumb/TaxonomyCrumb.php @@ -16,6 +16,8 @@ use Drupal\system\PathBasedBreadcrumbBuilder; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Routing\Matcher\RequestMatcherInterface; +use Drupal\Core\Path\PathMatcherInterface; +use Drupal\Core\Cache\CacheableMetadata; class TaxonomyCrumb extends PathBasedBreadcrumbBuilder { protected $requestStack; @@ -49,24 +51,23 @@ public static function fixLinkTitles(RouteMatchInterface $route_match, Breadcrum if (isset($links[3])) { // By default This link has the same title as the previous one. Rewrite it to make more sense. - $parts = explode('/', $route_match->getParameter('taxonomy_term')->url()); + $parts = explode('/', $route_match->getParameter('taxonomy_term')->toUrl()->toString()); $letter = strtoupper($parts[count($parts) - 2]); - $links[3]->setText(t('Letter @letter', ['@letter' => $letter]), $links[3]->getText()); + $links[3]->setText(t('Letter @letter', ['@letter' => $letter])); } return $crumb; } - public function __construct(RequestContext $context, AccessManagerInterface $access_manager, RequestMatcherInterface $router, InboundPathProcessorInterface $path_processor, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, AccountInterface $current_user, CurrentPathStack $current_path, RequestStack $request_stack) { - parent::__construct($context, $access_manager, $router, $path_processor, $config_factory, $title_resolver, $current_user, $current_path); - - $this->requestStack = $request_stack; - } + public function __construct(RequestContext $context, AccessManagerInterface $access_manager, RequestMatcherInterface $router, InboundPathProcessorInterface $path_processor, ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, AccountInterface $current_user, CurrentPathStack $current_path, ?PathMatcherInterface $path_matcher = NULL, RequestStack $request_stack) { + parent::__construct($context, $access_manager, $router, $path_processor, $config_factory, $title_resolver, $current_user, $current_path, $path_matcher); + $this->requestStack = $request_stack; + } - public function applies(RouteMatchInterface $route_match) { + public function applies(RouteMatchInterface $route_match, ?CacheableMetadata $cacheable_metadata = NULL) { if (in_array($route_match->getRouteName(), $this->allowedRoutes)) { if ($route_match->getRouteName() == 'entity.taxonomy_term.canonical') { - $vid = $route_match->getParameter('taxonomy_term')->getVocabularyId(); + $vid = $route_match->getParameter('taxonomy_term')->bundle(); return in_array($vid, $this->allowedVocabularies); } return TRUE; diff --git a/src/Controller/AdminController.php b/src/Controller/AdminController.php index cf4eba3..0c16191 100755 --- a/src/Controller/AdminController.php +++ b/src/Controller/AdminController.php @@ -2,6 +2,7 @@ namespace Drupal\asklib\Controller; +use Drupal\Core\Database\Database; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Config\ConfigFactoryInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -23,7 +24,7 @@ public function index() { $help = check_markup($this->config->get('help'), $this->config->get('help_format')); if (isset($_GET['create_index'])) { - $query = \Drupal\Core\Database\Database::getConnection()->select('asklib_questions', 'a') + $query = Database::getConnection()->select('asklib_questions', 'a') ->distinct() ->fields('a', ['id']) ->condition('published', 1) diff --git a/src/Controller/MailGroupController.php b/src/Controller/MailGroupController.php index 2a80115..c09b4ef 100755 --- a/src/Controller/MailGroupController.php +++ b/src/Controller/MailGroupController.php @@ -28,14 +28,14 @@ public function showGroup($taxonomy_term) private function getGroupListBuilder() { $container = \Drupal::getContainer(); - $type = $this->entityManager()->getDefinition('taxonomy_term'); + $type = \Drupal::service('entity_type.manager')->getDefinition('taxonomy_term'); return MailGroupListBuilder::createInstance($container, $type); } private function getUserListBuilder() { $container = \Drupal::getContainer(); - $type = $this->entityManager()->getDefinition('user'); + $type = \Drupal::service('entity_type.manager')->getDefinition('user'); return MailUserListBuilder::createInstance($container, $type); } } diff --git a/src/Controller/MailUserController.php b/src/Controller/MailUserController.php index 16acf81..3ab783f 100644 --- a/src/Controller/MailUserController.php +++ b/src/Controller/MailUserController.php @@ -15,15 +15,15 @@ public function showUser($user) private function getGroupListBuilder() { - $type = $this->entityManager()->getDefinition('taxonomy_term'); - $storage = $this->entityManager()->getStorage('taxonomy_term'); + $type = \Drupal::service('entity_type.manager')->getDefinition('taxonomy_term'); + $storage = \Drupal::service('entity_type.manager')->getStorage('taxonomy_term'); return new MailGroupListBuilder($type, $storage); } private function getUserListBuilder() { - $type = $this->entityManager()->getDefinition('user'); - $storage = $this->entityManager()->getStorage('user'); + $type = \Drupal::service('entity_type.manager')->getDefinition('user'); + $storage = \Drupal::service('entity_type.manager')->getStorage('user'); return new MailUserListBuilder($type, $storage); } } diff --git a/src/Controller/MeteorCompatibilityController.php b/src/Controller/MeteorCompatibilityController.php index 346e8f6..053983e 100644 --- a/src/Controller/MeteorCompatibilityController.php +++ b/src/Controller/MeteorCompatibilityController.php @@ -28,7 +28,7 @@ public function redirectToQuestion($uuid) { $question = reset($result); if ($question && $question->access('view')) { - header('Location: ' . $question->url()); + header('Location: ' . $question->toUrl()->toString()); exit; } else { throw new NotFoundHttpException; diff --git a/src/Controller/QuestionViewController.php b/src/Controller/QuestionViewController.php index 655e77f..bcb076b 100755 --- a/src/Controller/QuestionViewController.php +++ b/src/Controller/QuestionViewController.php @@ -2,6 +2,7 @@ namespace Drupal\asklib\Controller; +use Drupal\asklib\Entity\Question; use Exception; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Controller\EntityViewController; @@ -27,13 +28,19 @@ public function renderEmail(QuestionInterface $asklib_question) { $langcode = $asklib_question->language()->getId(); $recipient = $asklib_question->getEmail(); - $data = [ + // Set the question "answered" for preview. + $asklib_question->setState(Question::STATE_ANSWERED); + + $mail = [ 'from' => \Drupal::currentUser(), 'asklib_question' => $asklib_question, 'files' => $asklib_question->getAnswer()->getAttachments(), + 'do_not_send' => true, // This will cancel the mailing in 'asklib_mailer_post_render'. ]; - $mail = \Drupal::service('plugin.manager.mail')->mail('asklib', 'answer', $recipient, $langcode, $data, null, false); + $reply_to = $asklib_question->getAnsweredBy(); + + $mail = \Drupal::service('plugin.manager.mail')->mail('asklib', 'answer', $recipient, $langcode, $mail, $reply_to); return new Response($mail['body']); } diff --git a/src/Entity/Answer.php b/src/Entity/Answer.php index c8d96f8..18c73fb 100644 --- a/src/Entity/Answer.php +++ b/src/Entity/Answer.php @@ -279,9 +279,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['created'] = BaseFieldDefinition::create('created') ->setLabel(t('Created')) ->setDescription(t('The time that the node was created.')) - ->setDisplayOptions('view', array( - 'type' => 'hidden', - )); + ->setDisplayOptions('view', ['type' => 'hidden']); $fields['changed'] = BaseFieldDefinition::create('changed') ->setLabel(t('Updated')) diff --git a/src/Entity/Lock.php b/src/Entity/Lock.php index 8b52b1e..204128f 100644 --- a/src/Entity/Lock.php +++ b/src/Entity/Lock.php @@ -55,6 +55,7 @@ public function getCreatedTime() { } public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { + $fields = []; $fields['id'] = BaseFieldDefinition::create('integer') ->setLabel(t('ID')) ->setDescription(t('Lock ID')) diff --git a/src/Entity/Question.php b/src/Entity/Question.php index 9c77e23..991baf8 100755 --- a/src/Entity/Question.php +++ b/src/Entity/Question.php @@ -2,6 +2,7 @@ namespace Drupal\asklib\Entity; +use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface; use Drupal; use LogicException; use RuntimeException; @@ -105,7 +106,7 @@ public function setNotificationFlags($flags) { public function reserve($user_or_id) { $uid = is_object($user_or_id) ? $user_or_id->id() : $user_or_id; - $lock = Drupal::entityManager()->getStorage('asklib_lock')->create(); + $lock = \Drupal::service('entity_type.manager')->getStorage('asklib_lock')->create(); $lock->setUser($uid); $lock->setQuestion($this); @@ -326,7 +327,7 @@ public function setAnsweredTime($time) { throw new LogicException('Cannot set answer time without Answer object'); } if ($time instanceof DateTime) { - $time = $time->format(DATETIME_DATETIME_STORAGE_FORMAT); + $time = $time->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT); } $this->getAnswer()->setAnsweredTime($time); } @@ -562,7 +563,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { ->setDescription(t('Municipality of the user.')) ->setSettings([ 'target_type' => 'taxonomy_term', - 'handler' => 'default', + 'handler' => 'asklib_question_municipality_selection', 'handler_settings' => [ 'target_bundles' => ['asklib_municipalities' => 'asklib_municipalities'], 'sort' => [ diff --git a/src/EventSubscriber/AllowRemoteQuestionFrames.php b/src/EventSubscriber/AllowRemoteQuestionFrames.php index 894a3c1..bb27452 100644 --- a/src/EventSubscriber/AllowRemoteQuestionFrames.php +++ b/src/EventSubscriber/AllowRemoteQuestionFrames.php @@ -2,17 +2,18 @@ namespace Drupal\asklib\EventSubscriber; +use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\HttpKernel\Event\FilterResponseEvent; class AllowRemoteQuestionFrames implements EventSubscriberInterface { public static function getSubscribedEvents() { + $events = []; $events[KernelEvents::RESPONSE] = [['onResponse']]; return $events; } - public function onResponse(FilterResponseEvent $event) { + public function onResponse(ResponseEvent $event) { $path = $event->getRequest()->getPathInfo(); if (strpos($path, '/asklib/embed/') === 0) { diff --git a/src/EventSubscriber/UserPageOverride.php b/src/EventSubscriber/UserPageOverride.php index acb477c..06bd594 100644 --- a/src/EventSubscriber/UserPageOverride.php +++ b/src/EventSubscriber/UserPageOverride.php @@ -2,12 +2,12 @@ namespace Drupal\asklib\EventSubscriber; +use Symfony\Component\HttpKernel\Event\RequestEvent; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\HttpKernel\Event\GetResponseEvent; class UserPageOverride implements EventSubscriberInterface { public static function getSubscribedEvents() { @@ -21,7 +21,7 @@ public function __construct(RouteMatchInterface $route_match, AccountInterface $ $this->currentUser = $current_user; } - public function onRequest(GetResponseEvent $event) { + public function onRequest(RequestEvent $event) { $allowed = $this->currentUser->hasPermission('answer questions'); if ($allowed && $this->currentRoute->getRouteName() == 'user.page') { diff --git a/src/Form/AdminForm.php b/src/Form/AdminForm.php index 60bb5bf..91a5c08 100644 --- a/src/Form/AdminForm.php +++ b/src/Form/AdminForm.php @@ -14,7 +14,7 @@ class AdminForm extends ConfigFormBase { public static function create(ContainerInterface $container) { return new static( $container->get('config.factory'), - $container->get('entity.manager')->getStorage("taxonomy_term") + $container->get('entity_type.manager')->getStorage("taxonomy_term") ); } @@ -85,7 +85,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ]; $terms = $this->terms->loadByProperties(['vid' => 'forums']); - $options = array_map(function($term) { return $term->label(); }, $terms); + $options = array_map(fn($term) => $term->label(), $terms); $form['field_forum'] = [ '#type' => 'details', diff --git a/src/Form/MailGroupUserForm.php b/src/Form/MailGroupUserForm.php index 71cb548..ca0dc75 100644 --- a/src/Form/MailGroupUserForm.php +++ b/src/Form/MailGroupUserForm.php @@ -8,6 +8,9 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormStateInterface; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Entity\EntityRepositoryInterface; +use Drupal\Core\Entity\EntityTypeBundleInfoInterface; +use Drupal\Component\Datetime\TimeInterface; class MailGroupUserForm extends ContentEntityForm { private $groupHelper; @@ -21,14 +24,19 @@ class MailGroupUserForm extends ContentEntityForm { public static function create(ContainerInterface $container) { return new static( - $container->get('entity.manager'), + $container->get('entity.repository'), + $container->get('entity_type.bundle.info'), + $container->get('datetime.time'), $container->get('user.data'), $container->get('asklib.user_mail_group_helper') ); } - public function __construct(EntityManagerInterface $entity_manager, UserDataInterface $config, UserMailGroupHelper $group_helper) { - parent::__construct($entity_manager); + public function __construct( + EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info, TimeInterface $time, + UserDataInterface $config, UserMailGroupHelper $group_helper) { + + parent::__construct($entity_repository, $entity_type_bundle_info, $time); $this->userData = $config; $this->groupHelper = $group_helper; } @@ -39,7 +47,7 @@ public function form(array $form, FormStateInterface $form_state) { $user_groups = $this->groupHelper->getGroupsForUser($this->entity->id()); $groups = $this->sortGroups($this->groups(), $user_groups); - $labels = array_map(function($term) { return $term->label(); }, $groups); + $labels = array_map(fn($term) => $term->label(), $groups); if (empty($form['field_asklib_mail']['widget'][0]['value']['#default_value'])) { $form['field_asklib_mail']['widget'][0]['value']['#default_value'] = $this->entity->getEmail(); @@ -50,7 +58,7 @@ public function form(array $form, FormStateInterface $form_state) { $form['field_asklib_signature']['widget'][0]['value']['#default_value'] = $this->getSetting('email.signature'); } - $label_suffix = array_map(function($g) { return $g->getName(); }, $user_groups); + $label_suffix = array_map(fn($g) => $g->getName(), $user_groups); $label_suffix = implode(', ', $label_suffix); if ($label_suffix) { @@ -82,8 +90,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) { } private function groups() { - $storage = $this->entityManager->getStorage('taxonomy_term'); + $storage = $this->entityTypeManager->getStorage('taxonomy_term'); $tids = $storage->getQuery() + ->accessCheck(false) ->sort('tid') ->condition('vid', ['asklib_libraries', 'asklib_municipalities'], 'in') ->execute(); diff --git a/src/Form/MailingGroupsForm.php b/src/Form/MailingGroupsForm.php index 1f0626b..8796969 100644 --- a/src/Form/MailingGroupsForm.php +++ b/src/Form/MailingGroupsForm.php @@ -14,7 +14,7 @@ public static function create(ContainerInterface $container) { return new static( $container->get('config.factory'), - $container->get('entity.manager')->getStorage('taxonomy_term') + $container->get('entity_type.manager')->getStorage('taxonomy_term') ); } @@ -30,6 +30,7 @@ public function getFormId() public function buildForm(array $form, FormStateInterface $form_state) { + $mopts = []; $config = $this->config('asklib.settings'); $form = parent::buildForm($form, $form_state); diff --git a/src/Form/ProvideEntityFormActionGetter.php b/src/Form/ProvideEntityFormActionGetter.php index 9887779..370f62f 100644 --- a/src/Form/ProvideEntityFormActionGetter.php +++ b/src/Form/ProvideEntityFormActionGetter.php @@ -9,7 +9,7 @@ */ trait ProvideEntityFormActionGetter { public function action($id) { - return $this->entityManager->getStorage('action')->load($id); + return $this->entityTypeManager->getStorage('action')->load($id); } public function executeAction($action_id, QuestionInterface $question) { diff --git a/src/Form/QuestionAdminForm.php b/src/Form/QuestionAdminForm.php index 0f52fe1..0f588e0 100644 --- a/src/Form/QuestionAdminForm.php +++ b/src/Form/QuestionAdminForm.php @@ -8,7 +8,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Path\AliasStorageInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Render\Element; use Drupal\Core\Url; use Drupal\asklib\ProvideQuestionFormHeader; @@ -18,8 +18,11 @@ use Drupal\autoslug\SluggerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Drupal\Core\Entity\EntityTypeBundleInfoInterface; +use Drupal\Component\Datetime\TimeInterface; use Drupal\Core\Config\Config; +use Drupal\Core\Entity\EntityRepositoryInterface; class QuestionAdminForm extends ContentEntityForm { use ProvideEntityFormActionGetter; @@ -32,17 +35,23 @@ class QuestionAdminForm extends ContentEntityForm { public static function create(ContainerInterface $container) { return new static( - $container->get('entity.manager'), + $container->get('entity.repository'), + $container->get('entity_type.bundle.info'), + $container->get('datetime.time'), $container->get('date.formatter'), - $container->get('path.alias_storage'), + $container->get('entity_type.manager')->getStorage('path_alias'), $container->get('autoslug.slugger.default'), $container->get('config.factory')->get('asklib.settings'), $container->get('asklib.user_mail_group_helper') ); } - public function __construct(EntityManagerInterface $em, DateFormatterInterface $dates, AliasStorageInterface $aliases, SluggerInterface $alias_generator, Config $config, UserMailGroupHelper $mail_groups) { - parent::__construct($em); + public function __construct( + EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info, TimeInterface $time, + DateFormatterInterface $dates, EntityStorageInterface $aliases, SluggerInterface $alias_generator, Config $config, UserMailGroupHelper $mail_groups + ) { + + parent::__construct($entity_repository, $entity_type_bundle_info, $time); $this->dates = $dates; $this->aliases = $aliases; $this->aliasGenerator = $alias_generator; @@ -55,7 +64,7 @@ public function form(array $form, FormStateInterface $form_state) { $answer = $question->getAnswer(); if (!$answer && $question->isReservedTo($this->currentUser())) { - $answer = $this->entityManager->getStorage('asklib_answer')->create(); + $answer = $this->entityTypeManager->getStorage('asklib_answer')->create(); $question->setAnswer($answer); } @@ -151,7 +160,7 @@ public function form(array $form, FormStateInterface $form_state) { '#type' => 'link', '#weight' => 100, '#title' => $this->t('Redirect to another group'), - '#url' => $question->urlInfo('redirect-form'), + '#url' => $question->toUrl('redirect-form'), '#access' => $question->isAvailableTo($this->currentUser()) && !$question->isAnswered(), ] ]; @@ -238,7 +247,17 @@ public function form(array $form, FormStateInterface $form_state) { $form['tags']['#group'] = 'tags_group'; $form['tags']['#attached']['library'][] = 'finto_taxonomy/kifiform-tags-plugin'; - $form['tags']['widget']['target_id']['#description'] = $this->t('Select keywords from the drop-down list or press Enter to add a new one.'); + // Add this block to restrict new term creation in 'asklib_tags' when language is Swedish or English + $content_langcode = $this->entity->language()->getId(); + if (in_array($content_langcode, ['sv', 'en'])) { + // Allow auto creation only in 'finto' vocabulary. + $form['tags']['widget']['#selection_settings']['auto_create_bundles'] = ['finto']; + $form['#attached']['drupalSettings']['kifiform'] = [ + 'disableEnter' => TRUE, + ]; + } + + $form['tags']['widget']['target_id']['#description'] = $this->t('Select keywords from the drop-down list.'); $form['tags']['tags_legend'] = [ 'finto_legend' => [ @@ -394,6 +413,7 @@ public function form(array $form, FormStateInterface $form_state) { // Add header after possibly disabling inputs. $form['header'] = $this->getQuestionFormHeader($question); + // dump($form['tags']); return $form; } @@ -416,20 +436,6 @@ public function actions(array $form, FormStateInterface $form_state) { '#limit_validation_errors' => [], ]; } else if ($question->access('release')) { - $actions['release'] = [ - '#type' => 'submit', - // '#value' => $this->t('Release question'), - '#value' => $question->isAnswered() ? $this->t('Release question') : $this->t('Release to waiting queue'), - '#submit' => ['::release'], - '#validate' => ['::validateRelease'], - '#limit_validation_errors' => [], - - // This button is placed in the reserved status notification and we want to hide it - // from the bottom of the form. - '#attributes' => [ - 'style' => 'display: none' - ] - ]; $actions['submit']['#submit'] = [ '::submitForm', @@ -472,7 +478,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { } else { $answer_data['email_sent'] = NULL; - $answer = $this->entityManager->getStorage('asklib_answer')->create($answer_data); + $answer = $this->entityTypeManager->getStorage('asklib_answer')->create($answer_data); $answer->setUser($this->currentUser()->id()); $this->entity->setAnswer($answer); } @@ -486,9 +492,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $old_langcode = $term->language()->getId(); $new_langcode = $this->entity->language()->getId(); - $new_term = $this->entityManager->getStorage('taxonomy_term')->create([ + $new_term = $this->entityTypeManager->getStorage('taxonomy_term')->create([ 'name' => $term->getName(), - 'vid' => $term->getVocabularyId(), + 'vid' => $term->bundle(), 'langcode' => $new_langcode, ]); @@ -504,7 +510,7 @@ public function save(array $form, FormStateInterface $form_state) { $answer->save(); } - drupal_set_message(t('Changes have been saved.')); + $this->messenger()->addStatus(t('Changes have been saved.')); return $status; } @@ -515,20 +521,20 @@ public function processMarkAnswered(array $form, FormStateInterface $form_state) if ($skip_email && !$question->isAnswered()) { $this->executeAction('asklib_mark_question_answered', $question); - drupal_set_message(t('Question was marked answered.')); + $this->messenger()->addStatus(t('Question was marked answered.')); $form_state->setRedirect('view.asklib_index.page_1'); } else if (!$skip_email && !$question->getEmailSentTime() && $question->isAnswered()) { $question->getAnswer()->setAnsweredTime(NULL); - drupal_set_message(t('Question was marked unanswered.')); + $this->messenger()->addStatus(t('Question was marked unanswered.')); } } public function processSlug(array $form, FormStateInterface $form_state) { $langcode = $this->entity->language()->getId(); - $source = '/' . $this->entity->urlInfo()->getInternalPath(); - $match = $this->aliases->load([ - 'source' => $source, + $source = '/' . $this->entity->toUrl()->getInternalPath(); + $path_alias = $this->aliases->loadByProperties([ + 'path' => $source, 'langcode' => $langcode, ]); @@ -538,8 +544,18 @@ public function processSlug(array $form, FormStateInterface $form_state) { $alias = substr_replace($alias, $slug, strrpos($alias, '/') + 1); } - $pid = empty($match) ? NULL : $match['pid']; - $this->aliases->save($source, $alias, $langcode, $pid); + if (empty($path_alias)) { + $path_alias = \Drupal::entityTypeManager()->getStorage('path_alias')->create([ + 'path' => $source, + 'alias' => $alias, + 'langcode' => $langcode + ]); + } else { + // First element is the only one we need. + $path_alias = reset($path_alias); + $path_alias->setAlias($alias); + $path_alias->save(); + } } public function validateReserve(array $form, FormStateInterface $form_state) { @@ -581,7 +597,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) { } public function redirectToPreview(array $form, FormStateInterface $form_state) { - $form_state->setRedirectUrl($this->entity->urlInfo('email-form')); + $form_state->setRedirectUrl($this->entity->toUrl('email-form')); } public function reserve(array $form, FormStateInterface $form_state) { @@ -599,7 +615,7 @@ public function release(array $form, FormStateInterface $form_state) { $question->release()->save(); $form_state->setRedirect('view.asklib_index.page_1'); - drupal_set_message(t('Question released successfully.')); + $this->messenger()->addStatus(t('Question released successfully.')); } protected function rowCountForQuestion($body, $fallback = 4) { @@ -610,11 +626,11 @@ protected function rowCountForQuestion($body, $fallback = 4) { } protected function slugForQuestion() { - $slug = substr(strrchr($this->entity->url(), '/'), 1); + $slug = substr(strrchr($this->entity->toUrl()->toString(), '/'), 1); if (!ctype_digit($slug)) { // Strip query variables potentially injected by other modules etc. - list($slug, $_) = explode('?', $slug . '?'); + [$slug, $_] = explode('?', $slug . '?'); return $slug; } @@ -646,7 +662,7 @@ protected function getQuestionFormHeader(QuestionInterface $question) { 'class' => ['messages', 'messages--error'], ], '#value' => $this->t('This question is reserved to user @user until @date. You can only view this question.', [ - '@user' => $lock->getUser()->getUsername(), + '@user' => $lock->getUser()->getDisplayName(), '@date' => $this->dates->format($expires, 'month_and_day'), ]), ]; @@ -664,13 +680,19 @@ protected function getQuestionFormHeader(QuestionInterface $question) { } if ($question->access('release')) { - $header['release'] = [ - '#type' => 'button', - '#value' => $question->isAnswered() ? $this->t('Release question') : $this->t('Release to waiting queue'), - '#attributes' => [ - 'formnovalidate' => true, - ], - ]; + $header['release'] = [ + '#type' => 'submit', + '#value' => $question->isAnswered() + ? $this->t('Release question') + : $this->t('Release to waiting queue'), + '#name' => 'question_release_header', + '#submit' => ['::release'], + '#validate' => ['::validateRelease'], + '#limit_validation_errors' => [], + '#attributes' => [ + 'formnovalidate' => 'formnovalidate', + ], + ]; } } else { $header['reserved_status'] = [ @@ -686,10 +708,11 @@ protected function getQuestionFormHeader(QuestionInterface $question) { } protected function buildQuestionLockHistory() { - $storage = $this->entityManager->getStorage('asklib_lock'); + $storage = $this->entityTypeManager->getStorage('asklib_lock'); $lids = $storage->getQuery() ->condition('question', $this->entity->id()) ->sort('created', 'DESC') + ->accessCheck(false) ->execute(); $locks = $storage->loadMultiple($lids); @@ -702,12 +725,13 @@ protected function buildQuestionLockHistory() { ]; foreach ($locks as $lock) { + $table['#rows'][] = [ [ 'data' => [ '#type' => 'link', - '#title' => $lock->getUser()->getUsername(), - '#url' => $lock->getUser()->urlInfo(), + '#title' => $lock->getUser()->getAccountName(), + '#url' => $lock->getUser()->toUrl(), ] ], [ diff --git a/src/Form/QuestionChannelForm.php b/src/Form/QuestionChannelForm.php index 1766c39..04007b6 100644 --- a/src/Form/QuestionChannelForm.php +++ b/src/Form/QuestionChannelForm.php @@ -25,12 +25,12 @@ public function form(array $form, FormStateInterface $form_state) { public function save(array $form, FormStateInterface $form_state) { $status = parent::save($form, $form_state); - $form_state->setRedirectUrl($this->entity->urlInfo('collection')); + $form_state->setRedirectUrl($this->entity->toUrl('collection')); if ($status == SAVED_NEW) { - drupal_set_message($this->t('Channel @id has been created.', ['@id' => $this->entity->id()])); + $this->messenger()->addStatus($this->t('Channel @id has been created.', ['@id' => $this->entity->id()])); } else { - drupal_set_message($this->t('Changes have been saved.')); + $this->messenger()->addStatus($this->t('Changes have been saved.')); } return $status; diff --git a/src/Form/QuestionDeleteForm.php b/src/Form/QuestionDeleteForm.php index 6812190..e925691 100644 --- a/src/Form/QuestionDeleteForm.php +++ b/src/Form/QuestionDeleteForm.php @@ -31,7 +31,7 @@ public function getDescription() public function submitForm(array &$form, FormStateInterface $form_state) { $this->entity->delete(); - drupal_set_message($this->t('The question has been deleted.')); + $this->messenger()->addStatus($this->t('The question has been deleted.')); $this->logger('content')->notice('Deleted question @id', ['@id' => $this->entity->id()]); $form_state->setRedirectUrl($this->getCancelUrl()); } diff --git a/src/Form/QuestionEmailPreviewForm.php b/src/Form/QuestionEmailPreviewForm.php index e40c67d..759dfce 100644 --- a/src/Form/QuestionEmailPreviewForm.php +++ b/src/Form/QuestionEmailPreviewForm.php @@ -6,7 +6,6 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Url; use Drupal\Core\Entity\ContentEntityForm; -use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\File\FileUsage\FileUsageInterface; @@ -14,6 +13,9 @@ use Drupal\asklib\UserMailGroupHelper; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Drupal\Core\Entity\EntityRepositoryInterface; +use Drupal\Core\Entity\EntityTypeBundleInfoInterface; +use Drupal\Component\Datetime\TimeInterface; use Drupal\Core\Session\AccountInterface; @@ -24,13 +26,18 @@ class QuestionEmailPreviewForm extends ContentEntityForm { public static function create(ContainerInterface $container) { return new static( - $container->get('entity.manager'), + $container->get('entity.repository'), + $container->get('entity_type.bundle.info'), + $container->get('datetime.time'), $container->get('asklib.user_mail_group_helper') ); } - public function __construct(EntityManagerInterface $em, UserMailGroupHelper $mail_groups) { - parent::__construct($em); + public function __construct( + EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info, TimeInterface $time, + UserMailGroupHelper $mail_groups + ) { + parent::__construct($entity_repository, $entity_type_bundle_info, $time); $this->mailGroups = $mail_groups; } @@ -40,7 +47,7 @@ public function form(array $form, FormStateInterface $form_state) { $question = $this->entity; $answer = $question->getAnswer(); - $sender = $this->entityManager->getStorage('user')->load($this->currentUser()->id()); + $sender = $this->entityTypeManager->getStorage('user')->load($this->currentUser()->id()); foreach (Element::children($form) as $name) { $form[$name]['#access'] = FALSE; @@ -126,7 +133,7 @@ public function form(array $form, FormStateInterface $form_state) { '#tag' => 'iframe', '#attributes' => [ 'class' => ['email-preview-frame'], - 'src' => $question->urlInfo('email-preview')->toString(), + 'src' => $question->toUrl('email-preview')->toString(), 'style' => 'width: 100%; min-height: 400px;', ], ]; @@ -205,7 +212,7 @@ public function sendEmail(array $form, FormStateInterface $form_state) { $this->executeAction('asklib_mark_question_answered', $this->entity); $form_state->setRedirect('view.asklib_index.page_1'); - drupal_set_message(t('Email was sent successfully.')); + $this->messenger()->addStatus(t('Email was sent successfully.')); } public function save(array $form, FormStateInterface $form_state) { diff --git a/src/Form/QuestionForm.php b/src/Form/QuestionForm.php index 89ca830..86bebf2 100755 --- a/src/Form/QuestionForm.php +++ b/src/Form/QuestionForm.php @@ -92,8 +92,9 @@ public function actions(array $form, FormStateInterface $form_state) { public function processTheme(array $form, FormStateInterface $form_state) { if ($tid = $form_state->getValue('theme')) { - $term_storage = $this->entityManager->getStorage('taxonomy_term'); + $term_storage = $this->entityTypeManager->getStorage('taxonomy_term'); $query = $term_storage->getQuery() + ->accessCheck(FALSE) ->condition('vid', 'asklib_libraries') ->condition('field_asklib_theme', $tid); @@ -116,7 +117,7 @@ public function submitForm(array & $form, FormStateInterface $form_state) { public function save(array $form, FormStateInterface $form_state) { $this->entity->setNotificationFlags(-1); - drupal_set_message(t('Thank you for your question! We will answer you within three days. If you do not hear from us, please contact us at @email.', [ + $this->messenger()->addStatus(t('Thank you for your question! We will answer you within three days. If you do not hear from us, please contact us at @email.', [ '@email' => 'toimitus@kirjastot.fi' ])); @@ -130,6 +131,7 @@ protected function getCategoryOptions() { ->select('taxonomy_term_field_data', 't') ->fields('t', ['tid', 'name']) ->condition('t.vid', 'asklib_themes') + ->condition('t.status', 1) ->condition('t.langcode', $langcode) ->orderBy('t.name') ; diff --git a/src/Form/QuestionRedirectForm.php b/src/Form/QuestionRedirectForm.php index f7b54e7..8d2c558 100644 --- a/src/Form/QuestionRedirectForm.php +++ b/src/Form/QuestionRedirectForm.php @@ -33,7 +33,7 @@ public function form(array $form, FormStateInterface $form_state) { } protected function filterDisabledAnswerers(array $options) { - $storage = $this->entityManager->getStorage('taxonomy_term'); + $storage = $this->entityTypeManager->getStorage('taxonomy_term'); foreach ($options as $id => $item) { if (is_array($item)) { @@ -60,7 +60,7 @@ public function actions(array $form, FormStateInterface $form_state) { public function save(array $form, FormStateInterface $form_state) { $this->entity->setNotificationFlags(QuestionInterface::NOTIFY_SUBSCRIBERS); $form_state->setRedirect('view.asklib_index.page_1'); - drupal_set_message(t('Target library updated.')); + $this->messenger()->addStatus(t('Target library updated.')); return parent::save($form, $form_state); } diff --git a/src/Form/RemoteQuestionForm.php b/src/Form/RemoteQuestionForm.php index a6e0346..eb4a947 100644 --- a/src/Form/RemoteQuestionForm.php +++ b/src/Form/RemoteQuestionForm.php @@ -28,6 +28,14 @@ public function form(array $form, FormStateInterface $form_state) { } } + // Check if form was submitted by looking for the URL query parameter. + $submitted = \Drupal::request()->query->get('submitted'); + + if ($submitted) { + $message = \Drupal::config('asklib.settings')->get('confirmation'); + $this->messenger()->addStatus($message); + } + // Need to set language manually because Question is not marked as 'translatable'. $form['langcode'] = [ '#type' => 'value', @@ -62,8 +70,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) { public function save(array $form, FormStateInterface $form_state) { $this->entity->setNotificationFlags(-1); - $message = \Drupal::config('asklib.settings')->get('confirmation'); - drupal_set_message($message); + $current_path = \Drupal::service('path.current')->getPath(); + $form_state->setRedirectUrl(\Drupal\Core\Url::fromUserInput($current_path, ['query' => ['submitted' => 1]])); return parent::save($form, $form_state); } @@ -71,7 +79,7 @@ public function save(array $form, FormStateInterface $form_state) { private function channelFromRoute() { $term = \Drupal::routeMatch()->getParameter('channel'); - if ($term->getVocabularyId() != 'asklib_channels') { + if ($term->bundle() != 'asklib_channels') { throw new NotFoundHttpException; } diff --git a/src/Form/RespondentsForm.php b/src/Form/RespondentsForm.php index 038cab4..1fbcdb5 100644 --- a/src/Form/RespondentsForm.php +++ b/src/Form/RespondentsForm.php @@ -12,7 +12,7 @@ class RespondentsForm extends ConfigFormBase { public static function create(ContainerInterface $container) { return new static( $container->get('config.factory'), - $container->get('entity.manager')->getStorage('taxonomy_term') + $container->get('entity_type.manager')->getStorage('taxonomy_term') ); } @@ -26,6 +26,7 @@ public function getFormId() { } public function buildForm(array $form, FormStateInterface $form_state) { + $mopts = []; $config = $this->config('asklib.settings'); $form = parent::buildForm($form, $form_state); diff --git a/src/Form/UserMailingGroupsForm.php b/src/Form/UserMailingGroupsForm.php index ed1c07d..751d850 100644 --- a/src/Form/UserMailingGroupsForm.php +++ b/src/Form/UserMailingGroupsForm.php @@ -15,7 +15,7 @@ class UserMailingGroupsForm extends ConfigFormBase { public static function create(ContainerInterface $container) { return new static( $container->get('config.factory'), - $container->get('entity.manager')->getStorage('user') + $container->get('entity_type.manager')->getStorage('user') ); } @@ -29,6 +29,7 @@ public function getFormId() { } public function buildForm(array $form, FormStateInterface $form_state) { + $mopts = []; $config = $this->config('asklib.settings'); $form = parent::buildForm($form, $form_state); diff --git a/src/MailGroupListBuilder.php b/src/MailGroupListBuilder.php index ed5ab55..8d90cb7 100644 --- a/src/MailGroupListBuilder.php +++ b/src/MailGroupListBuilder.php @@ -30,6 +30,7 @@ public function buildHeader() { } public function buildRow(EntityInterface $term) { + $row = []; $status = [ $this->t('Disabled'), $this->t('Enabled'), @@ -37,7 +38,7 @@ public function buildRow(EntityInterface $term) { $row['name']['data'] = [ '#type' => 'link', '#title' => $term->label(), - '#url' => $term->urlInfo(), + '#url' => $term->toUrl(), ]; $row['type'] = $term->vid->entity->label(); $row['enabled'] = $status[$term->get('field_asklib_active')->value]; @@ -49,7 +50,7 @@ protected function getDefaultOperations(EntityInterface $term) { $ops['edit'] = [ 'title' => $this->t('Edit'), - 'url' => $term->urlInfo('asklib-mail-group-form'), + 'url' => $term->toUrl('asklib-mail-group-form'), 'weight' => 0, ]; @@ -71,6 +72,6 @@ protected function getEntityIds() { $query->pager($this->limit); } - return $query->execute(); + return $query->accessCheck(FALSE)->execute(); } } diff --git a/src/MailUserListBuilder.php b/src/MailUserListBuilder.php index 88b6593..a56ef21 100644 --- a/src/MailUserListBuilder.php +++ b/src/MailUserListBuilder.php @@ -32,6 +32,7 @@ public function buildHeader() public function buildRow(EntityInterface $user) { + $row = []; $groups = []; foreach ($this->groups($user->id()) as $tid) { $groups[] = $this->term_cache[$tid]->label(); @@ -67,7 +68,7 @@ protected function getEntityIds() { $query->pager($this->limit); } - return $query->execute(); + return $query->accessCheck(FALSE)->execute(); } protected function getDefaultOperations(EntityInterface $term) { @@ -75,7 +76,7 @@ protected function getDefaultOperations(EntityInterface $term) { $ops['edit'] = [ 'title' => $this->t('Edit'), - 'url' => $term->urlInfo('asklib-mail-group-form'), + 'url' => $term->toUrl('asklib-mail-group-form'), 'weight' => 0, ]; @@ -90,13 +91,13 @@ private function cacheGroups($uids) { if (empty($uids)) { return; } - $phs = implode(',', array_fill(0, count($uids), '?')); + $phs = implode(',', array_fill(0, is_countable($uids) ? count($uids) : 0, '?')); $query = sprintf(' SELECT entity_id tid, field_asklib_subscribers_target_id uid FROM {taxonomy_term__field_asklib_subscribers} WHERE field_asklib_subscribers_target_id IN (%s) ', $phs); - $smt = \Drupal::service('database')->prepareQuery($query); + $smt = \Drupal::service('database')->prepareStatement($query, ['allow_square_brackets' => FALSE]); $smt->execute(array_values($uids)); $tids = []; @@ -106,6 +107,6 @@ private function cacheGroups($uids) { $tids[] = $row->tid; } - $this->term_cache = \Drupal::entityManager()->getStorage('taxonomy_term')->loadMultiple($tids); + $this->term_cache = \Drupal::service('entity_type.manager')->getStorage('taxonomy_term')->loadMultiple($tids); } } diff --git a/src/Plugin/Action/EmailActionBase.php b/src/Plugin/Action/EmailActionBase.php index f5b75f8..25afe9f 100644 --- a/src/Plugin/Action/EmailActionBase.php +++ b/src/Plugin/Action/EmailActionBase.php @@ -42,9 +42,6 @@ public function access($object, AccountInterface $account = NULL, $return_as_obj } protected function mail($mail_id, $recipients, $langcode, $mail, $reply_to = null) { - if (is_array($recipients)) { - $recipients = implode(', ', $recipients); - } if (is_null($reply_to)) { $reply_to = $this->getGenericSenderAddress(); @@ -53,16 +50,30 @@ protected function mail($mail_id, $recipients, $langcode, $mail, $reply_to = nul $mail = $this->mailer->mail('asklib', $mail_id, $recipients, $langcode, $mail, $reply_to); if ($mail['result']) { - $storage = \Drupal::entityTypeManager()->getStorage('kifimail_log'); - $storage->create([ - 'module' => $mail['module'], - 'message_id' => $mail['key'], - 'email' => $mail['to'], - 'langcode' => $mail['langcode'], - 'subject' => $mail['subject'], - 'body' => $mail['body'], - 'user' => \Drupal::currentUser()->id(), - ])->save(); + + $log_message = <<[asklib_question:body]
\r\n