From c718f0e979fb85353dcc060942c8979229027095 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 16:40:02 +0200
Subject: [PATCH 01/31] refactored mailer module to 2.0 style

---
 .../Stage/Install/CompleteStage.php           |   2 +-
 .../BlocksModule/Container/LinkContainer.php  |   5 +-
 .../Controller/AdminController.php            |  12 +-
 .../Controller/BlockController.php            |  12 +-
 .../Controller/PositionController.php         |  12 +-
 .../ZikulaBlocksExtension.php                 |  11 +
 .../Resources/config/services.xml             |   2 +-
 .../Resources/views/Admin/config.html.twig    |   1 -
 .../Container/LinkContainer.php               | 109 +++---
 .../Controller/ModuleController.php           |   4 +-
 .../ZikulaExtensionsExtension.php             |  11 +
 .../Resources/config/services.xml             |   2 +-
 .../Resources/views/Config/config.html.twig   |   1 -
 src/system/MailerModule/Api/AdminApi.php      |  48 ---
 src/system/MailerModule/Api/MailerApi.php     | 340 ++++++++++++++++++
 src/system/MailerModule/Api/UserApi.php       | 185 +---------
 .../MailerModule/Container/LinkContainer.php  | 105 ++++++
 .../Controller/AdminController.php            | 186 +++++++---
 .../ZikulaMailerExtension.php                 |  35 ++
 .../Form/Handler/ModifyConfigHandler.php      | 162 ---------
 .../Form/Handler/TestConfigHandler.php        | 126 -------
 .../MailerModule/Form/Type/ConfigType.php     | 211 +++++++++++
 .../MailerModule/Form/Type/TestType.php       | 136 +++++++
 .../Resources/config/services.xml             |  52 +++
 .../Resources/views/Admin/config.html.twig    |  62 ++++
 .../Resources/views/Admin/modifyconfig.tpl    | 135 -------
 .../Resources/views/Admin/test.html.twig      |  48 +++
 .../Resources/views/Admin/testconfig.tpl      |  86 -----
 .../MailerModule/Twig/TwigExtension.php       |  52 +++
 29 files changed, 1299 insertions(+), 854 deletions(-)
 delete mode 100644 src/system/MailerModule/Api/AdminApi.php
 create mode 100644 src/system/MailerModule/Api/MailerApi.php
 create mode 100644 src/system/MailerModule/Container/LinkContainer.php
 create mode 100644 src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
 delete mode 100644 src/system/MailerModule/Form/Handler/ModifyConfigHandler.php
 delete mode 100644 src/system/MailerModule/Form/Handler/TestConfigHandler.php
 create mode 100644 src/system/MailerModule/Form/Type/ConfigType.php
 create mode 100644 src/system/MailerModule/Form/Type/TestType.php
 create mode 100644 src/system/MailerModule/Resources/config/services.xml
 create mode 100644 src/system/MailerModule/Resources/views/Admin/config.html.twig
 delete mode 100644 src/system/MailerModule/Resources/views/Admin/modifyconfig.tpl
 create mode 100644 src/system/MailerModule/Resources/views/Admin/test.html.twig
 delete mode 100644 src/system/MailerModule/Resources/views/Admin/testconfig.tpl
 create mode 100644 src/system/MailerModule/Twig/TwigExtension.php

diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php
index fabf78a63e..11939ccd12 100644
--- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php
+++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php
@@ -62,7 +62,7 @@ public function getResponse(Request $request)
         } else {
             $request->getSession()->getFlashBag()->add('warning', __('Email settings are not yet configured. Please configure them below.'));
 
-            return new RedirectResponse($this->container->get('router')->generate('zikulamailermodule_admin_modifyconfig', array(), RouterInterface::ABSOLUTE_URL));
+            return new RedirectResponse($this->container->get('router')->generate('zikulamailermodule_admin_config', array(), RouterInterface::ABSOLUTE_URL));
         }
     }
 
diff --git a/src/system/BlocksModule/Container/LinkContainer.php b/src/system/BlocksModule/Container/LinkContainer.php
index c8d55aa50a..374a783825 100644
--- a/src/system/BlocksModule/Container/LinkContainer.php
+++ b/src/system/BlocksModule/Container/LinkContainer.php
@@ -24,10 +24,12 @@ class LinkContainer implements LinkContainerInterface
      * @var Translator
      */
     private $translator;
+
     /**
      * @var RouterInterface
      */
     private $router;
+
     /**
      * @var PermissionApi
      */
@@ -87,8 +89,7 @@ private function getAdmin()
                 'text' => $this->translator->__('Create new block'),
                 'icon' => 'plus'
             ];
-        }
-        if ($this->permissionApi->hasPermission('ZikulaBlocksModule::', '::', ACCESS_ADD)) {
+
             $links[] = [
                 'url' => $this->router->generate('zikulablocksmodule_position_edit'),
                 'text' => $this->translator->__('Create new block position'),
diff --git a/src/system/BlocksModule/Controller/AdminController.php b/src/system/BlocksModule/Controller/AdminController.php
index 152920c4a6..ba06c986af 100644
--- a/src/system/BlocksModule/Controller/AdminController.php
+++ b/src/system/BlocksModule/Controller/AdminController.php
@@ -118,6 +118,7 @@ public function viewAction(Request $request)
      * @Template
      *
      * @param Request $request
+     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function configAction(Request $request)
@@ -127,11 +128,12 @@ public function configAction(Request $request)
         }
 
         $form = $this->createFormBuilder($this->getVars())
-            ->add('collapseable', 'checkbox', ['label' => __('Enable block collapse icons'),
+            ->add('collapseable', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [
+                'label' => $this->__('Enable block collapse icons'),
                 'required' => false
             ])
-            ->add('save', 'submit', ['label' => 'Save'])
-            ->add('cancel', 'submit', ['label' => 'Cancel'])
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Save')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
 
         $form->handleRequest($request);
@@ -139,10 +141,10 @@ public function configAction(Request $request)
         if ($form->isValid()) {
             if ($form->get('save')->isClicked()) {
                 $this->setVars($form->getData());
-                $this->addFlash('status', __('Done! Module configuration updated.'));
+                $this->addFlash('status', $this->__('Done! Module configuration updated.'));
             }
             if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', __('Operation cancelled.'));
+                $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
             return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
diff --git a/src/system/BlocksModule/Controller/BlockController.php b/src/system/BlocksModule/Controller/BlockController.php
index 07446da831..db1a4255ee 100644
--- a/src/system/BlocksModule/Controller/BlockController.php
+++ b/src/system/BlocksModule/Controller/BlockController.php
@@ -164,8 +164,8 @@ public function deleteAction(Request $request, BlockEntity $blockEntity)
         }
 
         $form = $this->createFormBuilder()
-            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Delete'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
 
         $form->handleRequest($request);
@@ -247,11 +247,11 @@ private function getBlockModifyOutput($blockClassInstance, BlockEntity $blockEnt
      */
     private function formContentModify(Request $request, BlockEntity $blockEntity = null)
     {
+        $options = [];
         if (isset($blockEntity)) {
             $options = ['data' => $blockEntity->getContent() == [] ? '' : $blockEntity->getContent()];
-        } else {
-            $options = [];
         }
+
         $form = $this->createFormBuilder()
             ->add('content', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', $options)
             ->getForm();
@@ -277,7 +277,7 @@ private function formContentModify(Request $request, BlockEntity $blockEntity =
     public function viewAction(BlockEntity $blockEntity = null)
     {
         return $this->render('@ZikulaBlocksModule/Admin/blockview.html.twig', [
-                'block' => $blockEntity,
-            ]);
+            'block' => $blockEntity,
+        ]);
     }
 }
diff --git a/src/system/BlocksModule/Controller/PositionController.php b/src/system/BlocksModule/Controller/PositionController.php
index 85817b175c..85701e59d9 100644
--- a/src/system/BlocksModule/Controller/PositionController.php
+++ b/src/system/BlocksModule/Controller/PositionController.php
@@ -59,10 +59,10 @@ public function editAction(Request $request, BlockPositionEntity $positionEntity
                 $em = $this->getDoctrine()->getManager();
                 $em->persist($positionEntity);
                 $em->flush();
-                $this->addFlash('status', __('Position saved!'));
+                $this->addFlash('status', $this->__('Position saved!'));
             }
             if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', __('Operation cancelled.'));
+                $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
             return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
@@ -91,8 +91,8 @@ public function deleteAction(Request $request, BlockPositionEntity $positionEnti
         }
 
         $form = $this->createFormBuilder()
-            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Delete'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
 
         $form->handleRequest($request);
@@ -102,10 +102,10 @@ public function deleteAction(Request $request, BlockPositionEntity $positionEnti
                 $em = $this->getDoctrine()->getManager();
                 $em->remove($positionEntity);
                 $em->flush();
-                $this->addFlash('status', __('Done! Position deleted.'));
+                $this->addFlash('status', $this->__('Done! Position deleted.'));
             }
             if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', __('Operation cancelled.'));
+                $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
             return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
diff --git a/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php b/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
index d791d6e01b..9272e8d6d7 100644
--- a/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
+++ b/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
 
 namespace Zikula\BlocksModule\DependencyInjection;
 
diff --git a/src/system/BlocksModule/Resources/config/services.xml b/src/system/BlocksModule/Resources/config/services.xml
index 8e8ce2b4dd..5cb64af29b 100644
--- a/src/system/BlocksModule/Resources/config/services.xml
+++ b/src/system/BlocksModule/Resources/config/services.xml
@@ -19,7 +19,7 @@
 
     <services>
         <service id="zikula_blocks_module.container.link_container" class="%zikula_blocks_module.container.link_container.class%">
-            <argument type="service" id="translator" />
+            <argument type="service" id="translator.default" />
             <argument type="service" id="jms_i18n_routing.router" />
             <argument type="service" id="zikula_permissions_module.api.permission" />
             <tag name="zikula.link_container"/>
diff --git a/src/system/BlocksModule/Resources/views/Admin/config.html.twig b/src/system/BlocksModule/Resources/views/Admin/config.html.twig
index 23a0890271..b4d9a8a4e6 100644
--- a/src/system/BlocksModule/Resources/views/Admin/config.html.twig
+++ b/src/system/BlocksModule/Resources/views/Admin/config.html.twig
@@ -21,6 +21,5 @@
         </div>
         {{ form_end(form) }}
     </div>
-
 </div>
 {{ adminFooter() }}
diff --git a/src/system/ExtensionsModule/Container/LinkContainer.php b/src/system/ExtensionsModule/Container/LinkContainer.php
index ab12a63fa0..babc7f606f 100644
--- a/src/system/ExtensionsModule/Container/LinkContainer.php
+++ b/src/system/ExtensionsModule/Container/LinkContainer.php
@@ -24,10 +24,12 @@ class LinkContainer implements LinkContainerInterface
      * @var Translator
      */
     private $translator;
+
     /**
      * @var RouterInterface
      */
     private $router;
+
     /**
      * @var PermissionApi
      */
@@ -71,51 +73,72 @@ public function getLinks($type = LinkContainerInterface::TYPE_ADMIN)
      */
     private function getAdmin()
     {
-        $links = array();
-
-        if ($this->permissionApi->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
-            $links[] = [
-                'url' => $this->router->generate('zikulaextensionsmodule_module_viewmodulelist'),
-                'text' => $this->translator->__('Extension List'),
-                'icon' => 'list'
-            ];
-
-            $links[] = array(
-                'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
-                'text' => $this->translator->__('Plugins list'),
-                'icon' => 'table',
-                'links' => array(
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
-                        'text' => $this->translator->__('All')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => \PluginUtil::NOTINSTALLED)),
-                        'text' => $this->translator->__('Not installed')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => \PluginUtil::DISABLED)),
-                        'text' => $this->translator->__('Inactive')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => \PluginUtil::ENABLED)),
-                        'text' => $this->translator->__('Active'))
-                ));
-
-            $links[] = array(
-                'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true)),
-                'text' => $this->translator->__('System Plugins'),
-                'icon' => 'table',
-                'links' => array(
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true)),
-                        'text' => $this->translator->__('All')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true, 'state' => \PluginUtil::NOTINSTALLED)),
-                        'text' => $this->translator->__('Not installed')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true, 'state' => \PluginUtil::DISABLED)),
-                        'text' => $this->translator->__('Inactive')),
-                    array('url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', array('systemplugins' => true, 'state' => \PluginUtil::ENABLED)),
-                        'text' => $this->translator->__('Active'))
-                ));
-
-            $links[] = array(
-                'url' => $this->router->generate('zikulaextensionsmodule_config_config'),
-                'text' => $this->translator->__('Settings'),
-                'icon' => 'wrench');
+        $links = [];
+
+        if (!$this->permissionApi->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
+            return $links;
         }
 
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_module_viewmodulelist'),
+            'text' => $this->translator->__('Extension List'),
+            'icon' => 'list'
+        ];
+
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
+            'text' => $this->translator->__('Plugins list'),
+            'icon' => 'table',
+            'links' => [
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins'),
+                    'text' => $this->translator->__('All')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['state' => \PluginUtil::NOTINSTALLED]),
+                    'text' => $this->translator->__('Not installed')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['state' => \PluginUtil::DISABLED]),
+                    'text' => $this->translator->__('Inactive')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['state' => \PluginUtil::ENABLED]),
+                    'text' => $this->translator->__('Active')
+                ]
+            ]
+        ];
+
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true]),
+            'text' => $this->translator->__('System Plugins'),
+            'icon' => 'table',
+            'links' => [
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true]),
+                    'text' => $this->translator->__('All')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true, 'state' => \PluginUtil::NOTINSTALLED]),
+                    'text' => $this->translator->__('Not installed')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true, 'state' => \PluginUtil::DISABLED]),
+                    'text' => $this->translator->__('Inactive')
+                ],
+                [
+                    'url' => $this->router->generate('zikulaextensionsmodule_admin_viewplugins', ['systemplugins' => true, 'state' => \PluginUtil::ENABLED]),
+                    'text' => $this->translator->__('Active')
+                ]
+            ]
+        ];
+
+        $links[] = [
+            'url' => $this->router->generate('zikulaextensionsmodule_config_config'),
+            'text' => $this->translator->__('Settings'),
+            'icon' => 'wrench'
+        ];
+
         return $links;
     }
 
diff --git a/src/system/ExtensionsModule/Controller/ModuleController.php b/src/system/ExtensionsModule/Controller/ModuleController.php
index 7df9559df6..b8fc5b3c0d 100644
--- a/src/system/ExtensionsModule/Controller/ModuleController.php
+++ b/src/system/ExtensionsModule/Controller/ModuleController.php
@@ -390,8 +390,8 @@ public function uninstallAction(Request $request, ExtensionEntity $extension)
         $blocks = $this->getDoctrine()->getManager()->getRepository('ZikulaBlocksModule:BlockEntity')->findBy(['module' => $extension]);
 
         $form = $this->createFormBuilder()
-            ->add('uninstall', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Delete'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('uninstall', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
             ->getForm();
         $form->handleRequest($request);
 
diff --git a/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php b/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
index c70658ac85..b3490a35a2 100644
--- a/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
+++ b/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
 
 namespace Zikula\ExtensionsModule\DependencyInjection;
 
diff --git a/src/system/ExtensionsModule/Resources/config/services.xml b/src/system/ExtensionsModule/Resources/config/services.xml
index 27415bb6e8..c4a3bdf9cc 100644
--- a/src/system/ExtensionsModule/Resources/config/services.xml
+++ b/src/system/ExtensionsModule/Resources/config/services.xml
@@ -23,7 +23,7 @@
 
     <services>
         <service id="zikula_extensions_module.container.link_container" class="%zikula_extensions_module.container.link_container.class%">
-            <argument type="service" id="translator" />
+            <argument type="service" id="translator.default" />
             <argument type="service" id="jms_i18n_routing.router" />
             <argument type="service" id="zikula_permissions_module.api.permission" />
             <tag name="zikula.link_container"/>
diff --git a/src/system/ExtensionsModule/Resources/views/Config/config.html.twig b/src/system/ExtensionsModule/Resources/views/Config/config.html.twig
index ca092d9514..d85ccedbb0 100644
--- a/src/system/ExtensionsModule/Resources/views/Config/config.html.twig
+++ b/src/system/ExtensionsModule/Resources/views/Config/config.html.twig
@@ -22,7 +22,6 @@
         </div>
         {{ form_end(form) }}
     </div>
-
 </div>
 {{ adminFooter() }}
 <script type="text/javascript">
diff --git a/src/system/MailerModule/Api/AdminApi.php b/src/system/MailerModule/Api/AdminApi.php
deleted file mode 100644
index f0761f29cd..0000000000
--- a/src/system/MailerModule/Api/AdminApi.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright Zikula Foundation 2009 - Zikula Application Framework
- *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
- *
- * @license GNU/LGPLv3 (or at your option, any later version).
-
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
- */
-
-namespace Zikula\MailerModule\Api;
-
-use SecurityUtil;
-
-/**
- * API functions used by administrative controllers
- */
-class AdminApi extends \Zikula_AbstractApi
-{
-    /**
-     * Get available admin panel links.
-     *
-     * @return array array of admin links
-     */
-    public function getLinks()
-    {
-        $links = array();
-
-        if (SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-            $links[] = array(
-                'url' => $this->get('router')->generate('zikulamailermodule_admin_testconfig'),
-                'text' => $this->__('Test current settings'),
-                'icon' => 'envelope');
-        }
-        if (SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-            $links[] = array(
-                'url' => $this->get('router')->generate('zikulamailermodule_admin_modifyconfig'),
-                'text' => $this->__('Settings'),
-                'icon' => 'wrench');
-        }
-
-        return $links;
-    }
-}
diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
new file mode 100644
index 0000000000..b82dfca1d5
--- /dev/null
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\Api;
+
+use Monolog\Logger;
+use Monolog\Handler\StreamHandler;
+use Swift_Attachment;
+use Swift_DependencyContainer;
+use Swift_Mailer;
+use Swift_Message;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
+use Zikula\Common\Translator\TranslatorInterface;
+use Zikula\Common\Translator\TranslatorTrait;
+use Zikula\ExtensionsModule\Api\VariableApi;
+use Zikula\PermissionsModule\Api\PermissionApi;
+
+/**
+ * Class MailerApi.
+ * @package Zikula\MailerModule\Api
+ *
+ * This class manages the sending of mails using SwiftMailer.
+ * It should be used instead of the old sendmessage() method in user api.
+ */
+class MailerApi
+{
+    use TranslatorTrait;
+
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
+
+    /**
+     * @var Swift_Mailer
+     */
+    private $mailer;
+
+    /**
+     * @var Swift_Message
+     */
+    private $message;
+
+    /**
+     * @var array
+     */
+    protected $dataValues;
+
+    /**
+     * @var Session
+     */
+    protected $session;
+
+    /**
+     * @var PermissionApi
+     */
+    private $permissionApi;
+
+    /**
+     * ConfigType constructor.
+     *
+     * @param TranslatorInterface      $translator      Translator service instance.
+     * @param EventDispatcherInterface $eventDispatcher EventDispatcher service instance.
+     * @param DynamicConfigDumper      $configDumper    DynamicConfigDumper service instance.
+     * @param VariableApi              $variableApi     VariableApi service instance.
+     * @param Session                  $session         Session service instance.
+     * @param PermissionApi            $permissionApi   PermissionApi service instance.
+     */
+    public function __construct(TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, DynamicConfigDumper $configDumper, VariableApi $variableApi, Swift_Mailer $mailer, Session $session, PermissionApi $permissionApi)
+    {
+        $this->setTranslator($translator);
+        $this->eventDispatcher = $eventDispatcher;
+        $this->mailer = $mailer;
+        $this->session = $session;
+        $this->permissionApi = $permissionApi;
+
+        $params = $configDumper->getConfiguration('swiftmailer');
+        $modVars = $variableApi->getAll('ZikulaMailerModule');
+        $this->dataValues = array_merge($params, $modVars);
+        $this->dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
+        $this->dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
+    }
+
+    /**
+     * Sets the translator.
+     *
+     * @param TranslatorInterface $translator Translator service instance.
+     */
+    public function setTranslator(/*TranslatorInterface */$translator)
+    {
+        $this->translator = $translator;
+    }
+
+    /**
+     * API function to send e-mail message
+     *
+     * @param mixed[] $args {
+     *       @type string       $fromname name of the sender
+     *       @type string       $fromaddress address of the sender
+     *       @type string       $toname name to the recipient
+     *       @type string       $toaddress the address of the recipient
+     *       @type string       $replytoname name to reply to
+     *       @type string       $replytoaddress address to reply to
+     *       @type string       $subject message subject
+     *       @type string       $contenttype optional contenttype of the mail (default config)
+     *       @type string       $charset optional charset of the mail (default config)
+     *       @type string       $encoding optional mail encoding (default config)
+     *       @type string       $body message body, if altbody is provided then
+     *                                    this is the HTML version of the body
+     *       @type string       $altbody alternative plain-text message body, if specified the
+     *                                    e-mail will be sent as multipart/alternative
+     *       @type array        $cc addresses to add to the cc list
+     *       @type array        $bcc addresses to add to the bcc list
+     *       @type array|string $headers custom headers to add
+     *       @type int          $html HTML flag, if altbody is not specified then this
+     *                                    indicates whether body contains HTML or not; if altbody is
+     *                                    specified, then this value is ignored, the body is assumed
+     *                                    to be HTML, and the altbody is assumed to be plain text
+     *       @type array        $attachments array of either absolute filenames to attach
+     *                                    to the mail or array of arrays in format
+     *                                    array($path,$filename,$encoding,$type)
+     *       @type array        $stringattachments array of arrays to treat as attachments, format array($string,$filename,$encoding,$type)
+     *       @type array        $embeddedimages array of absolute filenames to image files to embed in the mail
+     *                       }
+     *
+     * @throws \RuntimeException Thrown if there's an error sending the e-mail message
+     *
+     * @return bool true if successful
+     */
+    public function sendMessage($args)
+    {
+        // Development mailer mode
+        if ($this->dataValues['transport'] == 'test') {
+            $output = '<p>';
+            foreach ($args as $key => $value) {
+                if ($key == 'password') {
+                    // do not expose the password (#2149)
+                    continue;
+                }
+                $output .= '<strong>' . $key . '</strong>: ' . $value . '<br />';
+            }
+            $output .= '</p>';
+
+            $this->session->getFlashBag()->add('status', $output);
+
+            return true;
+        }
+
+        // Allow other bundles to control mailer behavior
+        $event = new \Zikula\Core\Event\GenericEvent($this, $args);
+        $this->eventDispatcher->dispatch('module.mailer.api.sendmessage', $event);
+        if ($event->isPropagationStopped()) {
+            return $event->getData();
+        }
+
+        // create new instance of mailer class
+        $this->message = Swift_Message::newInstance();
+        $this->message->setCharset($this->dataValues['charset']);
+        $this->message->setMaxLineLength($this->dataValues['wordwrap']);
+        $encoderKeys = [
+            '8bit' => '8bitcontentencoder',
+            '7bit' => '7bitcontentencoder',
+            'binary' => '8bitcontentencoder', // no comparable encoding in SwiftMailer AFAICS
+            'base64' => 'base64contentencoder',
+            'quoted-printable' => 'qpcontentencoder'
+        ];
+        $encoderKey = $encoderKeys[$this->dataValues['encoding']];
+        $encoder = Swift_DependencyContainer::getInstance()->lookup('mime.' . $encoderKey);
+        $this->message->setEncoder($encoder);
+
+        // set fromname and fromaddress, default to 'sitename' and 'adminmail' config vars
+        $fromname = (isset($args['fromname']) && $args['fromname']) ? $args['fromname'] : $this->dataValues['sitename'];
+        $fromaddress = (isset($args['fromaddress'])) ? $args['fromaddress'] : $this->dataValues['adminmail'];
+        $this->message->setFrom($fromaddress, $fromname);
+
+        // add any to addresses
+        if (is_array($args['toaddress'])) {
+            $toAdds = [];
+            foreach ($args['toaddress'] as $key => $address) {
+                $toAdds[] = [$address => isset($args['toname'][$key]) ? $args['toname'][$key] : $address];
+            }
+            $this->message->setTo($toAdds);
+        } else {
+            $this->message->setTo($args['toaddress'], isset($args['toname']) ? $args['toname'] : $args['toaddress']);
+        }
+
+        // if replytoname and replytoaddress have been provided us them else use the fromname and fromaddress we built earlier
+        $args['replytoname'] = (!isset($args['replytoname']) || empty($args['replytoname'])) ? $fromname : $args['replytoname'];
+        $args['replytoaddress'] = (!isset($args['replytoaddress'])  || empty($args['replytoaddress'])) ? $fromaddress : $args['replytoaddress'];
+        $this->message->setReplyTo($args['replytoaddress'], $args['replytoname']);
+
+        // add any cc addresses
+        if (isset($args['cc']) && is_array($args['cc'])) {
+            foreach ($args['cc'] as $email) {
+                if (isset($email['name'])) {
+                    $this->message->addCc($email['address'], $email['name']);
+                } else {
+                    $this->message->addCc($email['address']);
+                }
+            }
+        }
+
+        // add any bcc addresses
+        if (isset($args['bcc']) && is_array($args['bcc'])) {
+            foreach ($args['bcc'] as $email) {
+                if (isset($email['name'])) {
+                    $this->message->addBcc($email['address'], $email['name']);
+                } else {
+                    $this->message->addBcc($email['address']);
+                }
+            }
+        }
+
+        // add any custom headers
+        if (isset($args['headers']) && is_string($args['headers'])) {
+            $args['headers'] = explode("\n", $args['headers']);
+        }
+        if (isset($args['headers']) && is_array($args['headers'])) {
+            $headers = $this->message->getHeaders();
+            foreach ($args['headers'] as $header) {
+                if (is_array($header)) {
+                    $headers->addTextHeader($header[0], $header[1]);
+                } else {
+                    $headers->addTextHeader($header);
+                }
+            }
+        }
+
+        // add message subject
+        $this->message->setSubject($args['subject']);
+
+        // add body with formatting
+        if ((!empty($args['altbody']))
+            || ((isset($args['html']) && is_bool($args['html']) && $args['html'])
+            || $this->dataValues['html'])) {
+            $bodyFormat = 'text/html';
+        } else {
+            $bodyFormat = 'text/plain';
+        }
+        $this->message->setBody($args['body']);
+        $this->message->setContentType($bodyFormat);
+        if (!empty($args['altbody'])) {
+            $this->message->addPart($args['altbody'], 'text/plain');
+        }
+
+        $this->addAttachments($args);
+
+        // send message
+        $this->performSending($args);
+
+        return true; // message has been sent
+    }
+
+    /**
+     * Adds given attachments to the current message object.
+     *
+     * @param mixed[] $args
+     */
+    private function addAttachments($args)
+    {
+        // add attachments
+        if (isset($args['attachments']) && !empty($args['attachments'])) {
+            foreach ($args['attachments'] as $attachment) {
+                if (is_array($attachment)) {
+                    if (count($attachment) != 4) {
+                        // skip invalid arrays
+                        continue;
+                    }
+                    $this->message->attach(Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
+                } else {
+                    $this->message->attach(Swift_Attachment::fromPath($attachment));
+                }
+            }
+        }
+
+        // add string attachments
+        if (isset($args['stringattachments']) && !empty($args['stringattachments'])) {
+            foreach ($args['stringattachments'] as $attachment) {
+                if (is_array($attachment) && count($attachment) == 4) {
+                    $this->message->attach(Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
+                }
+            }
+        }
+
+        // add embedded images
+        if (isset($args['embeddedimages']) && !empty($args['embeddedimages'])) {
+            foreach ($args['embeddedimages'] as $embeddedimage) {
+                $this->message->attach(Swift_Attachment::fromPath($embeddedimage['path'], $embeddedimage['type'])->setFilename($embeddedimage['name']));
+            }
+        }
+    }
+
+    /**
+     * Does the actual sending of the current message.
+     *
+     * @param mixed[] $args
+     */
+    private function performSending($args)
+    {
+        $logFile = 'app/logs/mailer.log';
+
+        if (!$this->mailer->send($this->message, $failedEmails)) {
+            // message was not sent successfully
+            $emailList = implode(', ', $failedEmails);
+            $args['errorinfo'] = $this->__f('Error! Could not send mail to: %s.', ['%s' => $emailList]);
+
+            if ($this->dataValues['enableLogging']) {
+                // access the logging channel
+                $logger = new Logger('mailer');
+                $logger->pushHandler(new StreamHandler($logFile, Logger::INFO));
+                $logger->addError("Could not send message to: $emailList :: " . $this->message->toString());
+            }
+
+            if ($this->permissionApi->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
+                throw new \RuntimeException($args['errorinfo']);
+            } else {
+                throw new \RuntimeException($this->__('Error! A problem occurred while sending the e-mail message.'));
+            }
+        }
+
+        if ($this->dataValues['enableLogging']) {
+            // access the logging channel
+            $logger = new Logger('mailer');
+            $logger->pushHandler(new StreamHandler($logFile, Logger::INFO));
+            $logger->addInfo('Message sent: ' . $this->message->toString());
+        }
+    }
+}
diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index e58cc626e1..477754e004 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -13,14 +13,6 @@
 
 namespace Zikula\MailerModule\Api;
 
-use LogUtil;
-use Zikula;
-use System;
-use SecurityUtil;
-use Swift_Message;
-use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
-
 /**
  * API functions used by user controllers
  */
@@ -64,181 +56,8 @@ class UserApi extends \Zikula_AbstractApi
      */
     public function sendmessage($args)
     {
-        $dumper = $this->getContainer()->get('zikula.dynamic_config_dumper');
-        $params = $dumper->getConfiguration('swiftmailer');
-
-        // Development mailer mode
-        if ($params['transport'] == 'test') {
-            $output = '<p>';
-            foreach ($args as $key => $value) {
-                if ($key == 'password') {
-                    // do not expose the password (#2149)
-                    continue;
-                }
-                $output .= '<strong>'.$key.'</strong>: '.$value.'<br />';
-            }
-            $output .= '</p>';
-            LogUtil::registerStatus($output);
-
-            return true;
-        }
-
-        // Allow other bundles to control mailer behavior
-        $event = new \Zikula\Core\Event\GenericEvent($this, $args);
-        $this->eventManager->dispatch('module.mailer.api.sendmessage', $event);
-        if ($event->isPropagationStopped()) {
-            return $event->getData();
-        }
-
-        // create new instance of mailer class
-        $message = Swift_Message::newInstance();
-        $message->setCharset($this->getVar('charset'));
-        $message->setMaxLineLength($this->getVar('wordwrap'));
-        $encoderKeys = array(
-            '8bit' => '8bitcontentencoder',
-            '7bit' => '7bitcontentencoder',
-            'binary' => '8bitcontentencoder', // no comparable encoding in SwiftMailer AFAICS
-            'base64' => 'base64contentencoder',
-            'quoted-printable' => 'qpcontentencoder'
-        );
-        $encoderKey = $encoderKeys[$this->getVar('encoding')];
-        $encoder = \Swift_DependencyContainer::getInstance()->lookup('mime.' . $encoderKey);
-        $message->setEncoder($encoder);
-
-        // set fromname and fromaddress, default to 'sitename' and 'adminmail' config vars
-        $fromname = (isset($args['fromname']) && $args['fromname']) ? $args['fromname'] : System::getVar('sitename');
-        $fromaddress = (isset($args['fromaddress'])) ? $args['fromaddress'] : System::getVar('adminmail');
-        $message->setFrom($fromaddress, $fromname);
-
-        // add any to addresses
-        if (is_array($args['toaddress'])) {
-            $toAdds = array();
-            foreach ($args['toaddress'] as $key => $address) {
-                $toAdds[] = array($address => isset($args['toname'][$key]) ? $args['toname'][$key] : $address);
-            }
-            $message->setTo($toAdds);
-        } else {
-            $message->setTo($args['toaddress'], isset($args['toname']) ? $args['toname'] : $args['toaddress']);
-        }
-
-        // if replytoname and replytoaddress have been provided us them else use the fromname and fromaddress we built earlier
-        $args['replytoname'] = (!isset($args['replytoname']) || empty($args['replytoname'])) ? $fromname : $args['replytoname'];
-        $args['replytoaddress'] = (!isset($args['replytoaddress'])  || empty($args['replytoaddress'])) ? $fromaddress : $args['replytoaddress'];
-        $message->setReplyTo($args['replytoaddress'], $args['replytoname']);
-
-        // add any cc addresses
-        if (isset($args['cc']) && is_array($args['cc'])) {
-            foreach ($args['cc'] as $email) {
-                if (isset($email['name'])) {
-                    $message->addCc($email['address'], $email['name']);
-                } else {
-                    $message->addCc($email['address']);
-                }
-            }
-        }
-
-        // add any bcc addresses
-        if (isset($args['bcc']) && is_array($args['bcc'])) {
-            foreach ($args['bcc'] as $email) {
-                if (isset($email['name'])) {
-                    $message->addBcc($email['address'], $email['name']);
-                } else {
-                    $message->addBcc($email['address']);
-                }
-            }
-        }
-
-        // add any custom headers
-        if (isset($args['headers']) && is_string($args['headers'])) {
-            $args['headers'] = explode("\n", $args['headers']);
-        }
-        if (isset($args['headers']) && is_array($args['headers'])) {
-            $headers = $message->getHeaders();
-            foreach ($args['headers'] as $header) {
-                if (is_array($header)) {
-                    $headers->addTextHeader($header[0], $header[1]);
-                } else {
-                    $headers->addTextHeader($header);
-                }
-            }
-        }
-
-        // add message subject
-        $message->setSubject($args['subject']);
-
-        // add body with formatting
-        if ((!empty($args['altbody']))
-            || ((isset($args['html']) && is_bool($args['html']) && $args['html'])
-            || $this->getVar('html'))) {
-            $bodyFormat = 'text/html';
-        } else {
-            $bodyFormat = 'text/plain';
-        }
-        $message->setBody($args['body']);
-        $message->setContentType($bodyFormat);
-        if (!empty($args['altbody'])) {
-            $message->addPart($args['altbody'], 'text/plain');
-        }
-
-        // add attachments
-        if (isset($args['attachments']) && !empty($args['attachments'])) {
-            foreach ($args['attachments'] as $attachment) {
-                if (is_array($attachment)) {
-                    if (count($attachment) != 4) {
-                        // skip invalid arrays
-                        continue;
-                    }
-                    $message->attach(\Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
-                } else {
-                    $message->attach(\Swift_Attachment::fromPath($attachment));
-                }
-            }
-        }
-
-        // add string attachments
-        if (isset($args['stringattachments']) && !empty($args['stringattachments'])) {
-            foreach ($args['stringattachments'] as $attachment) {
-                if (is_array($attachment) && count($attachment) == 4) {
-                    $message->attach(\Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
-                }
-            }
-        }
-
-        // add embedded images
-        if (isset($args['embeddedimages']) && !empty($args['embeddedimages'])) {
-            foreach ($args['embeddedimages'] as $embeddedimage) {
-                $message->attach(\Swift_Attachment::fromPath($embeddedimage['path'], $embeddedimage['type'])->setFilename($embeddedimage['name']));
-            }
-        }
-
-        // send message
-        /** @var $mailer \Swift_Mailer */
-        $mailer = $this->get('mailer');
-        if (!$mailer->send($message, $failedEmails)) {
-            // message was not sent successfully
-            $emailList = implode(', ', $failedEmails);
-            $args['errorinfo'] = $this->__f('Error! Could not send mail to: %s.', $emailList);
-            if ($this->getVar('enableLogging')) {
-                // access the logging channel
-                $logger = new Logger('mailer');
-                $logger->pushHandler(new StreamHandler('app/logs/mailer.log', Logger::INFO));
-                $logger->addError("Could not send message to: $emailList :: " . $message->toString());
-            }
-            LogUtil::log(__f('Error! A problem occurred while sending an e-mail message from \'%1$s\' (%2$s) to (%3$s) (%4$s) with the subject line \'%5$s\': %6$s', $args));
-            if (SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-                throw new \RuntimeException($args['errorinfo']);
-            } else {
-                throw new \RuntimeException($this->__('Error! A problem occurred while sending the e-mail message.'));
-            }
-        }
-
-        if ($this->getVar('enableLogging')) {
-            // access the logging channel
-            $logger = new Logger('mailer');
-            $logger->pushHandler(new StreamHandler('app/logs/mailer.log', Logger::INFO));
-            $logger->addInfo('Message Sent: ' . $message->toString());
-        }
+        $mailer = $this->getContainer()->get('zikula_mailer_module.api.mailer');
 
-        return true; // message has been sent
+        return $mailer->sendMessage($args);
     }
 }
diff --git a/src/system/MailerModule/Container/LinkContainer.php b/src/system/MailerModule/Container/LinkContainer.php
new file mode 100644
index 0000000000..538d3fbf81
--- /dev/null
+++ b/src/system/MailerModule/Container/LinkContainer.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2015 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\Container;
+
+use Symfony\Component\Routing\RouterInterface;
+use Zikula\Common\Translator\Translator;
+use Zikula\Core\LinkContainer\LinkContainerInterface;
+use Zikula\PermissionsModule\Api\PermissionApi;
+
+class LinkContainer implements LinkContainerInterface
+{
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    /**
+     * @var RouterInterface
+     */
+    private $router;
+
+    /**
+     * @var PermissionApi
+     */
+    private $permissionApi;
+
+    /**
+     * constructor.
+     *
+     * @param $translator
+     * @param RouterInterface $router
+     * @param PermissionApi $permissionApi
+     */
+    public function __construct($translator, RouterInterface $router, PermissionApi $permissionApi)
+    {
+        $this->translator = $translator;
+        $this->router = $router;
+        $this->permissionApi = $permissionApi;
+    }
+
+    /**
+     * get Links of any type for this extension
+     * required by the interface
+     *
+     * @param string $type
+     * @return array
+     */
+    public function getLinks($type = LinkContainerInterface::TYPE_ADMIN)
+    {
+        $method = 'get' . ucfirst(strtolower($type));
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        }
+
+        return [];
+    }
+
+    /**
+     * get the Admin links for this extension
+     *
+     * @return array
+     */
+    private function getAdmin()
+    {
+        $links = [];
+
+        if (!$this->permissionApi->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
+            return $links;
+        }
+
+        $links[] = [
+            'url' => $this->router->generate('zikulamailermodule_admin_test'),
+            'text' => $this->translator->__('Test current settings'),
+            'icon' => 'envelope'
+        ];
+        $links[] = [
+            'url' => $this->router->generate('zikulamailermodule_admin_config'),
+            'text' => $this->translator->__('Settings'),
+            'icon' => 'wrench'
+        ];
+
+        return $links;
+    }
+
+    /**
+     * set the BundleName as required buy the interface
+     *
+     * @return string
+     */
+    public function getBundleName()
+    {
+        return 'ZikulaMailerModule';
+    }
+}
diff --git a/src/system/MailerModule/Controller/AdminController.php b/src/system/MailerModule/Controller/AdminController.php
index 8654215fd6..44cf5975a2 100644
--- a/src/system/MailerModule/Controller/AdminController.php
+++ b/src/system/MailerModule/Controller/AdminController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright Zikula Foundation 2009 - Zikula Application Framework
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
  *
  * This work is contributed to the Zikula Foundation under one or more
  * Contributor Agreements and licensed to You under the following license:
@@ -13,85 +13,181 @@
 
 namespace Zikula\MailerModule\Controller;
 
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Zikula_View;
-use SecurityUtil;
-use FormUtil;
-use Zikula\MailerModule\Form\Handler\ModifyConfigHandler;
-use Zikula\MailerModule\Form\Handler\TestConfigHandler;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\Routing\RouterInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Zikula\Core\Controller\AbstractController;
+use Zikula\ThemeModule\Engine\Annotation\Theme;
 
 /**
+ * Class AdminController
+ * @package Zikula\MailerModule\Controller
  * @Route("/admin")
  */
-class AdminController extends \Zikula_AbstractController
+class AdminController extends AbstractController
 {
-    /**
-     * Post initialise.
-     *
-     * @return void
-     */
-    protected function postInitialize()
-    {
-        // In this controller we do not want caching.
-        $this->view->setCaching(Zikula_View::CACHE_DISABLED);
-    }
-
     /**
      * @Route("")
-     *
-     * the main administration function
-     *
-     * @return RedirectResponse
+     * @deprecated remove at Core-2.0
      */
     public function indexAction()
     {
-        // Security check will be done in modifyconfig()
-        return new RedirectResponse($this->get('router')->generate('zikulamailermodule_admin_modifyconfig', array(), RouterInterface::ABSOLUTE_URL));
+        @trigger_error('The zikulamailermodule_admin_index route is deprecated. please use zikulamailermodule_admin_config instead.', E_USER_DEPRECATED);
+
+        return $this->redirect($this->generateUrl('zikulamailermodule_admin_config'));
     }
 
     /**
      * @Route("/config")
+     * @Theme("admin")
+     * @Template
      *
-     * This is a standard function to modify the configuration parameters of the
-     * module
-     *
-     * @return mixed False on errors, true on redirects, and otherwise it returns the HTML output for the page.
-     *
+     * @param Request $request
      * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function modifyconfigAction()
+    public function configAction(Request $request)
     {
-        // security check
-        if (!SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
+        if (!$this->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();
         }
 
-        $form = FormUtil::newForm('ZikulaMailerModule', $this);
+        $form = $this->createForm('Zikula\MailerModule\Form\Type\ConfigType');
+
+        if ($form->handleRequest($request)->isValid()) {
+            if ($form->get('save')->isClicked()) {
+                $formData = $form->getData();
+
+                // save modvars
+                $vars = [];
+                foreach (['charset', 'encoding', 'html', 'wordwrap', 'enableLogging'] as $varName) {
+                    $vars[$varName] = $formData[$varName];
+                }
+                $this->get('zikula_extensions_module.api.variable')->setAll('ZikulaMailerModule', $vars);
 
-        return new Response($form->execute('Admin/modifyconfig.tpl', new ModifyConfigHandler()));
+                // fetch different username and password fields depending on the transport type
+                $credentialsSuffix = $formData['transport'] == 'gmail' ? 'Gmail' : '';
+
+                // write the config file
+                // http://symfony.com/doc/current/reference/configuration/swiftmailer.html
+                $configDumper = $this->get('zikula.dynamic_config_dumper');
+                $currentConfig = $configDumper->getConfiguration('swiftmailer');
+                $config = [
+                    'transport' => (string)$formData['transport'],
+                    'username' => $formData['username' . $credentialsSuffix],
+                    'password' => $formData['password' . $credentialsSuffix],
+                    'host' => $formData['host'],
+                    'port' => $formData['port'],
+                    'encryption' => $formData['encryption'],
+                    'auth_mode' => $formData['auth_mode'],
+                    // the items below can be configured by modifying the app/config/dynamic/generated.yml file
+                    // 'spool' => !empty($currentConfig['spool']) ? $currentConfig['spool'] : ['type' => 'memory'],
+                    'delivery_addresses' => !empty($currentConfig['delivery_addresses'])
+                        ? $currentConfig['delivery_addresses']
+                        : (!empty($currentConfig['delivery_address']) ? [$currentConfig['delivery_address']] : []),
+                    'disable_delivery' => !empty($currentConfig['disable_delivery']) ? $currentConfig['disable_delivery'] : false,
+                ];
+                if ($config['encryption'] == '') {
+                    $config['encryption'] = null;
+                }
+                if ($config['auth_mode'] == '') {
+                    $config['auth_mode'] = null;
+                }
+                $configDumper->setConfiguration('swiftmailer', $config);
+
+                $this->addFlash('status', $this->__('Done! Module configuration updated.'));
+            }
+            if ($form->get('cancel')->isClicked()) {
+                $this->addFlash('status', $this->__('Operation cancelled.'));
+            }
+        }
+
+        return [
+            'form' => $form->createView()
+        ];
     }
 
     /**
      * @Route("/test")
+     * @Theme("admin")
+     * @Template
      *
-     * This function displays a form to sent a test mail
-     *
-     * @return mixed False on errors, true on redirects, and otherwise it returns the HTML output for the page.
+     * This function displays a form to sent a test mail.
      *
+     * @param Request $request
      * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function testconfigAction()
+    public function testAction(Request $request)
     {
-        if (!SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
+        if (!$this->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();
         }
 
-        $form = FormUtil::newForm('ZikulaMailerModule', $this);
+        $dumper = $this->get('zikula.dynamic_config_dumper');
+        $paramHtml = $dumper->getConfigurationForHtml('swiftmailer');
+
+        $form = $this->createForm('Zikula\MailerModule\Form\Type\TestType');
+
+        if ($form->handleRequest($request)->isValid()) {
+            if ($form->get('test')->isClicked()) {
+                $formData = $form->getData();
+
+                $html = in_array($formData['messageType'], array('html', 'multipart')) ? true : false;
+
+                $textBody = $formData['bodyText'];
+                $htmlBody = $formData['bodyHtml'];
+
+                $msgBody = $textBody;
+                $altBody = '';
+                if ($html) {
+                    $msgBody = $htmlBody;
+                    $altBody = $textBody;
+                }
+
+                // add swiftmailer config to message for testing
+                $dumper = $this->get('zikula.dynamic_config_dumper');
+                $swiftConfigHtml = "<h4>Swiftmailer Config:</h4>\n";
+                $swiftConfigHtml .= $dumper->getConfigurationForHtml('swiftmailer');
+
+                if ($html) {
+                    $msgBody .= $swiftConfigHtml;
+                    $altBody .= !empty($altBody) ? strip_tags($swiftConfigHtml) : '';
+                } else {
+                    $msgBody .= strip_tags($swiftConfigHtml);
+                }
+
+                // send the email
+                try {
+                    $result = \ModUtil::apiFunc('ZikulaMailerModule', 'user', 'sendmessage', [
+                        'toname' => $formData['toName'],
+                        'toaddress' => $formData['toAddress'],
+                        'subject' => $formData['subject'],
+                        'body' => $msgBody,
+                        'altbody' => $altBody,
+                        'html' => $html
+                    ]);
+
+                    // check our result and return the correct error code
+                    if (true === $result) {
+                        // Success
+                        $this->addFlash('status', $this->__('Done! Message sent.'));
+                    } else {
+                        $this->addFlash('error', $this->__('It looks like the message could not be sent properly.'));
+                    }
+                } catch (\RuntimeException $e) {
+                    $this->addFlash('error', $this->__('The message could not be sent properly.'));
+                }
+            }
+            if ($form->get('cancel')->isClicked()) {
+                $this->addFlash('status', $this->__('Operation cancelled.'));
+            }
+        }
 
-        return new Response($form->execute('Admin/testconfig.tpl', new TestConfigHandler()));
+        return [
+            'form' => $form->createView(),
+            'swiftmailerHtml' => $paramHtml
+        ];
     }
 }
diff --git a/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php b/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
new file mode 100644
index 0000000000..dc3b67153c
--- /dev/null
+++ b/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\Config\FileLocator;
+
+class ZikulaMailerExtension extends Extension
+{
+    /**
+     * Responds to the app.config configuration parameter.
+     *
+     * @param array            $configs
+     * @param ContainerBuilder $container
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $loader = new XmlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
+
+        $loader->load('services.xml');
+    }
+}
diff --git a/src/system/MailerModule/Form/Handler/ModifyConfigHandler.php b/src/system/MailerModule/Form/Handler/ModifyConfigHandler.php
deleted file mode 100644
index 83c67faf70..0000000000
--- a/src/system/MailerModule/Form/Handler/ModifyConfigHandler.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
- * Copyright Zikula Foundation 2009 - Zikula Application Framework
- *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
- *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
- */
-
-namespace Zikula\MailerModule\Form\Handler;
-
-use Zikula_Form_View;
-use SecurityUtil;
-use LogUtil;
-use DataUtil;
-use ZLanguage;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Routing\RouterInterface;
-
-/**
- * Form handler for the mailer modules modifyconfig form
- */
-class ModifyConfigHandler extends \Zikula_Form_AbstractHandler
-{
-    /**
-     * @var array values for this form
-     */
-    private $formValues;
-
-    /**
-     * initialise the form
-     *
-     * @param \Zikula_Form_view $view view object
-     *
-     * @return bool true if successful
-     (
-     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
-     */
-    public function initialize(Zikula_Form_View $view)
-    {
-        if (!SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-            throw new AccessDeniedException();
-        }
-
-        // assign the mail transport types
-        $view->assign('transportItems', array(
-            array('value' => 'mail', 'text' => DataUtil::formatForDisplay($this->__("Internal PHP `mail()` function"))),
-            array('value' => 'sendmail', 'text' => DataUtil::formatForDisplay($this->__('Sendmail message transfer agent'))),
-            array('value' => 'gmail', 'text' => DataUtil::formatForDisplay($this->__('Google gmail'))),
-            array('value' => 'smtp', 'text' => DataUtil::formatForDisplay($this->__('SMTP mail transfer protocol'))),
-            array('value' => 'test'/*'null'*/, 'text' => DataUtil::formatForDisplay($this->__('Development/debug mode (Do not send any email)')))
-        ));
-
-        $view->assign('encodingItems', array(
-            array('value' => '8bit', 'text' => '8bit'),
-            array('value' => '7bit', 'text' => '7bit'),
-            array('value' => 'binary', 'text' => 'binary'),
-            array('value' => 'base64', 'text' => 'base64'),
-            array('value' => 'quoted-printable', 'text' => 'quoted-printable')
-        ));
-
-        $view->assign('encryptionItems', array(
-            array('value' => null, 'text' => 'None'),
-            array('value' => 'ssl', 'text' => 'SSL'),
-            array('value' => 'tls', 'text' => 'TLS')
-        ));
-
-        $view->assign('auth_modeItems', array(
-            array('value' => null, 'text' => 'None'),
-            array('value' => 'plain', 'text' => 'Plain'),
-            array('value' => 'login', 'text' => 'Login'),
-            array('value' => 'cram-md5', 'text' => 'Cram-MD5'),
-        ));
-
-        $dumper = $this->view->getContainer()->get('zikula.dynamic_config_dumper');
-        $params = $dumper->getConfiguration('swiftmailer');
-
-        // assign all config vars
-        $this->view->assign($params);
-        $this->view->assign($this->getVars());
-
-        return true;
-    }
-
-    /**
-     * Handle form commands
-     *
-     * @param \Zikula_Form_View $view view object
-     * @param array $args
-     *
-     * @return bool|void false if the form to be saved isn't valid, void otherwise
-     */
-    public function handleCommand(Zikula_Form_View $view, &$args)
-    {
-        switch ($args['commandName']) {
-            case 'cancel':
-                break;
-            case 'save':
-                if (!$view->isValid()) {
-                    return false;
-                }
-                $this->formValues = $view->getValues();
-
-                // set new module variable values
-                $vars = array();
-                $vars['charset'] = (string)$this->getFormValue('charset', ZLanguage::getEncoding());
-                $vars['encoding'] = (string)$this->getFormValue('encoding', '8bit');
-                $vars['html'] = (bool)$this->getFormValue('html', false);
-                $vars['wordwrap'] = (int)$this->getFormValue('wordwrap', 50);
-                $vars['enableLogging'] = (bool)$this->getFormValue('enableLogging', false);
-                $this->setVars($vars);
-
-                // fetch different username and password fields depending on the transport type
-                $transport = (string)$this->getFormValue('transport', 'mail');
-                $credentialsSuffix = $transport == 'gmail' ? 'Gmail' : '';
-
-                // write the config file
-                // http://symfony.com/doc/current/reference/configuration/swiftmailer.html
-                $configDumper = $this->view->getContainer()->get('zikula.dynamic_config_dumper');
-                $currentConfig = $configDumper->getConfiguration('swiftmailer');
-                $config = array(
-                    'transport' => (string)$this->getFormValue('transport', 'mail'),
-                    'username' => $this->getFormValue('username' . $credentialsSuffix, null),
-                    'password' => $this->getFormValue('password' . $credentialsSuffix, null),
-                    'host' => (string)$this->getFormValue('host', 'localhost'),
-                    'port' => (int)$this->getFormValue('port', 25),
-                    'encryption' => $this->getFormValue('encryption', null),
-                    'auth_mode' => $this->getFormValue('auth_mode', null),
-                    // the items below can be configured by modifying the app/config/dynamic/generated.yml file
-//                    'spool' => !empty($currentConfig['spool']) ? $currentConfig['spool'] : array('type' => 'memory'),
-                    'delivery_addresses' => !empty($currentConfig['delivery_addresses'])
-                        ? $currentConfig['delivery_addresses']
-                        : (!empty($currentConfig['delivery_address']) ? [$currentConfig['delivery_address']] : []),
-                    'disable_delivery' => !empty($currentConfig['disable_delivery']) ? $currentConfig['disable_delivery'] : false,
-                );
-                $configDumper->setConfiguration('swiftmailer', $config);
-
-                // the module configuration has been updated successfully
-                LogUtil::registerStatus($this->__('Done! Saved module configuration.'));
-                break;
-        }
-
-        return $view->redirect($view->getContainer()->get('router')->generate('zikulamailermodule_admin_modifyconfig', array(), RouterInterface::ABSOLUTE_URL));
-    }
-
-    /**
-     * Get the value of a form field
-     *
-     * @param string $key     the field key to query
-     * @param string $default the default value for the query
-     *
-     * @return mixed the form value (or default otherwise)
-     */
-    private function getFormValue($key, $default)
-    {
-        return isset($this->formValues[$key]) ? $this->formValues[$key] : $default;
-    }
-}
diff --git a/src/system/MailerModule/Form/Handler/TestConfigHandler.php b/src/system/MailerModule/Form/Handler/TestConfigHandler.php
deleted file mode 100644
index 8388a3827a..0000000000
--- a/src/system/MailerModule/Form/Handler/TestConfigHandler.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Copyright Zikula Foundation 2014 - Zikula Application Framework
- *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
- *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
- */
-
-namespace Zikula\MailerModule\Form\Handler;
-
-use Zikula_Form_View;
-use SecurityUtil;
-use LogUtil;
-use ModUtil;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Routing\RouterInterface;
-
-/**
- * Form handler for the mailer modules testconfig form
- */
-class TestConfigHandler extends \Zikula_Form_AbstractHandler
-{
-    /**
-     * initialise the form
-     *
-     * @param \Zikula_Form_view $view view object
-     *
-     * @return bool true if successful
-     *
-     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
-     */
-    public function initialize(Zikula_Form_View $view)
-    {
-        if (!SecurityUtil::checkPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-            throw new AccessDeniedException();
-        }
-
-        $dumper = $this->view->getContainer()->get('zikula.dynamic_config_dumper');
-        $params = $dumper->getConfiguration('swiftmailer');
-        $paramHtml = $dumper->getConfigurationForHtml('swiftmailer');
-        $view->assign('swiftmailerHtml', $paramHtml);
-
-        $msgtype = $this->getVar('html') ? 'html' : 'text';
-        $view->assign('msgtype', $msgtype);
-
-        // assign all module vars
-        $this->view->assign($params);
-
-        return true;
-    }
-
-    /**
-     * handle commands the form
-     *
-     * @param \Zikula_Form_view $view view object
-     * @param array[] $args {
-     *      @type string $commandName the command to execute
-     *                      }
-     *
-     * @return boolean|void
-     */
-    public function handleCommand(Zikula_Form_View $view, &$args)
-    {
-        switch ($args['commandName']) {
-            case 'cancel':
-                break;
-            case 'save':
-                if (!$view->isValid()) {
-                    return false;
-                }
-                $formValues = $view->getValues();
-                $toname = (string)$formValues['toname'];
-                $toaddress = (string)$formValues['toaddress'];
-                $subject = (string)$formValues['subject'];
-                $msgtype = (string)$formValues['msgtype'];
-                $textBody = (string)$formValues['mailer_textbody'];
-                $htmlBody = (string)$formValues['mailer_body'];
-
-                $html = in_array($msgtype, array('html', 'multipart')) ? true : false;
-                if ($html) {
-                    $msgBody = $htmlBody;
-                    $altBody = $textBody;
-                } else {
-                    $msgBody = $textBody;
-                    $altBody = '';
-                }
-
-                // add swiftmailer config to message for testing
-                $dumper = $this->view->getContainer()->get('zikula.dynamic_config_dumper');
-                $swiftConfigHtml = "<h4>Swiftmailer Config:</h4>\n";
-                $swiftConfigHtml .= $dumper->getConfigurationForHtml('swiftmailer');
-
-                if ($html) {
-                    $msgBody .= $swiftConfigHtml;
-                    $altBody .= !empty($altBody) ? strip_tags($swiftConfigHtml) : '';
-                } else {
-                    $msgBody .= strip_tags($swiftConfigHtml);
-                }
-
-                // send the email
-                $result = ModUtil::apiFunc('ZikulaMailerModule', 'user', 'sendmessage', array(
-                    'toname' => $toname,
-                    'toaddress' => $toaddress,
-                    'subject' => $subject,
-                    'body' => $msgBody,
-                    'altbody' => $altBody,
-                    'html' => $html)
-                );
-
-                // check our result and return the correct error code
-                if ($result === true) {
-                    // Success
-                    LogUtil::registerStatus($this->__('Done! Message sent.'));
-                }
-
-                break;
-        }
-
-        return $view->redirect($view->getContainer()->get('router')->generate('zikulamailermodule_admin_testconfig', array(), RouterInterface::ABSOLUTE_URL));
-    }
-}
diff --git a/src/system/MailerModule/Form/Type/ConfigType.php b/src/system/MailerModule/Form/Type/ConfigType.php
new file mode 100644
index 0000000000..b3fee128dd
--- /dev/null
+++ b/src/system/MailerModule/Form/Type/ConfigType.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
+use Zikula\Common\Translator\TranslatorInterface;
+use Zikula\Common\Translator\TranslatorTrait;
+use Zikula\ExtensionsModule\Api\VariableApi;
+
+/**
+ * Configuration form type class.
+ */
+class ConfigType extends AbstractType
+{
+    use TranslatorTrait;
+
+    /**
+     * @var array
+     */
+    protected $dataValues;
+
+    /**
+     * ConfigType constructor.
+     *
+     * @param TranslatorInterface $translator   Translator service instance.
+     * @param DynamicConfigDumper $configDumper DynamicConfigDumper service instance.
+     * @param VariableApi         $variableApi  VariableApi service instance.
+     */
+    public function __construct(TranslatorInterface $translator, DynamicConfigDumper $configDumper, VariableApi $variableApi)
+    {
+        $this->setTranslator($translator);
+
+        $params = $configDumper->getConfiguration('swiftmailer');
+        $modVars = $variableApi->getAll('ZikulaMailerModule');
+        $this->dataValues = array_merge($params, $modVars);
+    }
+
+    /**
+     * Sets the translator.
+     *
+     * @param TranslatorInterface $translator Translator service instance.
+     */
+    public function setTranslator(/*TranslatorInterface */$translator)
+    {
+        $this->translator = $translator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('transport', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
+                'label' => $this->__('Mail transport'),
+                'data' => $this->dataValues['transport'],
+                'empty_data' => 'mail',
+                'choices' => [
+                    $this->__('Internal PHP `mail()` function') => 'mail',
+                    $this->__('Sendmail message transfer agent') => 'sendmail',
+                    $this->__('Google gmail') => 'gmail',
+                    $this->__('SMTP mail transfer protocol') => 'smtp',
+                    $this->__('Development/debug mode (Do not send any email)') => 'test'/*'null'*/
+                ],
+                'choices_as_values' => true
+            ])
+            ->add('charset', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('Character set'),
+                'data' => $this->dataValues['charset'],
+                'empty_data' => \ZLanguage::getEncoding(),
+                'max_length' => 20,
+                'help' => $this->__f("Default: '%s'", ['%s' => \ZLanguage::getEncoding()])
+            ])
+            ->add('encoding', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
+                'label' => $this->__('Encoding'),
+                'data' => $this->dataValues['encoding'],
+                'empty_data' => '8bit',
+                'choices' => [
+                    '8bit' => '8bit',
+                    '7bit' => '7bit',
+                    'binary' => 'binary',
+                    'base64' => 'base64',
+                    'quoted-printable' => 'quoted-printable'
+                ],
+                'choices_as_values' => true,
+                'help' => $this->__f("Default: '%s'", ['%s' => '8bit'])
+            ])
+            ->add('html', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [
+                'label' => $this->__('HTML-formatted messages'),
+                'data' => (bool) $this->dataValues['html'],
+                'required' => false
+            ])
+            ->add('wordwrap', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', [
+                'label' => $this->__('Word wrap'),
+                'data' => $this->dataValues['wordwrap'],
+                'empty_data' => 50,
+                'scale' => 0,
+                'max_length' => 3,
+                'help' => $this->__f("Default: '%s'", ['%s' => '50'])
+            ])
+            ->add('enableLogging', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [
+                'label' => $this->__('Enable logging of sent mail'),
+                'data' => (bool) $this->dataValues['enableLogging'],
+                'required' => false
+            ])
+            ->add('host', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('SMTP host server'),
+                'data' => $this->dataValues['host'],
+                'empty_data' => 'localhost',
+                'max_length' => 255,
+                'required' => false,
+                'help' => $this->__f("Default: '%s'", ['%s' => 'localhost'])
+            ])
+            ->add('port', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', [
+                'label' => $this->__('SMTP port'),
+                'data' => $this->dataValues['port'],
+                'empty_data' => 25,
+                'scale' => 0,
+                'max_length' => 5,
+                'required' => false,
+                'help' => $this->__f("Default: '%s'", ['%s' => '25'])
+            ])
+            ->add('encryption', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
+                'label' => $this->__('SMTP encryption method'),
+                'data' => $this->dataValues['encryption'],
+                'empty_data' => '',
+                'choices' => [
+                    $this->__('None') => '',
+                    'SSL' => 'ssl',
+                    'TLS' => 'tls'
+                ],
+                'choices_as_values' => true,
+                'required' => false
+            ])
+            ->add('auth_mode', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
+                'label' => $this->__('SMTP authentication type'),
+                'data' => $this->dataValues['auth_mode'],
+                'empty_data' => '',
+                'choices' => [
+                    $this->__('None') => '',
+                    'Plain' => 'plain',
+                    'Login' => 'login',
+                    'Cram-MD5' => 'cram-md5'
+                ],
+                'choices_as_values' => true,
+                'required' => false
+            ])
+            ->add('username', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('SMTP user name'),
+                'data' => $this->dataValues['username'],
+                'empty_data' => '',
+                'max_length' => 50,
+                'required' => false
+            ])
+            ->add('password', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', [
+                'label' => $this->__('SMTP password'),
+                'data' => $this->dataValues['password'],
+                'empty_data' => '',
+                'max_length' => 50,
+                'always_empty' => false,
+                'required' => false
+            ])
+            ->add('usernameGmail', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('Gmail user name'),
+                'data' => $this->dataValues['usernameGmail'],
+                'empty_data' => '',
+                'max_length' => 50,
+                'required' => false
+            ])
+            ->add('passwordGmail', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', [
+                'label' => $this->__('Gmail password'),
+                'data' => $this->dataValues['passwordGmail'],
+                'empty_data' => '',
+                'max_length' => 50,
+                'always_empty' => false,
+                'required' => false
+            ])
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Save')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'zikulamailermodule_config';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+}
diff --git a/src/system/MailerModule/Form/Type/TestType.php b/src/system/MailerModule/Form/Type/TestType.php
new file mode 100644
index 0000000000..4406da68a2
--- /dev/null
+++ b/src/system/MailerModule/Form/Type/TestType.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
+use Zikula\Common\Translator\TranslatorInterface;
+use Zikula\Common\Translator\TranslatorTrait;
+use Zikula\ExtensionsModule\Api\VariableApi;
+
+/**
+ * Configuration form type class.
+ */
+class TestType extends AbstractType
+{
+    use TranslatorTrait;
+
+    /**
+     * @var array
+     */
+    protected $dataValues;
+
+    /**
+     * TestType constructor.
+     *
+     * @param TranslatorInterface $translator   Translator service instance.
+     * @param DynamicConfigDumper $configDumper DynamicConfigDumper service instance.
+     * @param VariableApi         $variableApi  VariableApi service instance.
+     */
+    public function __construct(TranslatorInterface $translator, DynamicConfigDumper $configDumper, VariableApi $variableApi)
+    {
+        $this->setTranslator($translator);
+
+        $params = $configDumper->getConfiguration('swiftmailer');
+        $modVars = $variableApi->getAll('ZikulaMailerModule');
+        $this->dataValues = array_merge($params, $modVars);
+        $this->dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
+        $this->dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
+    }
+
+    /**
+     * Sets the translator.
+     *
+     * @param TranslatorInterface $translator Translator service instance.
+     */
+    public function setTranslator(/*TranslatorInterface */$translator)
+    {
+        $this->translator = $translator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('fromName', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('Sender\'s name'),
+                'data' => $this->dataValues['sitename'],
+                'disabled' => true
+            ])
+            ->add('fromAddress', 'Symfony\Component\Form\Extension\Core\Type\EmailType', [
+                'label' => $this->__('Sender\'s e-mail address'),
+                'data' => $this->dataValues['adminmail'],
+                'disabled' => true
+            ])
+            ->add('toName', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('Recipient\'s name'),
+                'data' => '',
+                'max_length' => 50
+            ])
+            ->add('toAddress', 'Symfony\Component\Form\Extension\Core\Type\EmailType', [
+                'label' => $this->__('Recipient\'s e-mail address'),
+                'data' => '',
+                'max_length' => 50
+            ])
+            ->add('subject', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
+                'label' => $this->__('Subject'),
+                'data' => '',
+                'max_length' => 50
+            ])
+            ->add('messageType', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
+                'label' => $this->__('Message type'),
+                'data' => ($this->dataValues['html'] ? 'html' : 'text'),
+                'empty_data' => 'text',
+                'choices' => [
+                    'Plain-text message' => 'text',
+                    'HTML-formatted message' => 'html',
+                    'Multi-part message' => 'multipart'
+                ],
+                'choices_as_values' => true,
+                'expanded' => false
+            ])
+            ->add('bodyHtml', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', [
+                'label' => $this->__('HTML-formatted message'),
+                'data' => '',
+                'required' => false
+            ])
+            ->add('bodyText', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', [
+                'label' => $this->__('Plain-text message'),
+                'data' => '',
+                'required' => false
+            ])
+            ->add('test', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Send test email')])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'zikulamailermodule_test';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+}
diff --git a/src/system/MailerModule/Resources/config/services.xml b/src/system/MailerModule/Resources/config/services.xml
new file mode 100644
index 0000000000..db2854d3c0
--- /dev/null
+++ b/src/system/MailerModule/Resources/config/services.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="zikula_mailer_module.container.link_container.class">Zikula\MailerModule\Container\LinkContainer</parameter>
+        <parameter key="zikula_mailer_module.form.config_type.class">Zikula\MailerModule\Form\Type\ConfigType</parameter>
+        <parameter key="zikula_mailer_module.form.test_type.class">Zikula\MailerModule\Form\Type\TestType</parameter>
+        <parameter key="twig.extension.zikula_mailer_module.class">Zikula\MailerModule\Twig\TwigExtension</parameter>
+        <parameter key="zikula_mailer_module.api.mailer.class">Zikula\MailerModule\Api\MailerApi</parameter>
+    </parameters>
+
+    <services>
+        <service id="zikula_mailer_module.container.link_container" class="%zikula_mailer_module.container.link_container.class%">
+            <argument type="service" id="translator.default" />
+            <argument type="service" id="jms_i18n_routing.router" />
+            <argument type="service" id="zikula_permissions_module.api.permission" />
+            <tag name="zikula.link_container"/>
+        </service>
+
+        <service id="zikula_mailer_module.form.config_type" class="%zikula_mailer_module.form.config_type.class%">
+            <argument type="service" id="translator.default" />
+            <argument type="service" id="zikula.dynamic_config_dumper" />
+            <argument type="service" id="zikula_extensions_module.api.variable" />
+            <tag name="form.type" />
+        </service>
+
+        <service id="zikula_mailer_module.form.test_type" class="%zikula_mailer_module.form.test_type.class%">
+            <argument type="service" id="translator.default" />
+            <argument type="service" id="zikula.dynamic_config_dumper" />
+            <argument type="service" id="zikula_extensions_module.api.variable" />
+            <tag name="form.type" />
+        </service>
+
+        <service id="twig.extension.zikula_mailer_module" class="%twig.extension.zikula_mailer_module.class%" public="false">
+            <tag name="twig.extension" />
+        </service>
+
+        <service id="zikula_mailer_module.api.mailer" class="%zikula_mailer_module.api.mailer.class%">
+            <argument type="service" id="translator.default" />
+            <argument type="service" id="event_dispatcher" />
+            <argument type="service" id="zikula.dynamic_config_dumper" />
+            <argument type="service" id="zikula_extensions_module.api.variable" />
+            <argument type="service" id="mailer" />
+            <argument type="service" id="session" />
+            <argument type="service" id="zikula_permissions_module.api.permission" />
+        </service>
+    </services>
+
+</container>
\ No newline at end of file
diff --git a/src/system/MailerModule/Resources/views/Admin/config.html.twig b/src/system/MailerModule/Resources/views/Admin/config.html.twig
new file mode 100644
index 0000000000..2490575aaa
--- /dev/null
+++ b/src/system/MailerModule/Resources/views/Admin/config.html.twig
@@ -0,0 +1,62 @@
+{% form_theme form with [
+    'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
+    'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
+] %}
+{{ adminHeader() }}
+<div class="container-fluid">
+    <div class="row">
+        <h3>
+            <span class="fa fa-wrench"></span>
+            {{ __('Settings') }}
+        </h3>
+
+        {# http://swiftmailer.org/docs/sending.html #}
+        {% if zikulamailermodule_hasProcessControlFunctions() != true %}
+            <div class='alert alert-danger'>
+                <h3>{gt text='WARNING'}</h3>
+                <p>{{ __f('The PHP functions, %s, that support SMTP and SENDMAIL do not appear to be functioning on this PHP installation. Please compile them and restart your server.', {'%s': '<code>proc_*</code>'}) }}</p>
+            </div>
+        {% endif %}
+        <p class="alert alert-info">
+            {{ __f('Mailer relies on %swiftmailer', {'%swiftmailer': '<a href="http://symfony.com/doc/current/reference/configuration/swiftmailer.html"><i class="fa fa-external-link"></i> SwiftMailer configuration</a>'})|raw }}
+        </p>
+
+        {{ form_start(form) }}
+        {{ form_errors(form) }}
+
+        <fieldset>
+            <legend>{{ __('General settings') }}</legend>
+            {{ form_row(form.transport) }}
+            {{ form_row(form.charset) }}
+            {{ form_row(form.encoding) }}
+            {{ form_row(form.html) }}
+            {{ form_row(form.wordwrap) }}
+            {{ form_row(form.enableLogging) }}
+        </fieldset>
+        <fieldset data-switch="zikulamailermodule_config[transport]" data-switch-value="smtp">
+            <legend>{{ __('SMTP settings') }}</legend>
+            {{ form_row(form.host) }}
+            {{ form_row(form.port) }}
+            {{ form_row(form.encryption) }}
+            {{ form_row(form.auth_mode) }}
+            <div data-switch="zikulamailermodule_config[auth_mode]" data-switch-value="login">
+                {{ form_row(form.username) }}
+                {{ form_row(form.password) }}
+            </div>
+        </fieldset>
+        <fieldset data-switch="zikulamailermodule_config[transport]" data-switch-value="gmail">
+            <legend>{{ __('Gmail settings') }}</legend>
+            {{ form_row(form.usernameGmail) }}
+            {{ form_row(form.passwordGmail) }}
+        </fieldset>
+
+        <div class="form-group">
+            <div class="col-sm-offset-3 col-sm-9">
+                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
+                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+            </div>
+        </div>
+        {{ form_end(form) }}
+    </div>
+</div>
+{{ adminFooter() }}
diff --git a/src/system/MailerModule/Resources/views/Admin/modifyconfig.tpl b/src/system/MailerModule/Resources/views/Admin/modifyconfig.tpl
deleted file mode 100644
index 9c4556c86f..0000000000
--- a/src/system/MailerModule/Resources/views/Admin/modifyconfig.tpl
+++ /dev/null
@@ -1,135 +0,0 @@
-{adminheader}
-<h3>
-    <span class="fa fa-wrench"></span>
-    {gt text='Settings'}
-</h3>
-{* http://swiftmailer.org/docs/sending.html *}
-{php}$works = function_exists('proc_open');$this->assign('works',$works);{/php}
-{if !$works}
-    <div class='alert alert-danger'>
-        <h3>{gt text='WARNING'}</h3>
-        <p>{gt text='The PHP functions, %s, that support SMTP and SENDMAIL do not appear to be functioning on this PHP installation. Please compile them and restart your server.', tag1='<code>proc_*</code>'}</p>
-    </div>
-{/if}
-<div class="alert alert-info">
-    <p>{gt text='Mailer relies on %s' tag1='<a href="http://symfony.com/doc/current/reference/configuration/swiftmailer.html"><i class="fa fa-external-link"></i> SwiftMailer configuration</a>'}</p>
-</div>
-
-{form cssClass='form-horizontal'}
-    {formvalidationsummary}
-    <fieldset>
-        <legend>{gt text='General settings'}</legend>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='transport' __text='Mail transport' mandatorysym=true}
-            <div class="col-sm-9">
-                {formdropdownlist id='transport' mandatory=true cssClass='form-control'}
-            </div>
-        </div>
-        <div class="form-group">
-            {charset assign=defaultcharset}
-            {formlabel cssClass="col-sm-3 control-label" for='charset' __text='Character set' mandatorysym=true}
-            <div class="col-sm-9">
-                {formtextinput id='charset' size=10 maxLength=20 mandatory=true cssClass='form-control'}
-                <p class="help-block sub">{gt text="Default: '%s'" tag1=$defaultcharset}</p>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='encoding' __text="Encoding" mandatorysym=true}
-            <div class="col-sm-9">
-                {formdropdownlist id='encoding' mandatory=true cssClass='form-control'}
-                <p class="help-block sub">{gt text="Default: '%s'" tag1='8bit'}</p>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='html' __text='HTML-formatted messages'}
-            <div class="col-sm-9">
-                <div class="checkbox">
-                    {formcheckbox id='html'}
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='wordwrap' __text='Word wrap' mandatorysym=true}
-            <div class="col-sm-9">
-                {formtextinput id='wordwrap' size=3 maxLength=3 mandatory=true cssClass='form-control'}
-                <p class="help-block sub">{gt text="Default: '%s'" tag1='50'}</p>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='enableLogging' __text='Enable logging of sent mail'}
-            <div class="col-sm-9">
-                <div class="checkbox">
-                    {formcheckbox id='enableLogging'}
-                </div>
-            </div>
-        </div>
-    </fieldset>
-
-    <fieldset data-switch="transport[]" data-switch-value="smtp">
-        <legend>{gt text='SMTP settings'}</legend>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='host' __text='SMTP host server'}
-            <div class="col-sm-9">
-                {formtextinput id='host' size=30 maxLength=255 cssClass='form-control'}
-                <p class="help-block sub">{gt text="Default: '%s'" tag1='localhost'}</p>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='port' __text='SMTP port'}
-            <div class="col-sm-9">
-                {formtextinput id='port' size=5 maxLength=5 cssClass='form-control'}
-                <p class="help-block sub">{gt text="Default: '%s'" tag1='25'}</p>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='encryption' __text='SMTP encryption method'}
-            <div class="col-sm-9">
-                {formdropdownlist id='encryption' cssClass='form-control'}
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='auth_mode' __text='SMTP authentication type'}
-            <div class="col-sm-9">
-                {formdropdownlist id='auth_mode' cssClass='form-control'}
-            </div>
-        </div>
-        <div data-switch="auth_mode[]" data-switch-value="login">
-            <div class="form-group">
-                {formlabel cssClass="col-sm-3 control-label" for='username' __text='SMTP user name'}
-                <div class="col-sm-9">
-                    {formtextinput id='username' size=30 maxLength=50 cssClass='form-control'}
-                </div>
-            </div>
-            <div class="form-group">
-                {formlabel cssClass="col-sm-3 control-label" for='password' __text='SMTP password'}
-                <div class="col-sm-9">
-                    {formtextinput id='password' textMode='password' size=30 maxLength=50 cssClass='form-control'}
-                </div>
-            </div>
-        </div>
-    </fieldset>
-
-    <fieldset data-switch="transport[]" data-switch-value="gmail">
-        <legend>{gt text='Gmail settings'}</legend>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='usernameGmail' __text='Gmail user name'}
-            <div class="col-sm-9">
-                {formtextinput id='usernameGmail' size=30 maxLength=50 cssClass='form-control'}
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass="col-sm-3 control-label" for='passwordGmail' __text='Gmail password'}
-            <div class="col-sm-9">
-                {formtextinput id='passwordGmail' textMode='password' size=30 maxLength=50 cssClass='form-control'}
-            </div>
-        </div>
-    </fieldset>
-
-    <div class="form-group">
-        <div class="col-sm-offset-3 col-sm-9">
-            {formbutton class='btn btn-success' commandName='save' __text='Save'}
-            {formbutton class='btn btn-danger' commandName='cancel' __text='Cancel'}
-        </div>
-    </div>
-{/form}
-{adminfooter}
\ No newline at end of file
diff --git a/src/system/MailerModule/Resources/views/Admin/test.html.twig b/src/system/MailerModule/Resources/views/Admin/test.html.twig
new file mode 100644
index 0000000000..877811fa04
--- /dev/null
+++ b/src/system/MailerModule/Resources/views/Admin/test.html.twig
@@ -0,0 +1,48 @@
+{% form_theme form with [
+    'ZikulaFormExtensionBundle:Form:bootstrap_3_zikula_admin_layout.html.twig',
+    'ZikulaFormExtensionBundle:Form:form_div_layout.html.twig'
+] %}
+{{ adminHeader() }}
+<div class="container-fluid">
+    <div class="row">
+        <h3>
+            <span class="fa fa-envelope"></span>
+            {{ __('Test current settings') }}
+        </h3>
+
+        <div class="alert alert-info">
+            <h4>{{ __('Current settings from') }} <code>dynamic/generated.yml</code>:</h4>
+            {{ swiftmailerHtml|raw }}
+        </div>
+
+        {{ form_start(form) }}
+        {{ form_errors(form) }}
+
+        <fieldset>
+            <legend>{{ __('Settings test') }}</legend>
+            {{ form_row(form.fromName) }}
+            {{ form_row(form.fromAddress) }}
+            {{ form_row(form.toName) }}
+            {{ form_row(form.toAddress) }}
+            {{ form_row(form.subject) }}
+            {{ form_row(form.messageType) }}
+            <div class="form-group" data-switch="zikulamailermodule_test[messageType]" data-switch-value="html,multipart">
+                {{ form_row(form.bodyHtml) }}
+            </div>
+            <div class="form-group" data-switch="zikulamailermodule_test[messageType]" data-switch-value="text,multipart">
+                {{ form_row(form.bodyText) }}
+            </div>
+        </fieldset>
+
+        {{ notifyDisplayHooks(eventName='mailer.ui_hooks.htmlmail.form_edit', id=null) }}
+
+        <div class="form-group">
+            <div class="col-sm-offset-3 col-sm-9">
+                {{ form_widget(form.test, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
+                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+            </div>
+        </div>
+        {{ form_end(form) }}
+    </div>
+</div>
+{{ adminFooter() }}
diff --git a/src/system/MailerModule/Resources/views/Admin/testconfig.tpl b/src/system/MailerModule/Resources/views/Admin/testconfig.tpl
deleted file mode 100644
index bf60c11ed4..0000000000
--- a/src/system/MailerModule/Resources/views/Admin/testconfig.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-{adminheader}
-<h3>
-    <span class="fa fa-envelope"></span>
-    {gt text='Test current settings'}
-</h3>
-
-<div class="alert alert-info">
-    <h4>{gt text='Current settings from'} <code>dynamic/generated.yml</code>:</h4>
-    {$swiftmailerHtml}
-</div>
-{form cssClass='form-horizontal'}
-{formvalidationsummary}
-    <fieldset>
-        <legend>{gt text='Settings test'}</legend>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">{gt text="Sender's name"}</label>
-            <div class="col-sm-9">
-                <div class="well well-sm">
-                    {$modvars.ZConfig.sitename}
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">{gt text="Sender's e-mail address"}</label>
-            <div class="col-sm-9">
-                <div class="well well-sm">
-                    {$modvars.ZConfig.adminmail}
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass='col-sm-3 control-label' for='toname' __text="Recipient's name" mandatorysym=true}
-            <div class="col-sm-9">
-                {formtextinput id='toname' size=30 maxLength=50 mandatory=true cssClass='form-control'}
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass='col-sm-3 control-label' for='toaddress' __text="Recipient's e-mail address" mandatorysym=true}
-            <div class="col-sm-9">
-                {formemailinput id='toaddress' size=30 maxLength=50 mandatory=true cssClass='form-control'}
-            </div>
-        </div>
-        <div class="form-group">
-            {formlabel cssClass='col-sm-3 control-label' for='subject' __text='Subject' mandatorysym=true}
-            <div class="col-sm-9">
-                {formtextinput id='subject' size=30 maxLength=50 mandatory=true cssClass='form-control'}
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">
-                {gt text='Message Type'}
-                <span class="required"></span>
-            </label>
-            <div id="message_type" class="col-sm-9">
-                {formradiobutton id='mailer_text' dataField='msgtype' value='text' mandatory=true}
-                {formlabel for='mailer_text' __text='Plain-text message'}
-                {formradiobutton id='mailer_html' dataField='msgtype' value='html' mandatory=true}
-                {formlabel for='mailer_html' __text='HTML-formatted message'}
-                {formradiobutton id='mailer_multipart' dataField='msgtype' value='multipart' mandatory=true}
-                {formlabel for='mailer_multipart' __text='Multi-part message'}
-            </div>
-        </div>
-        <div class="form-group" data-switch="msgtype" data-switch-value="html,multipart">
-            {formlabel cssClass="col-sm-3 control-label" for='mailer_body' __text='HTML-formatted message'}
-            <div class="col-sm-9">
-                {formtextinput cssClass="form-control" id='mailer_body' textMode='multiline' cols=50 rows=10}
-            </div>
-        </div>
-        <div class="form-group" data-switch="msgtype" data-switch-value="text,multipart">
-            {formlabel cssClass="col-sm-3 control-label" for='mailer_textbody' __text='Plain-text message'}
-            <div class="col-sm-9">
-                {formtextinput cssClass="form-control" id='mailer_textbody' textMode='multiline' cols=50 rows=10}
-            </div>
-        </div>
-    </fieldset>
-
-    {notifydisplayhooks eventname='mailer.ui_hooks.htmlmail.form_edit' id=null}
-
-    <div class="form-group">
-        <div class="col-sm-offset-3 col-sm-9">
-            {formbutton class='btn btn-success' commandName='save' __text='Send test email now'}
-            {formbutton class='btn btn-danger' commandName='cancel' __text='Cancel'}
-        </div>
-    </div>
-{/form}
-{adminfooter}
diff --git a/src/system/MailerModule/Twig/TwigExtension.php b/src/system/MailerModule/Twig/TwigExtension.php
new file mode 100644
index 0000000000..3a1bdcda27
--- /dev/null
+++ b/src/system/MailerModule/Twig/TwigExtension.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\Twig;
+
+/**
+ * Twig extension class.
+ */
+class TwigExtension extends \Twig_Extension
+{
+    /**
+     * Returns a list of custom Twig functions.
+     *
+     * @return array
+     */
+    public function getFunctions()
+    {
+        return [
+            new \Twig_SimpleFunction('zikulamailermodule_hasProcessControlFunctions', [$this, 'hasProcessControlFunctions'])
+        ];
+    }
+
+    /**
+     * The zikulamailermodule_hasProcessControlFunctions function determines whether the proc_* functions are available.
+     *
+     * @return boolean True if proc_* functions are available, false otherwise.
+     */
+    public function hasProcessControlFunctions()
+    {
+        return function_exists('proc_open');
+    }
+
+    /**
+     * Returns internal name of this extension.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'zikulamailermodule_twigextension';
+    }
+}

From 6e6ee567f2c235b1ca0762877e5e721ce81cc61f Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 16:46:31 +0200
Subject: [PATCH 02/31] removed old version class

---
 .../MailerModule/Container/HookContainer.php  | 36 +++++++++++++
 .../MailerModule/MailerModuleVersion.php      | 54 -------------------
 src/system/MailerModule/composer.json         | 14 ++++-
 3 files changed, 48 insertions(+), 56 deletions(-)
 create mode 100644 src/system/MailerModule/Container/HookContainer.php
 delete mode 100644 src/system/MailerModule/MailerModuleVersion.php

diff --git a/src/system/MailerModule/Container/HookContainer.php b/src/system/MailerModule/Container/HookContainer.php
new file mode 100644
index 0000000000..1d5fbd7e31
--- /dev/null
+++ b/src/system/MailerModule/Container/HookContainer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\MailerModule\Container\Base;
+
+use Zikula\Bundle\HookBundle\AbstractHookContainer;
+use Zikula\Bundle\HookBundle\Bundle\SubscriberBundle;
+
+/**
+ * Class for hook container methods.
+ */
+class HookContainer extends AbstractHookContainer
+{
+    /**
+     * Define the hook bundles supported by this module.
+     *
+     * @return void
+     */
+    protected function setupHookBundles()
+    {
+        // This enables Scribite 5 connection to HTML e-mail test
+        $bundle = new SubscriberBundle('ZikulaMailerModule', 'subscriber.mailer.ui_hooks.htmlmail', 'ui_hooks', $this->__('HTML mail hook'));
+        $bundle->addEvent('form_edit', 'mailer.ui_hooks.htmlmail.form_edit');
+        $this->registerHookSubscriberBundle($bundle);
+    }
+}
diff --git a/src/system/MailerModule/MailerModuleVersion.php b/src/system/MailerModule/MailerModuleVersion.php
deleted file mode 100644
index 6b4db5bfca..0000000000
--- a/src/system/MailerModule/MailerModuleVersion.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright Zikula Foundation 2009 - Zikula Application Framework
- *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
- *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
- */
-
-namespace Zikula\MailerModule;
-
-use HookUtil;
-use Zikula\Bundle\HookBundle\Bundle\SubscriberBundle;
-
-/**
- * Version information for the mailer module
- */
-class MailerModuleVersion extends \Zikula_AbstractVersion
-{
-    /**
-     * Generate an array of meta data about this module
-     *
-     * @return array meta data array
-     */
-    public function getMetaData()
-    {
-        $meta = array();
-        $meta['displayname']    = $this->__('Mailer Module');
-        $meta['description']    = $this->__('Mailer module, provides mail API and mail setting administration.');
-        //! module name that appears in URL
-        $meta['url']            = $this->__('mailer');
-        $meta['version']        = '1.4.3';
-        $meta['core_min']       = '1.4.0';
-        $meta['capabilities']   = array(HookUtil::SUBSCRIBER_CAPABLE => array('enabled' => true));
-        $meta['securityschema'] = array('ZikulaMailerModule::' => '::');
-
-        return $meta;
-    }
-
-    /**
-     * Set up hook subscriber bundle
-     */
-    protected function setupHookBundles()
-    {
-        // This enables Scribite 5 connection to HTML e-mail test
-        $bundle = new SubscriberBundle($this->name, 'subscriber.mailer.ui_hooks.htmlmail', 'ui_hooks', $this->__('HTML mail hook'));
-        $bundle->addEvent('form_edit', 'mailer.ui_hooks.htmlmail.form_edit');
-        $this->registerHookSubscriberBundle($bundle);
-    }
-}
diff --git a/src/system/MailerModule/composer.json b/src/system/MailerModule/composer.json
index 183cf1842e..939e69a375 100644
--- a/src/system/MailerModule/composer.json
+++ b/src/system/MailerModule/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "zikula/mailer-module",
-    "description": "Mailer Module",
+    "version": "1.5.0",
+    "description": "Mailer module, provides mail API and mail setting administration.",
     "type": "zikula-module",
     "license": "LGPL-3.0+",
     "authors": [
@@ -18,7 +19,16 @@
     "extra": {
         "zikula": {
             "url": "mailer",
-            "class": "Zikula\\MailerModule\\ZikulaMailerModule"
+            "class": "Zikula\\MailerModule\\ZikulaMailerModule",
+            "displayname": "Mailer Module",
+            "url": "mailer",
+            "capabilities": {
+                "admin": {"route": "zikulamultisitesmodule_admin_config"},
+                "hook_subscriber": {"class": "Zikula\\MailerModule\\Container\\HookContainer"}
+            },
+            "securityschema": {
+                "ZikulaMailerModule::": "::"
+            }
         }
     }
 }

From 51937720dc253e852ef33c1890805258fd6cd600 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 16:47:16 +0200
Subject: [PATCH 03/31] typo

---
 src/system/MailerModule/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/MailerModule/composer.json b/src/system/MailerModule/composer.json
index 939e69a375..b7957ca9b1 100644
--- a/src/system/MailerModule/composer.json
+++ b/src/system/MailerModule/composer.json
@@ -23,7 +23,7 @@
             "displayname": "Mailer Module",
             "url": "mailer",
             "capabilities": {
-                "admin": {"route": "zikulamultisitesmodule_admin_config"},
+                "admin": {"route": "zikulamailermodule_admin_config"},
                 "hook_subscriber": {"class": "Zikula\\MailerModule\\Container\\HookContainer"}
             },
             "securityschema": {

From 0322d1cdf979975de6180b8eb9d222288f44cbaa Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 16:51:44 +0200
Subject: [PATCH 04/31] updated installer class

---
 .../MailerModule/MailerModuleInstaller.php    | 66 +++++++++++--------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/system/MailerModule/MailerModuleInstaller.php b/src/system/MailerModule/MailerModuleInstaller.php
index 6ec2f16c69..59c6707a96 100644
--- a/src/system/MailerModule/MailerModuleInstaller.php
+++ b/src/system/MailerModule/MailerModuleInstaller.php
@@ -14,45 +14,51 @@
 namespace Zikula\MailerModule;
 
 use ZLanguage;
-use HookUtil;
 
 /**
  * Installation and upgrade routines for the mailer module
  */
-class MailerModuleInstaller extends \Zikula_AbstractInstaller
+class MailerModuleInstaller extends AbstractExtensionInstaller
 {
     /**
-     * initialise the template module
+     * Install the ZikulaMailerModule application.
      *
-     * @return bool true if successful, false otherwise
+     * @return boolean True on success, or false.
+     *
+     * @throws RuntimeException Thrown if database tables can not be created or another error occurs
      */
     public function install()
     {
         $this->setVars($this->getDefaults());
 
-        HookUtil::registerSubscriberBundles($this->version->getHookSubscriberBundles());
+        // install subscriber hooks
+        $this->hookApi->installSubscriberHooks($this->bundle->getMetaData());
 
         // Initialisation successful
         return true;
     }
 
     /**
-     * upgrade the module from an old version
+     * Upgrade the ZikulaMailerModule application from an older version.
+     *
+     * If the upgrade fails at some point, it returns the last upgraded version.
+     *
+     * @param integer $oldVersion Version to upgrade from.
      *
-     * @param  string $oldversion version number string to upgrade from
+     * @return boolean True on success, false otherwise.
      *
-     * @return bool|string  true on success, last valid version string or false if fails
+     * @throws RuntimeException Thrown if database tables can not be updated
      */
-    public function upgrade($oldversion)
+    public function upgrade($oldVersion)
     {
         // Upgrade dependent on old version number
-        switch ($oldversion) {
+        switch ($oldVersion) {
             case '1.3.1':
                 $this->setVar('smtpsecuremethod', 'ssl');
             case '1.3.2':
                 // clear old modvars
                 // use manual method because getVars() is not available during system upgrade
-                $modVarEntities = $this->entityManager->getRepository('Zikula\ExtensionsModule\Entity\ExtensionVarEntity')->findBy(array('modname' => $this->name));
+                $modVarEntities = $this->entityManager->getRepository('Zikula\ExtensionsModule\Entity\ExtensionVarEntity')->findBy(['modname' => $this->name]);
                 $modVars = array();
                 foreach ($modVarEntities as $var) {
                     $modVars[$var['name']] = $var['value'];
@@ -66,14 +72,14 @@ public function upgrade($oldversion)
                 $this->setVarWithDefault('enableLogging', false);
 
                 // write the config file
-                $mailerTypeConversion = array(
+                $mailerTypeConversion = [
                     1 => 'mail',
                     2 => 'sendmail',
                     3 => 'mail',
                     4 => 'smtp',
                     5 => 'mail',
-                );
-                $config = array(
+                ];
+                $config = [
                     'transport' => $mailerTypeConversion[$modVars['mailertype']],
                     'username' => $modVars['smtpusername'],
                     'password' => $modVars['smtppassword'],
@@ -84,20 +90,21 @@ public function upgrade($oldversion)
                     'spool' => array('type' => 'memory'),
                     'delivery_addresses' => [],
                     'disable_delivery' => $modVars['mailertype'] == 5,
-                );
-                $configDumper = $this->getContainer()->get('zikula.dynamic_config_dumper');
+                ];
+                $configDumper = $this->container->get('zikula.dynamic_config_dumper');
                 $configDumper->setConfiguration('swiftmailer', $config);
 
             case '1.4.0':
-                $configDumper = $this->getContainer()->get('zikula.dynamic_config_dumper');
+                $configDumper = $this->container->get('zikula.dynamic_config_dumper');
                 $config = $configDumper->getConfiguration('swiftmailer');
                 // remove spool parameter
                 unset($config['spool']);
                 $configDumper->setConfiguration('swiftmailer', $config);
             case '1.4.1':
-                HookUtil::registerSubscriberBundles($this->version->getHookSubscriberBundles());
+                // install subscriber hooks
+                $this->hookApi->installSubscriberHooks($this->bundle->getMetaData());
             case '1.4.2':
-                $configDumper = $this->getContainer()->get('zikula.dynamic_config_dumper');
+                $configDumper = $this->container->get('zikula.dynamic_config_dumper');
                 $config = $configDumper->getConfiguration('swiftmailer');
                 // delivery_address has changed to an array named delivery_addresses
                 $config['delivery_addresses'] = !empty($config['delivery_address']) ? [$config['delivery_address']] : [];
@@ -112,35 +119,38 @@ public function upgrade($oldversion)
     }
 
     /**
-     * delete the Mailer module
+     * Uninstall ZikulaMailerModule.
      *
-     * @return bool true if successful, false otherwise
+     * @return boolean True on success, false otherwise.
+     *
+     * @throws RuntimeException Thrown if database tables or stored workflows can not be removed
      */
     public function uninstall()
     {
         // Delete any module variables
         $this->delVars();
 
-        // Remove hooks
-        HookUtil::unregisterSubscriberBundles($this->version->getHookSubscriberBundles());
+        // uninstall subscriber hooks
+        $this->hookApi->uninstallSubscriberHooks($this->bundle->getMetaData());
 
         // Deletion successful
         return true;
     }
 
     /**
-     * default module vars
+     * Default module vars.
+     *
      * @return array
      */
     private function getDefaults()
     {
-        return array(
+        return [
             'charset' => ZLanguage::getEncoding(),
             'encoding' => '8bit',
             'html' => false,
             'wordwrap' => 50,
             'enableLogging' => false,
-        );
+        ];
     }
 
     /**
@@ -152,9 +162,9 @@ private function getDefaults()
     private function setVarWithDefault($key, $value = null)
     {
         if (isset($value)) {
-            parent::setVar($key, $value);
+            $this->setVar($key, $value);
         }
         $defaults = $this->getDefaults();
-        parent::setVar($key, $defaults[$key]);
+        $this->setVar($key, $defaults[$key]);
     }
 }

From bb87dbafff82fbd53a52e575a9cd6e1afc6ff80f Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 17:01:47 +0200
Subject: [PATCH 05/31] added config controller

---
 .../Stage/Install/CompleteStage.php           |   2 +-
 .../MailerModule/Container/LinkContainer.php  |   4 +-
 .../Controller/AdminController.php            | 154 +-------------
 .../Controller/ConfigController.php           | 190 ++++++++++++++++++
 .../views/{Admin => Config}/config.html.twig  |   0
 .../views/{Admin => Config}/test.html.twig    |   0
 src/system/MailerModule/composer.json         |   2 +-
 7 files changed, 202 insertions(+), 150 deletions(-)
 create mode 100644 src/system/MailerModule/Controller/ConfigController.php
 rename src/system/MailerModule/Resources/views/{Admin => Config}/config.html.twig (100%)
 rename src/system/MailerModule/Resources/views/{Admin => Config}/test.html.twig (100%)

diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php
index 11939ccd12..0f2f80c325 100644
--- a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php
+++ b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CompleteStage.php
@@ -62,7 +62,7 @@ public function getResponse(Request $request)
         } else {
             $request->getSession()->getFlashBag()->add('warning', __('Email settings are not yet configured. Please configure them below.'));
 
-            return new RedirectResponse($this->container->get('router')->generate('zikulamailermodule_admin_config', array(), RouterInterface::ABSOLUTE_URL));
+            return new RedirectResponse($this->container->get('router')->generate('zikulamailermodule_config_config', array(), RouterInterface::ABSOLUTE_URL));
         }
     }
 
diff --git a/src/system/MailerModule/Container/LinkContainer.php b/src/system/MailerModule/Container/LinkContainer.php
index 538d3fbf81..032f8caf1c 100644
--- a/src/system/MailerModule/Container/LinkContainer.php
+++ b/src/system/MailerModule/Container/LinkContainer.php
@@ -80,12 +80,12 @@ private function getAdmin()
         }
 
         $links[] = [
-            'url' => $this->router->generate('zikulamailermodule_admin_test'),
+            'url' => $this->router->generate('zikulamailermodule_config_test'),
             'text' => $this->translator->__('Test current settings'),
             'icon' => 'envelope'
         ];
         $links[] = [
-            'url' => $this->router->generate('zikulamailermodule_admin_config'),
+            'url' => $this->router->generate('zikulamailermodule_config_config'),
             'text' => $this->translator->__('Settings'),
             'icon' => 'wrench'
         ];
diff --git a/src/system/MailerModule/Controller/AdminController.php b/src/system/MailerModule/Controller/AdminController.php
index 44cf5975a2..245e1cf4f9 100644
--- a/src/system/MailerModule/Controller/AdminController.php
+++ b/src/system/MailerModule/Controller/AdminController.php
@@ -1,20 +1,16 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Zikula\Core\Controller\AbstractController;
@@ -33,15 +29,14 @@ class AdminController extends AbstractController
      */
     public function indexAction()
     {
-        @trigger_error('The zikulamailermodule_admin_index route is deprecated. please use zikulamailermodule_admin_config instead.', E_USER_DEPRECATED);
+        @trigger_error('The zikulamailermodule_admin_index route is deprecated. please use zikulamailermodule_config_config instead.', E_USER_DEPRECATED);
 
-        return $this->redirect($this->generateUrl('zikulamailermodule_admin_config'));
+        return $this->redirect($this->generateUrl('zikulamailermodule_config_config'));
     }
 
     /**
      * @Route("/config")
      * @Theme("admin")
-     * @Template
      *
      * @param Request $request
      * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
@@ -53,141 +48,8 @@ public function configAction(Request $request)
             throw new AccessDeniedException();
         }
 
-        $form = $this->createForm('Zikula\MailerModule\Form\Type\ConfigType');
-
-        if ($form->handleRequest($request)->isValid()) {
-            if ($form->get('save')->isClicked()) {
-                $formData = $form->getData();
-
-                // save modvars
-                $vars = [];
-                foreach (['charset', 'encoding', 'html', 'wordwrap', 'enableLogging'] as $varName) {
-                    $vars[$varName] = $formData[$varName];
-                }
-                $this->get('zikula_extensions_module.api.variable')->setAll('ZikulaMailerModule', $vars);
-
-                // fetch different username and password fields depending on the transport type
-                $credentialsSuffix = $formData['transport'] == 'gmail' ? 'Gmail' : '';
-
-                // write the config file
-                // http://symfony.com/doc/current/reference/configuration/swiftmailer.html
-                $configDumper = $this->get('zikula.dynamic_config_dumper');
-                $currentConfig = $configDumper->getConfiguration('swiftmailer');
-                $config = [
-                    'transport' => (string)$formData['transport'],
-                    'username' => $formData['username' . $credentialsSuffix],
-                    'password' => $formData['password' . $credentialsSuffix],
-                    'host' => $formData['host'],
-                    'port' => $formData['port'],
-                    'encryption' => $formData['encryption'],
-                    'auth_mode' => $formData['auth_mode'],
-                    // the items below can be configured by modifying the app/config/dynamic/generated.yml file
-                    // 'spool' => !empty($currentConfig['spool']) ? $currentConfig['spool'] : ['type' => 'memory'],
-                    'delivery_addresses' => !empty($currentConfig['delivery_addresses'])
-                        ? $currentConfig['delivery_addresses']
-                        : (!empty($currentConfig['delivery_address']) ? [$currentConfig['delivery_address']] : []),
-                    'disable_delivery' => !empty($currentConfig['disable_delivery']) ? $currentConfig['disable_delivery'] : false,
-                ];
-                if ($config['encryption'] == '') {
-                    $config['encryption'] = null;
-                }
-                if ($config['auth_mode'] == '') {
-                    $config['auth_mode'] = null;
-                }
-                $configDumper->setConfiguration('swiftmailer', $config);
-
-                $this->addFlash('status', $this->__('Done! Module configuration updated.'));
-            }
-            if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', $this->__('Operation cancelled.'));
-            }
-        }
-
-        return [
-            'form' => $form->createView()
-        ];
-    }
-
-    /**
-     * @Route("/test")
-     * @Theme("admin")
-     * @Template
-     *
-     * This function displays a form to sent a test mail.
-     *
-     * @param Request $request
-     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function testAction(Request $request)
-    {
-        if (!$this->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-            throw new AccessDeniedException();
-        }
-
-        $dumper = $this->get('zikula.dynamic_config_dumper');
-        $paramHtml = $dumper->getConfigurationForHtml('swiftmailer');
-
-        $form = $this->createForm('Zikula\MailerModule\Form\Type\TestType');
-
-        if ($form->handleRequest($request)->isValid()) {
-            if ($form->get('test')->isClicked()) {
-                $formData = $form->getData();
-
-                $html = in_array($formData['messageType'], array('html', 'multipart')) ? true : false;
-
-                $textBody = $formData['bodyText'];
-                $htmlBody = $formData['bodyHtml'];
-
-                $msgBody = $textBody;
-                $altBody = '';
-                if ($html) {
-                    $msgBody = $htmlBody;
-                    $altBody = $textBody;
-                }
-
-                // add swiftmailer config to message for testing
-                $dumper = $this->get('zikula.dynamic_config_dumper');
-                $swiftConfigHtml = "<h4>Swiftmailer Config:</h4>\n";
-                $swiftConfigHtml .= $dumper->getConfigurationForHtml('swiftmailer');
-
-                if ($html) {
-                    $msgBody .= $swiftConfigHtml;
-                    $altBody .= !empty($altBody) ? strip_tags($swiftConfigHtml) : '';
-                } else {
-                    $msgBody .= strip_tags($swiftConfigHtml);
-                }
-
-                // send the email
-                try {
-                    $result = \ModUtil::apiFunc('ZikulaMailerModule', 'user', 'sendmessage', [
-                        'toname' => $formData['toName'],
-                        'toaddress' => $formData['toAddress'],
-                        'subject' => $formData['subject'],
-                        'body' => $msgBody,
-                        'altbody' => $altBody,
-                        'html' => $html
-                    ]);
-
-                    // check our result and return the correct error code
-                    if (true === $result) {
-                        // Success
-                        $this->addFlash('status', $this->__('Done! Message sent.'));
-                    } else {
-                        $this->addFlash('error', $this->__('It looks like the message could not be sent properly.'));
-                    }
-                } catch (\RuntimeException $e) {
-                    $this->addFlash('error', $this->__('The message could not be sent properly.'));
-                }
-            }
-            if ($form->get('cancel')->isClicked()) {
-                $this->addFlash('status', $this->__('Operation cancelled.'));
-            }
-        }
+        @trigger_error('The zikulamailermodule_admin_config route is deprecated. please use zikulamailermodule_config_config instead.', E_USER_DEPRECATED);
 
-        return [
-            'form' => $form->createView(),
-            'swiftmailerHtml' => $paramHtml
-        ];
+        return $this->redirect($this->generateUrl('zikulamailermodule_config_config'));
     }
 }
diff --git a/src/system/MailerModule/Controller/ConfigController.php b/src/system/MailerModule/Controller/ConfigController.php
new file mode 100644
index 0000000000..fe4d700ced
--- /dev/null
+++ b/src/system/MailerModule/Controller/ConfigController.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * This file is part of the Zikula package.
+ *
+ * Copyright Zikula Foundation - http://zikula.org/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zikula\MailerModule\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Zikula\Core\Controller\AbstractController;
+use Zikula\ThemeModule\Engine\Annotation\Theme;
+
+/**
+ * Class ConfigController
+ * @package Zikula\MailerModule\Controller
+ * @Route("/config")
+ */
+class ConfigController extends AbstractController
+{
+    /**
+     * @Route("")
+     * @deprecated remove at Core-2.0
+     */
+    public function indexAction()
+    {
+        @trigger_error('The zikulamailermodule_config_index route is deprecated. please use zikulamailermodule_config_config instead.', E_USER_DEPRECATED);
+
+        return $this->redirect($this->generateUrl('zikulamailermodule_config_config'));
+    }
+
+    /**
+     * @Route("/config")
+     * @Theme("admin")
+     * @Template
+     *
+     * @param Request $request
+     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function configAction(Request $request)
+    {
+        if (!$this->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
+            throw new AccessDeniedException();
+        }
+
+        $form = $this->createForm('Zikula\MailerModule\Form\Type\ConfigType');
+
+        if ($form->handleRequest($request)->isValid()) {
+            if ($form->get('save')->isClicked()) {
+                $formData = $form->getData();
+
+                // save modvars
+                $vars = [];
+                foreach (['charset', 'encoding', 'html', 'wordwrap', 'enableLogging'] as $varName) {
+                    $vars[$varName] = $formData[$varName];
+                }
+                $this->get('zikula_extensions_module.api.variable')->setAll('ZikulaMailerModule', $vars);
+
+                // fetch different username and password fields depending on the transport type
+                $credentialsSuffix = $formData['transport'] == 'gmail' ? 'Gmail' : '';
+
+                // write the config file
+                // http://symfony.com/doc/current/reference/configuration/swiftmailer.html
+                $configDumper = $this->get('zikula.dynamic_config_dumper');
+                $currentConfig = $configDumper->getConfiguration('swiftmailer');
+                $config = [
+                    'transport' => (string)$formData['transport'],
+                    'username' => $formData['username' . $credentialsSuffix],
+                    'password' => $formData['password' . $credentialsSuffix],
+                    'host' => $formData['host'],
+                    'port' => $formData['port'],
+                    'encryption' => $formData['encryption'],
+                    'auth_mode' => $formData['auth_mode'],
+                    // the items below can be configured by modifying the app/config/dynamic/generated.yml file
+                    // 'spool' => !empty($currentConfig['spool']) ? $currentConfig['spool'] : ['type' => 'memory'],
+                    'delivery_addresses' => !empty($currentConfig['delivery_addresses'])
+                        ? $currentConfig['delivery_addresses']
+                        : (!empty($currentConfig['delivery_address']) ? [$currentConfig['delivery_address']] : []),
+                    'disable_delivery' => !empty($currentConfig['disable_delivery']) ? $currentConfig['disable_delivery'] : false,
+                ];
+                if ($config['encryption'] == '') {
+                    $config['encryption'] = null;
+                }
+                if ($config['auth_mode'] == '') {
+                    $config['auth_mode'] = null;
+                }
+                $configDumper->setConfiguration('swiftmailer', $config);
+
+                $this->addFlash('status', $this->__('Done! Module configuration updated.'));
+            }
+            if ($form->get('cancel')->isClicked()) {
+                $this->addFlash('status', $this->__('Operation cancelled.'));
+            }
+        }
+
+        return [
+            'form' => $form->createView()
+        ];
+    }
+
+    /**
+     * @Route("/test")
+     * @Theme("admin")
+     * @Template
+     *
+     * This function displays a form to sent a test mail.
+     *
+     * @param Request $request
+     * @throws AccessDeniedException Thrown if the user doesn't have admin access to the module
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function testAction(Request $request)
+    {
+        if (!$this->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
+            throw new AccessDeniedException();
+        }
+
+        $dumper = $this->get('zikula.dynamic_config_dumper');
+        $paramHtml = $dumper->getConfigurationForHtml('swiftmailer');
+
+        $form = $this->createForm('Zikula\MailerModule\Form\Type\TestType');
+
+        if ($form->handleRequest($request)->isValid()) {
+            if ($form->get('test')->isClicked()) {
+                $formData = $form->getData();
+
+                $html = in_array($formData['messageType'], array('html', 'multipart')) ? true : false;
+
+                $textBody = $formData['bodyText'];
+                $htmlBody = $formData['bodyHtml'];
+
+                $msgBody = $textBody;
+                $altBody = '';
+                if ($html) {
+                    $msgBody = $htmlBody;
+                    $altBody = $textBody;
+                }
+
+                // add swiftmailer config to message for testing
+                $dumper = $this->get('zikula.dynamic_config_dumper');
+                $swiftConfigHtml = "<h4>Swiftmailer Config:</h4>\n";
+                $swiftConfigHtml .= $dumper->getConfigurationForHtml('swiftmailer');
+
+                if ($html) {
+                    $msgBody .= $swiftConfigHtml;
+                    $altBody .= !empty($altBody) ? strip_tags($swiftConfigHtml) : '';
+                } else {
+                    $msgBody .= strip_tags($swiftConfigHtml);
+                }
+
+                // send the email
+                try {
+                    $result = \ModUtil::apiFunc('ZikulaMailerModule', 'user', 'sendmessage', [
+                        'toname' => $formData['toName'],
+                        'toaddress' => $formData['toAddress'],
+                        'subject' => $formData['subject'],
+                        'body' => $msgBody,
+                        'altbody' => $altBody,
+                        'html' => $html
+                    ]);
+
+                    // check our result and return the correct error code
+                    if (true === $result) {
+                        // Success
+                        $this->addFlash('status', $this->__('Done! Message sent.'));
+                    } else {
+                        $this->addFlash('error', $this->__('It looks like the message could not be sent properly.'));
+                    }
+                } catch (\RuntimeException $e) {
+                    $this->addFlash('error', $this->__('The message could not be sent properly.'));
+                }
+            }
+            if ($form->get('cancel')->isClicked()) {
+                $this->addFlash('status', $this->__('Operation cancelled.'));
+            }
+        }
+
+        return [
+            'form' => $form->createView(),
+            'swiftmailerHtml' => $paramHtml
+        ];
+    }
+}
diff --git a/src/system/MailerModule/Resources/views/Admin/config.html.twig b/src/system/MailerModule/Resources/views/Config/config.html.twig
similarity index 100%
rename from src/system/MailerModule/Resources/views/Admin/config.html.twig
rename to src/system/MailerModule/Resources/views/Config/config.html.twig
diff --git a/src/system/MailerModule/Resources/views/Admin/test.html.twig b/src/system/MailerModule/Resources/views/Config/test.html.twig
similarity index 100%
rename from src/system/MailerModule/Resources/views/Admin/test.html.twig
rename to src/system/MailerModule/Resources/views/Config/test.html.twig
diff --git a/src/system/MailerModule/composer.json b/src/system/MailerModule/composer.json
index b7957ca9b1..7bfb29e6ad 100644
--- a/src/system/MailerModule/composer.json
+++ b/src/system/MailerModule/composer.json
@@ -23,7 +23,7 @@
             "displayname": "Mailer Module",
             "url": "mailer",
             "capabilities": {
-                "admin": {"route": "zikulamailermodule_admin_config"},
+                "admin": {"route": "zikulamailermodule_config_config"},
                 "hook_subscriber": {"class": "Zikula\\MailerModule\\Container\\HookContainer"}
             },
             "securityschema": {

From 591cebf5301dd8e76bf27288d7181a451fcd77e9 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 17:03:11 +0200
Subject: [PATCH 06/31] use new header

---
 src/system/MailerModule/Api/MailerApi.php             | 11 ++++-------
 src/system/MailerModule/Container/HookContainer.php   | 11 ++++-------
 .../DependencyInjection/ZikulaMailerExtension.php     | 11 ++++-------
 src/system/MailerModule/Form/Type/ConfigType.php      | 11 ++++-------
 src/system/MailerModule/Form/Type/TestType.php        | 11 ++++-------
 src/system/MailerModule/Twig/TwigExtension.php        | 11 ++++-------
 6 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index b82dfca1d5..85588bf635 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Api;
diff --git a/src/system/MailerModule/Container/HookContainer.php b/src/system/MailerModule/Container/HookContainer.php
index 1d5fbd7e31..4ce193c77b 100644
--- a/src/system/MailerModule/Container/HookContainer.php
+++ b/src/system/MailerModule/Container/HookContainer.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Container\Base;
diff --git a/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php b/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
index dc3b67153c..d15fa6bfa2 100644
--- a/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
+++ b/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\DependencyInjection;
diff --git a/src/system/MailerModule/Form/Type/ConfigType.php b/src/system/MailerModule/Form/Type/ConfigType.php
index b3fee128dd..a70e777eda 100644
--- a/src/system/MailerModule/Form/Type/ConfigType.php
+++ b/src/system/MailerModule/Form/Type/ConfigType.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Form\Type;
diff --git a/src/system/MailerModule/Form/Type/TestType.php b/src/system/MailerModule/Form/Type/TestType.php
index 4406da68a2..431f62493f 100644
--- a/src/system/MailerModule/Form/Type/TestType.php
+++ b/src/system/MailerModule/Form/Type/TestType.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Form\Type;
diff --git a/src/system/MailerModule/Twig/TwigExtension.php b/src/system/MailerModule/Twig/TwigExtension.php
index 3a1bdcda27..7fc9e44072 100644
--- a/src/system/MailerModule/Twig/TwigExtension.php
+++ b/src/system/MailerModule/Twig/TwigExtension.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Twig;

From 8001862afcbcc1cf4e5a4f298e94b05dc56d1ed5 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 17:03:47 +0200
Subject: [PATCH 07/31] use new header

---
 .../DependencyInjection/ZikulaBlocksExtension.php     | 11 ++++-------
 .../DependencyInjection/ZikulaExtensionsExtension.php | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php b/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
index 9272e8d6d7..6c3e02c99a 100644
--- a/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
+++ b/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\BlocksModule\DependencyInjection;
diff --git a/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php b/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
index b3490a35a2..15be398074 100644
--- a/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
+++ b/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\ExtensionsModule\DependencyInjection;

From 6d9b3d3d363066d1fe0ceb69738789282f75a6ea Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 17:13:52 +0200
Subject: [PATCH 08/31] added missing use statement

---
 src/system/MailerModule/MailerModuleInstaller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/system/MailerModule/MailerModuleInstaller.php b/src/system/MailerModule/MailerModuleInstaller.php
index 59c6707a96..f663135ef5 100644
--- a/src/system/MailerModule/MailerModuleInstaller.php
+++ b/src/system/MailerModule/MailerModuleInstaller.php
@@ -13,6 +13,7 @@
 
 namespace Zikula\MailerModule;
 
+use Zikula\Core\AbstractExtensionInstaller;
 use ZLanguage;
 
 /**

From 7f2ac37c403fe40778b73889cb04999cb00ffd22 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 17:21:17 +0200
Subject: [PATCH 09/31] use shortcut method

---
 src/system/MailerModule/Controller/ConfigController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/MailerModule/Controller/ConfigController.php b/src/system/MailerModule/Controller/ConfigController.php
index fe4d700ced..fdd43eca0c 100644
--- a/src/system/MailerModule/Controller/ConfigController.php
+++ b/src/system/MailerModule/Controller/ConfigController.php
@@ -61,7 +61,7 @@ public function configAction(Request $request)
                 foreach (['charset', 'encoding', 'html', 'wordwrap', 'enableLogging'] as $varName) {
                     $vars[$varName] = $formData[$varName];
                 }
-                $this->get('zikula_extensions_module.api.variable')->setAll('ZikulaMailerModule', $vars);
+                $this->setVars($vars);
 
                 // fetch different username and password fields depending on the transport type
                 $credentialsSuffix = $formData['transport'] == 'gmail' ? 'Gmail' : '';

From 59c68db746b4366a1b863c336c1732ff9559551f Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Tue, 19 Apr 2016 18:16:55 +0200
Subject: [PATCH 10/31] typo

---
 src/system/MailerModule/Api/MailerApi.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index 85588bf635..aab12eadce 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -66,7 +66,7 @@ class MailerApi
     private $permissionApi;
 
     /**
-     * ConfigType constructor.
+     * MailerApi constructor.
      *
      * @param TranslatorInterface      $translator      Translator service instance.
      * @param EventDispatcherInterface $eventDispatcher EventDispatcher service instance.

From b4808700086d15d50c00018067759de0c535fd2f Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Wed, 20 Apr 2016 15:27:03 +0200
Subject: [PATCH 11/31] more changes

---
 .../Controller/AdminController.php            |  16 ++-
 .../Controller/BlockController.php            |  24 +++-
 .../Controller/PositionController.php         |  16 ++-
 .../Form/Type/BlockPositionType.php           |  16 ++-
 .../BlocksModule/Form/Type/BlockType.php      |  18 ++-
 .../Resources/views/Admin/config.html.twig    |   4 +-
 .../Resources/views/Admin/delete.html.twig    |   4 +-
 .../Resources/views/Admin/edit.html.twig      |   4 +-
 .../Resources/views/Admin/new.html.twig       |   2 +-
 .../Resources/views/Position/delete.html.twig |   4 +-
 .../Resources/views/Position/edit.html.twig   |   4 +-
 .../Controller/ConfigController.php           |  16 ++-
 .../Controller/ModuleController.php           |  16 ++-
 .../Form/Type/ExtensionInstallType.php        |  16 ++-
 .../Form/Type/ExtensionModifyType.php         |  22 +++-
 .../Resources/views/Config/config.html.twig   |   4 +-
 .../Resources/views/Module/install.html.twig  |   4 +-
 .../Resources/views/Module/modify.html.twig   |   6 +-
 .../views/Module/uninstall.html.twig          |   4 +-
 src/system/MailerModule/Api/MailerApi.php     |  11 +-
 .../MailerModule/Container/HookContainer.php  |   2 +-
 .../MailerModule/Container/LinkContainer.php  |  11 +-
 .../Controller/AdminController.php            |   1 -
 .../Controller/ConfigController.php           |  43 ++++---
 .../MailerModule/Form/Type/ConfigType.php     | 121 ++++++------------
 .../MailerModule/Form/Type/TestType.php       |  81 ++++--------
 .../Resources/config/services.xml             |  18 +--
 .../Resources/views/Config/config.html.twig   |   4 +-
 .../Resources/views/Config/test.html.twig     |   4 +-
 29 files changed, 269 insertions(+), 227 deletions(-)

diff --git a/src/system/BlocksModule/Controller/AdminController.php b/src/system/BlocksModule/Controller/AdminController.php
index ba06c986af..bf9d76db15 100644
--- a/src/system/BlocksModule/Controller/AdminController.php
+++ b/src/system/BlocksModule/Controller/AdminController.php
@@ -132,8 +132,20 @@ public function configAction(Request $request)
                 'label' => $this->__('Enable block collapse icons'),
                 'required' => false
             ])
-            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Save')])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
 
         $form->handleRequest($request);
diff --git a/src/system/BlocksModule/Controller/BlockController.php b/src/system/BlocksModule/Controller/BlockController.php
index db1a4255ee..344e519ad2 100644
--- a/src/system/BlocksModule/Controller/BlockController.php
+++ b/src/system/BlocksModule/Controller/BlockController.php
@@ -48,7 +48,13 @@ public function newAction(Request $request)
                 'choices' => $this->get('zikula_blocks_module.api.block')->getAvailableBlockTypes(),
                 'label' => 'Block type',
             ])
-            ->add('choose', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
+            ->add('choose', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Choose'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
             ->getForm();
         $form->handleRequest($request);
         if ($form->isValid()) {
@@ -164,8 +170,20 @@ public function deleteAction(Request $request, BlockEntity $blockEntity)
         }
 
         $form = $this->createFormBuilder()
-            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Delete'),
+                'icon' => 'fa-trash-o',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
 
         $form->handleRequest($request);
diff --git a/src/system/BlocksModule/Controller/PositionController.php b/src/system/BlocksModule/Controller/PositionController.php
index 85701e59d9..39d0a029fb 100644
--- a/src/system/BlocksModule/Controller/PositionController.php
+++ b/src/system/BlocksModule/Controller/PositionController.php
@@ -91,8 +91,20 @@ public function deleteAction(Request $request, BlockPositionEntity $positionEnti
         }
 
         $form = $this->createFormBuilder()
-            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+            ->add('delete', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Delete'),
+                'icon' => 'fa-trash-o',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
 
         $form->handleRequest($request);
diff --git a/src/system/BlocksModule/Form/Type/BlockPositionType.php b/src/system/BlocksModule/Form/Type/BlockPositionType.php
index 3526f77911..8a8affb4e6 100644
--- a/src/system/BlocksModule/Form/Type/BlockPositionType.php
+++ b/src/system/BlocksModule/Form/Type/BlockPositionType.php
@@ -25,8 +25,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('pid', 'Symfony\Component\Form\Extension\Core\Type\HiddenType')
             ->add('name', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->add('description', 'Symfony\Component\Form\Extension\Core\Type\TextType')
-            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
         ;
     }
 
diff --git a/src/system/BlocksModule/Form/Type/BlockType.php b/src/system/BlocksModule/Form/Type/BlockType.php
index 467eb7077e..a2a732c144 100644
--- a/src/system/BlocksModule/Form/Type/BlockType.php
+++ b/src/system/BlocksModule/Form/Type/BlockType.php
@@ -26,10 +26,12 @@ class BlockType extends AbstractType
      * @var BlockApi
      */
     private $blockApi;
+
     /**
      * @var BlockFilterApi
      */
     private $blockFilterApi;
+
     /**
      * @var
      */
@@ -78,8 +80,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'Custom filters',
                 'required' => false
             ])
-            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
         ;
     }
 
diff --git a/src/system/BlocksModule/Resources/views/Admin/config.html.twig b/src/system/BlocksModule/Resources/views/Admin/config.html.twig
index b4d9a8a4e6..9dd510ea41 100644
--- a/src/system/BlocksModule/Resources/views/Admin/config.html.twig
+++ b/src/system/BlocksModule/Resources/views/Admin/config.html.twig
@@ -15,8 +15,8 @@
         {{ form_row(form.collapseable) }}
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/BlocksModule/Resources/views/Admin/delete.html.twig b/src/system/BlocksModule/Resources/views/Admin/delete.html.twig
index 30195a13e6..91df6bd597 100644
--- a/src/system/BlocksModule/Resources/views/Admin/delete.html.twig
+++ b/src/system/BlocksModule/Resources/views/Admin/delete.html.twig
@@ -15,8 +15,8 @@
         {{ form_errors(form) }}
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.delete, {attr: {class: 'btn btn-success'}, icon:'fa-trash-o'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.delete) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/BlocksModule/Resources/views/Admin/edit.html.twig b/src/system/BlocksModule/Resources/views/Admin/edit.html.twig
index 39781d7fe4..06d3242638 100644
--- a/src/system/BlocksModule/Resources/views/Admin/edit.html.twig
+++ b/src/system/BlocksModule/Resources/views/Admin/edit.html.twig
@@ -55,8 +55,8 @@
         </fieldset>
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/BlocksModule/Resources/views/Admin/new.html.twig b/src/system/BlocksModule/Resources/views/Admin/new.html.twig
index 4911b0054a..261c2b30cb 100644
--- a/src/system/BlocksModule/Resources/views/Admin/new.html.twig
+++ b/src/system/BlocksModule/Resources/views/Admin/new.html.twig
@@ -20,7 +20,7 @@
         </fieldset>
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.choose, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
+                {{ form_widget(form.choose) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/BlocksModule/Resources/views/Position/delete.html.twig b/src/system/BlocksModule/Resources/views/Position/delete.html.twig
index 9585f4d921..eb736ba5b3 100644
--- a/src/system/BlocksModule/Resources/views/Position/delete.html.twig
+++ b/src/system/BlocksModule/Resources/views/Position/delete.html.twig
@@ -15,8 +15,8 @@
         {{ form_errors(form) }}
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.delete, {attr: {class: 'btn btn-success'}, icon:'fa-trash-o'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.delete) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/BlocksModule/Resources/views/Position/edit.html.twig b/src/system/BlocksModule/Resources/views/Position/edit.html.twig
index 870ac4d552..7e7d9f5556 100644
--- a/src/system/BlocksModule/Resources/views/Position/edit.html.twig
+++ b/src/system/BlocksModule/Resources/views/Position/edit.html.twig
@@ -26,8 +26,8 @@
         {{ form_row(form.description) }}
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/ExtensionsModule/Controller/ConfigController.php b/src/system/ExtensionsModule/Controller/ConfigController.php
index 6f820abe6b..44517b97d6 100644
--- a/src/system/ExtensionsModule/Controller/ConfigController.php
+++ b/src/system/ExtensionsModule/Controller/ConfigController.php
@@ -56,8 +56,20 @@ public function configAction(Request $request)
                 'mapped' => false,
                 'required' => false
             ])
-            ->add('save', 'submit', ['label' => $this->__('Save')])
-            ->add('cancel', 'submit', ['label' => $this->__('Cancel')])
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
 
         $form->handleRequest($request);
diff --git a/src/system/ExtensionsModule/Controller/ModuleController.php b/src/system/ExtensionsModule/Controller/ModuleController.php
index b8fc5b3c0d..3669a63022 100644
--- a/src/system/ExtensionsModule/Controller/ModuleController.php
+++ b/src/system/ExtensionsModule/Controller/ModuleController.php
@@ -390,8 +390,20 @@ public function uninstallAction(Request $request, ExtensionEntity $extension)
         $blocks = $this->getDoctrine()->getManager()->getRepository('ZikulaBlocksModule:BlockEntity')->findBy(['module' => $extension]);
 
         $form = $this->createFormBuilder()
-            ->add('uninstall', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Delete')])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+            ->add('uninstall', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Delete'),
+                'icon' => 'fa-trash-o',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
         $form->handleRequest($request);
 
diff --git a/src/system/ExtensionsModule/Form/Type/ExtensionInstallType.php b/src/system/ExtensionsModule/Form/Type/ExtensionInstallType.php
index 7b1b256d2a..56ca414adc 100644
--- a/src/system/ExtensionsModule/Form/Type/ExtensionInstallType.php
+++ b/src/system/ExtensionsModule/Form/Type/ExtensionInstallType.php
@@ -24,8 +24,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('dependencies', 'Symfony\Component\Form\Extension\Core\Type\CollectionType', [
                 'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\CheckboxType',
             ])
-            ->add('install', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Install'])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => 'Cancel'])
+            ->add('install', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Install'),
+                'icon' => 'fa-plus',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
         ;
     }
 
diff --git a/src/system/ExtensionsModule/Form/Type/ExtensionModifyType.php b/src/system/ExtensionsModule/Form/Type/ExtensionModifyType.php
index fea6e2af7f..5ecc9d5513 100644
--- a/src/system/ExtensionsModule/Form/Type/ExtensionModifyType.php
+++ b/src/system/ExtensionsModule/Form/Type/ExtensionModifyType.php
@@ -26,11 +26,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('displayname', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->add('url', 'Symfony\Component\Form\Extension\Core\Type\TextType')
             ->add('description', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
             ->add('defaults', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
-                'label' => __('Reload Defaults')
+                'label' => $this->__('Reload Defaults'),
+                'icon' => 'fa-refresh',
+                'attr' => [
+                    'class' => 'btn btn-warning'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
             ])
-            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
         ;
     }
 
diff --git a/src/system/ExtensionsModule/Resources/views/Config/config.html.twig b/src/system/ExtensionsModule/Resources/views/Config/config.html.twig
index d85ccedbb0..9652fef86f 100644
--- a/src/system/ExtensionsModule/Resources/views/Config/config.html.twig
+++ b/src/system/ExtensionsModule/Resources/views/Config/config.html.twig
@@ -16,8 +16,8 @@
         <div class="alert alert-danger">{{ form_row(form.hardreset) }}</div>
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/ExtensionsModule/Resources/views/Module/install.html.twig b/src/system/ExtensionsModule/Resources/views/Module/install.html.twig
index dfaa8b14c2..39035a600c 100644
--- a/src/system/ExtensionsModule/Resources/views/Module/install.html.twig
+++ b/src/system/ExtensionsModule/Resources/views/Module/install.html.twig
@@ -40,8 +40,8 @@
         </table>
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.install, {attr: {class: 'btn btn-success'}, icon:'fa-plus'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.install) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/ExtensionsModule/Resources/views/Module/modify.html.twig b/src/system/ExtensionsModule/Resources/views/Module/modify.html.twig
index 33e3179aed..4f7a23716d 100644
--- a/src/system/ExtensionsModule/Resources/views/Module/modify.html.twig
+++ b/src/system/ExtensionsModule/Resources/views/Module/modify.html.twig
@@ -26,9 +26,9 @@
         {{ form_row(form.description) }}
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.defaults, {attr: {class: 'btn btn-warning'}, icon:'fa-refresh'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.defaults) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/ExtensionsModule/Resources/views/Module/uninstall.html.twig b/src/system/ExtensionsModule/Resources/views/Module/uninstall.html.twig
index 31e20fe344..be8532ea6e 100644
--- a/src/system/ExtensionsModule/Resources/views/Module/uninstall.html.twig
+++ b/src/system/ExtensionsModule/Resources/views/Module/uninstall.html.twig
@@ -36,8 +36,8 @@
         {{ form_errors(form) }}
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.uninstall, {attr: {class: 'btn btn-success'}, icon:'fa-trash-o'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.uninstall) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index aab12eadce..183a29a4c1 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -18,9 +18,9 @@
 use Swift_Message;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
 use Zikula\Common\Translator\TranslatorInterface;
 use Zikula\Common\Translator\TranslatorTrait;
+use Zikula\Core\Event\GenericEvent;
 use Zikula\ExtensionsModule\Api\VariableApi;
 use Zikula\PermissionsModule\Api\PermissionApi;
 
@@ -70,12 +70,12 @@ class MailerApi
      *
      * @param TranslatorInterface      $translator      Translator service instance.
      * @param EventDispatcherInterface $eventDispatcher EventDispatcher service instance.
-     * @param DynamicConfigDumper      $configDumper    DynamicConfigDumper service instance.
+     * @param array                    $mailerParams    SwiftMailer configuration parameters.
      * @param VariableApi              $variableApi     VariableApi service instance.
      * @param Session                  $session         Session service instance.
      * @param PermissionApi            $permissionApi   PermissionApi service instance.
      */
-    public function __construct(TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, DynamicConfigDumper $configDumper, VariableApi $variableApi, Swift_Mailer $mailer, Session $session, PermissionApi $permissionApi)
+    public function __construct(TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, array $mailerParams, VariableApi $variableApi, Swift_Mailer $mailer, Session $session, PermissionApi $permissionApi)
     {
         $this->setTranslator($translator);
         $this->eventDispatcher = $eventDispatcher;
@@ -83,9 +83,8 @@ public function __construct(TranslatorInterface $translator, EventDispatcherInte
         $this->session = $session;
         $this->permissionApi = $permissionApi;
 
-        $params = $configDumper->getConfiguration('swiftmailer');
         $modVars = $variableApi->getAll('ZikulaMailerModule');
-        $this->dataValues = array_merge($params, $modVars);
+        $this->dataValues = array_merge($mailerParams, $modVars);
         $this->dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
         $this->dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
     }
@@ -156,7 +155,7 @@ public function sendMessage($args)
         }
 
         // Allow other bundles to control mailer behavior
-        $event = new \Zikula\Core\Event\GenericEvent($this, $args);
+        $event = new GenericEvent($this, $args);
         $this->eventDispatcher->dispatch('module.mailer.api.sendmessage', $event);
         if ($event->isPropagationStopped()) {
             return $event->getData();
diff --git a/src/system/MailerModule/Container/HookContainer.php b/src/system/MailerModule/Container/HookContainer.php
index 4ce193c77b..464ae9531c 100644
--- a/src/system/MailerModule/Container/HookContainer.php
+++ b/src/system/MailerModule/Container/HookContainer.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Zikula\MailerModule\Container\Base;
+namespace Zikula\MailerModule\Container;
 
 use Zikula\Bundle\HookBundle\AbstractHookContainer;
 use Zikula\Bundle\HookBundle\Bundle\SubscriberBundle;
diff --git a/src/system/MailerModule/Container/LinkContainer.php b/src/system/MailerModule/Container/LinkContainer.php
index 032f8caf1c..72bbc57562 100644
--- a/src/system/MailerModule/Container/LinkContainer.php
+++ b/src/system/MailerModule/Container/LinkContainer.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2015 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Container;
diff --git a/src/system/MailerModule/Controller/AdminController.php b/src/system/MailerModule/Controller/AdminController.php
index 245e1cf4f9..b9e4724ef8 100644
--- a/src/system/MailerModule/Controller/AdminController.php
+++ b/src/system/MailerModule/Controller/AdminController.php
@@ -18,7 +18,6 @@
 
 /**
  * Class AdminController
- * @package Zikula\MailerModule\Controller
  * @Route("/admin")
  */
 class AdminController extends AbstractController
diff --git a/src/system/MailerModule/Controller/ConfigController.php b/src/system/MailerModule/Controller/ConfigController.php
index fdd43eca0c..7d4bc43720 100644
--- a/src/system/MailerModule/Controller/ConfigController.php
+++ b/src/system/MailerModule/Controller/ConfigController.php
@@ -19,22 +19,10 @@
 
 /**
  * Class ConfigController
- * @package Zikula\MailerModule\Controller
  * @Route("/config")
  */
 class ConfigController extends AbstractController
 {
-    /**
-     * @Route("")
-     * @deprecated remove at Core-2.0
-     */
-    public function indexAction()
-    {
-        @trigger_error('The zikulamailermodule_config_index route is deprecated. please use zikulamailermodule_config_config instead.', E_USER_DEPRECATED);
-
-        return $this->redirect($this->generateUrl('zikulamailermodule_config_config'));
-    }
-
     /**
      * @Route("/config")
      * @Theme("admin")
@@ -50,7 +38,9 @@ public function configAction(Request $request)
             throw new AccessDeniedException();
         }
 
-        $form = $this->createForm('Zikula\MailerModule\Form\Type\ConfigType');
+        $form = $this->createForm('Zikula\MailerModule\Form\Type\ConfigType',
+            $this->getDataValues(), ['translator' => $this->get('translator.default')]
+        );
 
         if ($form->handleRequest($request)->isValid()) {
             if ($form->get('save')->isClicked()) {
@@ -122,10 +112,13 @@ public function testAction(Request $request)
             throw new AccessDeniedException();
         }
 
+        $variableApi = $this->get('zikula_extensions_module.api.variable');
         $dumper = $this->get('zikula.dynamic_config_dumper');
         $paramHtml = $dumper->getConfigurationForHtml('swiftmailer');
 
-        $form = $this->createForm('Zikula\MailerModule\Form\Type\TestType');
+        $form = $this->createForm('Zikula\MailerModule\Form\Type\TestType',
+            $this->getDataValues(), ['translator' => $this->get('translator.default')]
+        );
 
         if ($form->handleRequest($request)->isValid()) {
             if ($form->get('test')->isClicked()) {
@@ -157,7 +150,8 @@ public function testAction(Request $request)
 
                 // send the email
                 try {
-                    $result = \ModUtil::apiFunc('ZikulaMailerModule', 'user', 'sendmessage', [
+                    $mailer = $this->get('zikula_mailer_module.api.mailer');
+                    $result = $mailer->sendMessage([
                         'toname' => $formData['toName'],
                         'toaddress' => $formData['toAddress'],
                         'subject' => $formData['subject'],
@@ -187,4 +181,23 @@ public function testAction(Request $request)
             'swiftmailerHtml' => $paramHtml
         ];
     }
+
+    /**
+     * Returns required data from module variables and SwiftMailer configuration.
+     */
+    private function getDataValues()
+    {
+        $dumper = $this->get('zikula.dynamic_config_dumper');
+        $variableApi = $this->get('zikula_extensions_module.api.variable');
+
+        $params = $dumper->getConfiguration('swiftmailer');
+        $modVars = $variableApi->getAll('ZikulaMailerModule');
+
+        $dataValues = array_merge($params, $modVars);
+
+        $dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
+        $dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
+
+        return $dataValues;
+    }
 }
diff --git a/src/system/MailerModule/Form/Type/ConfigType.php b/src/system/MailerModule/Form/Type/ConfigType.php
index a70e777eda..1fd6287023 100644
--- a/src/system/MailerModule/Form/Type/ConfigType.php
+++ b/src/system/MailerModule/Form/Type/ConfigType.php
@@ -12,78 +12,40 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
-use Zikula\Common\Translator\TranslatorInterface;
-use Zikula\Common\Translator\TranslatorTrait;
-use Zikula\ExtensionsModule\Api\VariableApi;
 
 /**
  * Configuration form type class.
  */
 class ConfigType extends AbstractType
 {
-    use TranslatorTrait;
-
-    /**
-     * @var array
-     */
-    protected $dataValues;
-
-    /**
-     * ConfigType constructor.
-     *
-     * @param TranslatorInterface $translator   Translator service instance.
-     * @param DynamicConfigDumper $configDumper DynamicConfigDumper service instance.
-     * @param VariableApi         $variableApi  VariableApi service instance.
-     */
-    public function __construct(TranslatorInterface $translator, DynamicConfigDumper $configDumper, VariableApi $variableApi)
-    {
-        $this->setTranslator($translator);
-
-        $params = $configDumper->getConfiguration('swiftmailer');
-        $modVars = $variableApi->getAll('ZikulaMailerModule');
-        $this->dataValues = array_merge($params, $modVars);
-    }
-
-    /**
-     * Sets the translator.
-     *
-     * @param TranslatorInterface $translator Translator service instance.
-     */
-    public function setTranslator(/*TranslatorInterface */$translator)
-    {
-        $this->translator = $translator;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $translator = $options['translator'];
+
         $builder
             ->add('transport', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
-                'label' => $this->__('Mail transport'),
-                'data' => $this->dataValues['transport'],
+                'label' => $translator->__('Mail transport'),
                 'empty_data' => 'mail',
                 'choices' => [
-                    $this->__('Internal PHP `mail()` function') => 'mail',
-                    $this->__('Sendmail message transfer agent') => 'sendmail',
-                    $this->__('Google gmail') => 'gmail',
-                    $this->__('SMTP mail transfer protocol') => 'smtp',
-                    $this->__('Development/debug mode (Do not send any email)') => 'test'/*'null'*/
+                    $translator->__('Internal PHP `mail()` function') => 'mail',
+                    $translator->__('Sendmail message transfer agent') => 'sendmail',
+                    $translator->__('Google gmail') => 'gmail',
+                    $translator->__('SMTP mail transfer protocol') => 'smtp',
+                    $translator->__('Development/debug mode (Do not send any email)') => 'test'/*'null'*/
                 ],
                 'choices_as_values' => true
             ])
             ->add('charset', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('Character set'),
-                'data' => $this->dataValues['charset'],
+                'label' => $translator->__('Character set'),
                 'empty_data' => \ZLanguage::getEncoding(),
                 'max_length' => 20,
-                'help' => $this->__f("Default: '%s'", ['%s' => \ZLanguage::getEncoding()])
+                'help' => $translator->__f("Default: '%s'", ['%s' => \ZLanguage::getEncoding()])
             ])
             ->add('encoding', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
-                'label' => $this->__('Encoding'),
-                'data' => $this->dataValues['encoding'],
+                'label' => $translator->__('Encoding'),
                 'empty_data' => '8bit',
                 'choices' => [
                     '8bit' => '8bit',
@@ -93,49 +55,43 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'quoted-printable' => 'quoted-printable'
                 ],
                 'choices_as_values' => true,
-                'help' => $this->__f("Default: '%s'", ['%s' => '8bit'])
+                'help' => $translator->__f("Default: '%s'", ['%s' => '8bit'])
             ])
             ->add('html', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [
-                'label' => $this->__('HTML-formatted messages'),
-                'data' => (bool) $this->dataValues['html'],
+                'label' => $translator->__('HTML-formatted messages'),
                 'required' => false
             ])
             ->add('wordwrap', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', [
-                'label' => $this->__('Word wrap'),
-                'data' => $this->dataValues['wordwrap'],
+                'label' => $translator->__('Word wrap'),
                 'empty_data' => 50,
                 'scale' => 0,
                 'max_length' => 3,
-                'help' => $this->__f("Default: '%s'", ['%s' => '50'])
+                'help' => $translator->__f("Default: '%s'", ['%s' => '50'])
             ])
             ->add('enableLogging', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType', [
-                'label' => $this->__('Enable logging of sent mail'),
-                'data' => (bool) $this->dataValues['enableLogging'],
+                'label' => $translator->__('Enable logging of sent mail'),
                 'required' => false
             ])
             ->add('host', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('SMTP host server'),
-                'data' => $this->dataValues['host'],
+                'label' => $translator->__('SMTP host server'),
                 'empty_data' => 'localhost',
                 'max_length' => 255,
                 'required' => false,
-                'help' => $this->__f("Default: '%s'", ['%s' => 'localhost'])
+                'help' => $translator->__f("Default: '%s'", ['%s' => 'localhost'])
             ])
             ->add('port', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', [
-                'label' => $this->__('SMTP port'),
-                'data' => $this->dataValues['port'],
+                'label' => $translator->__('SMTP port'),
                 'empty_data' => 25,
                 'scale' => 0,
                 'max_length' => 5,
                 'required' => false,
-                'help' => $this->__f("Default: '%s'", ['%s' => '25'])
+                'help' => $translator->__f("Default: '%s'", ['%s' => '25'])
             ])
             ->add('encryption', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
-                'label' => $this->__('SMTP encryption method'),
-                'data' => $this->dataValues['encryption'],
+                'label' => $translator->__('SMTP encryption method'),
                 'empty_data' => '',
                 'choices' => [
-                    $this->__('None') => '',
+                    $translator->__('None') => '',
                     'SSL' => 'ssl',
                     'TLS' => 'tls'
                 ],
@@ -143,11 +99,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false
             ])
             ->add('auth_mode', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
-                'label' => $this->__('SMTP authentication type'),
-                'data' => $this->dataValues['auth_mode'],
+                'label' => $translator->__('SMTP authentication type'),
                 'empty_data' => '',
                 'choices' => [
-                    $this->__('None') => '',
+                    $translator->__('None') => '',
                     'Plain' => 'plain',
                     'Login' => 'login',
                     'Cram-MD5' => 'cram-md5'
@@ -156,37 +111,45 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false
             ])
             ->add('username', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('SMTP user name'),
-                'data' => $this->dataValues['username'],
+                'label' => $translator->__('SMTP user name'),
                 'empty_data' => '',
                 'max_length' => 50,
                 'required' => false
             ])
             ->add('password', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', [
-                'label' => $this->__('SMTP password'),
-                'data' => $this->dataValues['password'],
+                'label' => $translator->__('SMTP password'),
                 'empty_data' => '',
                 'max_length' => 50,
                 'always_empty' => false,
                 'required' => false
             ])
             ->add('usernameGmail', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('Gmail user name'),
-                'data' => $this->dataValues['usernameGmail'],
+                'label' => $translator->__('Gmail user name'),
                 'empty_data' => '',
                 'max_length' => 50,
                 'required' => false
             ])
             ->add('passwordGmail', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', [
-                'label' => $this->__('Gmail password'),
-                'data' => $this->dataValues['passwordGmail'],
+                'label' => $translator->__('Gmail password'),
                 'empty_data' => '',
                 'max_length' => 50,
                 'always_empty' => false,
                 'required' => false
             ])
-            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Save')])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+            ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $translator->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $translator->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
         ;
     }
 
diff --git a/src/system/MailerModule/Form/Type/TestType.php b/src/system/MailerModule/Form/Type/TestType.php
index 431f62493f..50748ba01a 100644
--- a/src/system/MailerModule/Form/Type/TestType.php
+++ b/src/system/MailerModule/Form/Type/TestType.php
@@ -12,85 +12,42 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
-use Zikula\Common\Translator\TranslatorInterface;
-use Zikula\Common\Translator\TranslatorTrait;
-use Zikula\ExtensionsModule\Api\VariableApi;
 
 /**
  * Configuration form type class.
  */
 class TestType extends AbstractType
 {
-    use TranslatorTrait;
-
-    /**
-     * @var array
-     */
-    protected $dataValues;
-
-    /**
-     * TestType constructor.
-     *
-     * @param TranslatorInterface $translator   Translator service instance.
-     * @param DynamicConfigDumper $configDumper DynamicConfigDumper service instance.
-     * @param VariableApi         $variableApi  VariableApi service instance.
-     */
-    public function __construct(TranslatorInterface $translator, DynamicConfigDumper $configDumper, VariableApi $variableApi)
-    {
-        $this->setTranslator($translator);
-
-        $params = $configDumper->getConfiguration('swiftmailer');
-        $modVars = $variableApi->getAll('ZikulaMailerModule');
-        $this->dataValues = array_merge($params, $modVars);
-        $this->dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
-        $this->dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
-    }
-
-    /**
-     * Sets the translator.
-     *
-     * @param TranslatorInterface $translator Translator service instance.
-     */
-    public function setTranslator(/*TranslatorInterface */$translator)
-    {
-        $this->translator = $translator;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $translator = $options['translator'];
+
         $builder
             ->add('fromName', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('Sender\'s name'),
-                'data' => $this->dataValues['sitename'],
+                'label' => $translator->__('Sender\'s name'),
                 'disabled' => true
             ])
             ->add('fromAddress', 'Symfony\Component\Form\Extension\Core\Type\EmailType', [
-                'label' => $this->__('Sender\'s e-mail address'),
-                'data' => $this->dataValues['adminmail'],
+                'label' => $translator->__('Sender\'s e-mail address'),
                 'disabled' => true
             ])
             ->add('toName', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('Recipient\'s name'),
-                'data' => '',
+                'label' => $translator->__('Recipient\'s name'),
                 'max_length' => 50
             ])
             ->add('toAddress', 'Symfony\Component\Form\Extension\Core\Type\EmailType', [
-                'label' => $this->__('Recipient\'s e-mail address'),
-                'data' => '',
+                'label' => $translator->__('Recipient\'s e-mail address'),
                 'max_length' => 50
             ])
             ->add('subject', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
-                'label' => $this->__('Subject'),
-                'data' => '',
+                'label' => $translator->__('Subject'),
                 'max_length' => 50
             ])
             ->add('messageType', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [
-                'label' => $this->__('Message type'),
-                'data' => ($this->dataValues['html'] ? 'html' : 'text'),
+                'label' => $translator->__('Message type'),
                 'empty_data' => 'text',
                 'choices' => [
                     'Plain-text message' => 'text',
@@ -101,17 +58,27 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'expanded' => false
             ])
             ->add('bodyHtml', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', [
-                'label' => $this->__('HTML-formatted message'),
-                'data' => '',
+                'label' => $translator->__('HTML-formatted message'),
                 'required' => false
             ])
             ->add('bodyText', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', [
-                'label' => $this->__('Plain-text message'),
-                'data' => '',
+                'label' => $translator->__('Plain-text message'),
                 'required' => false
             ])
-            ->add('test', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Send test email')])
-            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', ['label' => $this->__('Cancel')])
+            ->add('test', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $translator->__('Send test email'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $translator->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
         ;
     }
 
diff --git a/src/system/MailerModule/Resources/config/services.xml b/src/system/MailerModule/Resources/config/services.xml
index db2854d3c0..8ae281625b 100644
--- a/src/system/MailerModule/Resources/config/services.xml
+++ b/src/system/MailerModule/Resources/config/services.xml
@@ -6,8 +6,6 @@
 
     <parameters>
         <parameter key="zikula_mailer_module.container.link_container.class">Zikula\MailerModule\Container\LinkContainer</parameter>
-        <parameter key="zikula_mailer_module.form.config_type.class">Zikula\MailerModule\Form\Type\ConfigType</parameter>
-        <parameter key="zikula_mailer_module.form.test_type.class">Zikula\MailerModule\Form\Type\TestType</parameter>
         <parameter key="twig.extension.zikula_mailer_module.class">Zikula\MailerModule\Twig\TwigExtension</parameter>
         <parameter key="zikula_mailer_module.api.mailer.class">Zikula\MailerModule\Api\MailerApi</parameter>
     </parameters>
@@ -20,20 +18,6 @@
             <tag name="zikula.link_container"/>
         </service>
 
-        <service id="zikula_mailer_module.form.config_type" class="%zikula_mailer_module.form.config_type.class%">
-            <argument type="service" id="translator.default" />
-            <argument type="service" id="zikula.dynamic_config_dumper" />
-            <argument type="service" id="zikula_extensions_module.api.variable" />
-            <tag name="form.type" />
-        </service>
-
-        <service id="zikula_mailer_module.form.test_type" class="%zikula_mailer_module.form.test_type.class%">
-            <argument type="service" id="translator.default" />
-            <argument type="service" id="zikula.dynamic_config_dumper" />
-            <argument type="service" id="zikula_extensions_module.api.variable" />
-            <tag name="form.type" />
-        </service>
-
         <service id="twig.extension.zikula_mailer_module" class="%twig.extension.zikula_mailer_module.class%" public="false">
             <tag name="twig.extension" />
         </service>
@@ -41,7 +25,7 @@
         <service id="zikula_mailer_module.api.mailer" class="%zikula_mailer_module.api.mailer.class%">
             <argument type="service" id="translator.default" />
             <argument type="service" id="event_dispatcher" />
-            <argument type="service" id="zikula.dynamic_config_dumper" />
+            <argument>%swiftmailer%</argument>
             <argument type="service" id="zikula_extensions_module.api.variable" />
             <argument type="service" id="mailer" />
             <argument type="service" id="session" />
diff --git a/src/system/MailerModule/Resources/views/Config/config.html.twig b/src/system/MailerModule/Resources/views/Config/config.html.twig
index 2490575aaa..79b6289760 100644
--- a/src/system/MailerModule/Resources/views/Config/config.html.twig
+++ b/src/system/MailerModule/Resources/views/Config/config.html.twig
@@ -52,8 +52,8 @@
 
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/MailerModule/Resources/views/Config/test.html.twig b/src/system/MailerModule/Resources/views/Config/test.html.twig
index 877811fa04..60783ed579 100644
--- a/src/system/MailerModule/Resources/views/Config/test.html.twig
+++ b/src/system/MailerModule/Resources/views/Config/test.html.twig
@@ -38,8 +38,8 @@
 
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.test, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.test) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}

From 7473bc1475629ff548f64cb415f137186fef376e Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Wed, 20 Apr 2016 16:25:24 +0200
Subject: [PATCH 12/31] more explicite api

---
 src/system/MailerModule/Api/MailerApi.php     | 255 +++++++-----------
 src/system/MailerModule/Api/UserApi.php       |  86 +++++-
 .../Resources/config/services.xml             |   1 -
 3 files changed, 177 insertions(+), 165 deletions(-)

diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index 183a29a4c1..3da9dd3a34 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -17,7 +17,6 @@
 use Swift_Mailer;
 use Swift_Message;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Session\Session;
 use Zikula\Common\Translator\TranslatorInterface;
 use Zikula\Common\Translator\TranslatorTrait;
 use Zikula\Core\Event\GenericEvent;
@@ -55,11 +54,6 @@ class MailerApi
      */
     protected $dataValues;
 
-    /**
-     * @var Session
-     */
-    protected $session;
-
     /**
      * @var PermissionApi
      */
@@ -72,21 +66,17 @@ class MailerApi
      * @param EventDispatcherInterface $eventDispatcher EventDispatcher service instance.
      * @param array                    $mailerParams    SwiftMailer configuration parameters.
      * @param VariableApi              $variableApi     VariableApi service instance.
-     * @param Session                  $session         Session service instance.
      * @param PermissionApi            $permissionApi   PermissionApi service instance.
      */
-    public function __construct(TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, array $mailerParams, VariableApi $variableApi, Swift_Mailer $mailer, Session $session, PermissionApi $permissionApi)
+    public function __construct(TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, array $mailerParams, VariableApi $variableApi, Swift_Mailer $mailer, PermissionApi $permissionApi)
     {
         $this->setTranslator($translator);
         $this->eventDispatcher = $eventDispatcher;
         $this->mailer = $mailer;
-        $this->session = $session;
         $this->permissionApi = $permissionApi;
 
         $modVars = $variableApi->getAll('ZikulaMailerModule');
         $this->dataValues = array_merge($mailerParams, $modVars);
-        $this->dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
-        $this->dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
     }
 
     /**
@@ -100,60 +90,32 @@ public function setTranslator(/*TranslatorInterface */$translator)
     }
 
     /**
-     * API function to send e-mail message
+     * API function to send e-mail message.
+     * It is assumed that basic parameters for sender and recipient(s) have already been set.
      *
-     * @param mixed[] $args {
-     *       @type string       $fromname name of the sender
-     *       @type string       $fromaddress address of the sender
-     *       @type string       $toname name to the recipient
-     *       @type string       $toaddress the address of the recipient
-     *       @type string       $replytoname name to reply to
-     *       @type string       $replytoaddress address to reply to
-     *       @type string       $subject message subject
-     *       @type string       $contenttype optional contenttype of the mail (default config)
-     *       @type string       $charset optional charset of the mail (default config)
-     *       @type string       $encoding optional mail encoding (default config)
-     *       @type string       $body message body, if altbody is provided then
-     *                                    this is the HTML version of the body
-     *       @type string       $altbody alternative plain-text message body, if specified the
-     *                                    e-mail will be sent as multipart/alternative
-     *       @type array        $cc addresses to add to the cc list
-     *       @type array        $bcc addresses to add to the bcc list
-     *       @type array|string $headers custom headers to add
-     *       @type int          $html HTML flag, if altbody is not specified then this
-     *                                    indicates whether body contains HTML or not; if altbody is
-     *                                    specified, then this value is ignored, the body is assumed
-     *                                    to be HTML, and the altbody is assumed to be plain text
-     *       @type array        $attachments array of either absolute filenames to attach
-     *                                    to the mail or array of arrays in format
-     *                                    array($path,$filename,$encoding,$type)
-     *       @type array        $stringattachments array of arrays to treat as attachments, format array($string,$filename,$encoding,$type)
-     *       @type array        $embeddedimages array of absolute filenames to image files to embed in the mail
-     *                       }
+     * @param Swift_Message $message The message object.
+     * @param string        $subject message subject
+     * @param string        $body message body, if altbody is provided then
+     *                            this is the HTML version of the body
+     * @param string        $altBody alternative plain-text message body, if specified the
+     *                               e-mail will be sent as multipart/alternative
+     * @param bool          $html HTML flag, if altbody is not specified then this
+     *                            indicates whether body contains HTML or not; if altbody is
+     *                            specified, then this value is ignored, the body is assumed
+     *                            to be HTML, and the altbody is assumed to be plain text
+     * @param array         $headers custom headers to add
+     * @param array         $attachments array of either absolute filenames to attach
+     *                                   to the mail or array of arrays in format
+     *                                   array($path,$filename,$encoding,$type)
+     * @param array         $stringAttachments array of arrays to treat as attachments, format array($string,$filename,$encoding,$type)
+     * @param array         $embeddedImages array of absolute filenames to image files to embed in the mail
      *
      * @throws \RuntimeException Thrown if there's an error sending the e-mail message
      *
      * @return bool true if successful
      */
-    public function sendMessage($args)
+    public function sendMessage(Swift_Message $message, $subject, $body, $altBody, $html, array $headers = array(), array $attachments = array(), array $stringAttachments = array(), array $embeddedImages = array())
     {
-        // Development mailer mode
-        if ($this->dataValues['transport'] == 'test') {
-            $output = '<p>';
-            foreach ($args as $key => $value) {
-                if ($key == 'password') {
-                    // do not expose the password (#2149)
-                    continue;
-                }
-                $output .= '<strong>' . $key . '</strong>: ' . $value . '<br />';
-            }
-            $output .= '</p>';
-
-            $this->session->getFlashBag()->add('status', $output);
-
-            return true;
-        }
-
         // Allow other bundles to control mailer behavior
         $event = new GenericEvent($this, $args);
         $this->eventDispatcher->dispatch('module.mailer.api.sendmessage', $event);
@@ -161,71 +123,14 @@ public function sendMessage($args)
             return $event->getData();
         }
 
-        // create new instance of mailer class
-        $this->message = Swift_Message::newInstance();
-        $this->message->setCharset($this->dataValues['charset']);
-        $this->message->setMaxLineLength($this->dataValues['wordwrap']);
-        $encoderKeys = [
-            '8bit' => '8bitcontentencoder',
-            '7bit' => '7bitcontentencoder',
-            'binary' => '8bitcontentencoder', // no comparable encoding in SwiftMailer AFAICS
-            'base64' => 'base64contentencoder',
-            'quoted-printable' => 'qpcontentencoder'
-        ];
-        $encoderKey = $encoderKeys[$this->dataValues['encoding']];
-        $encoder = Swift_DependencyContainer::getInstance()->lookup('mime.' . $encoderKey);
-        $this->message->setEncoder($encoder);
-
-        // set fromname and fromaddress, default to 'sitename' and 'adminmail' config vars
-        $fromname = (isset($args['fromname']) && $args['fromname']) ? $args['fromname'] : $this->dataValues['sitename'];
-        $fromaddress = (isset($args['fromaddress'])) ? $args['fromaddress'] : $this->dataValues['adminmail'];
-        $this->message->setFrom($fromaddress, $fromname);
-
-        // add any to addresses
-        if (is_array($args['toaddress'])) {
-            $toAdds = [];
-            foreach ($args['toaddress'] as $key => $address) {
-                $toAdds[] = [$address => isset($args['toname'][$key]) ? $args['toname'][$key] : $address];
-            }
-            $this->message->setTo($toAdds);
-        } else {
-            $this->message->setTo($args['toaddress'], isset($args['toname']) ? $args['toname'] : $args['toaddress']);
-        }
-
-        // if replytoname and replytoaddress have been provided us them else use the fromname and fromaddress we built earlier
-        $args['replytoname'] = (!isset($args['replytoname']) || empty($args['replytoname'])) ? $fromname : $args['replytoname'];
-        $args['replytoaddress'] = (!isset($args['replytoaddress'])  || empty($args['replytoaddress'])) ? $fromaddress : $args['replytoaddress'];
-        $this->message->setReplyTo($args['replytoaddress'], $args['replytoname']);
+        $this->message = $message;
 
-        // add any cc addresses
-        if (isset($args['cc']) && is_array($args['cc'])) {
-            foreach ($args['cc'] as $email) {
-                if (isset($email['name'])) {
-                    $this->message->addCc($email['address'], $email['name']);
-                } else {
-                    $this->message->addCc($email['address']);
-                }
-            }
-        }
-
-        // add any bcc addresses
-        if (isset($args['bcc']) && is_array($args['bcc'])) {
-            foreach ($args['bcc'] as $email) {
-                if (isset($email['name'])) {
-                    $this->message->addBcc($email['address'], $email['name']);
-                } else {
-                    $this->message->addBcc($email['address']);
-                }
-            }
-        }
+        $this->setTechnicalParameters();
 
         // add any custom headers
-        if (isset($args['headers']) && is_string($args['headers'])) {
-            $args['headers'] = explode("\n", $args['headers']);
-        }
-        if (isset($args['headers']) && is_array($args['headers'])) {
+        if (count($headers)) {
             $headers = $this->message->getHeaders();
-            foreach ($args['headers'] as $header) {
+            foreach ($headers as $header) {
                 if (is_array($header)) {
                     $headers->addTextHeader($header[0], $header[1]);
                 } else {
@@ -235,82 +140,112 @@ public function sendMessage($args)
         }
 
         // add message subject
-        $this->message->setSubject($args['subject']);
+        $this->message->setSubject($subject);
 
         // add body with formatting
-        if ((!empty($args['altbody']))
-            || ((isset($args['html']) && is_bool($args['html']) && $args['html'])
-            || $this->dataValues['html'])) {
+        $bodyFormat = 'text/plain';
+        if (!empty($altBody) || ((bool) $html) || $this->dataValues['html'])) {
             $bodyFormat = 'text/html';
-        } else {
-            $bodyFormat = 'text/plain';
         }
-        $this->message->setBody($args['body']);
+        $this->message->setBody($body);
         $this->message->setContentType($bodyFormat);
-        if (!empty($args['altbody'])) {
-            $this->message->addPart($args['altbody'], 'text/plain');
+        if (!empty($altBody)) {
+            $this->message->addPart($altBody, 'text/plain');
         }
 
-        $this->addAttachments($args);
+        if (count($attachments)) {
+            $this->addAttachments($attachments);
+        }
+        if (count($stringAttachments)) {
+            $this->addStringAttachments($stringAttachments);
+        }
+        if (count($embeddedImages)) {
+            $this->addEmbeddedImages($embeddedImages);
+        }
 
         // send message
-        $this->performSending($args);
+        $this->performSending();
 
         return true; // message has been sent
     }
 
+    /**
+     * Defines technical parameters for the current message.
+     */
+    private function setTechnicalParameters()
+    {
+        $this->message->setCharset($this->dataValues['charset']);
+        $this->message->setMaxLineLength($this->dataValues['wordwrap']);
+
+        $encoderKeys = [
+            '8bit' => '8bitcontentencoder',
+            '7bit' => '7bitcontentencoder',
+            'binary' => '8bitcontentencoder', // no comparable encoding in SwiftMailer AFAICS
+            'base64' => 'base64contentencoder',
+            'quoted-printable' => 'qpcontentencoder'
+        ];
+        $encoderKey = $encoderKeys[$this->dataValues['encoding']];
+        $encoder = Swift_DependencyContainer::getInstance()->lookup('mime.' . $encoderKey);
+        $this->message->setEncoder($encoder);
+    }
+
     /**
      * Adds given attachments to the current message object.
      *
-     * @param mixed[] $args
+     * @param array $attachments List of attachments to add.
      */
-    private function addAttachments($args)
+    private function addAttachments(array $attachments)
     {
-        // add attachments
-        if (isset($args['attachments']) && !empty($args['attachments'])) {
-            foreach ($args['attachments'] as $attachment) {
-                if (is_array($attachment)) {
-                    if (count($attachment) != 4) {
-                        // skip invalid arrays
-                        continue;
-                    }
-                    $this->message->attach(Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
-                } else {
-                    $this->message->attach(Swift_Attachment::fromPath($attachment));
+        foreach ($attachments as $attachment) {
+            if (is_array($attachment)) {
+                if (count($attachment) != 4) {
+                    // skip invalid arrays
+                    continue;
                 }
+                $this->message->attach(Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
+            } else {
+                $this->message->attach(Swift_Attachment::fromPath($attachment));
             }
         }
+    }
 
-        // add string attachments
-        if (isset($args['stringattachments']) && !empty($args['stringattachments'])) {
-            foreach ($args['stringattachments'] as $attachment) {
-                if (is_array($attachment) && count($attachment) == 4) {
-                    $this->message->attach(Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
-                }
+    /**
+     * Adds given string attachments to the current message object.
+     *
+     * @param array $attachments List of string attachments to add.
+     */
+    private function addStringAttachments(array $attachments)
+    {
+        foreach ($attachments as $attachment) {
+            if (is_array($attachment) && count($attachment) == 4) {
+                $this->message->attach(Swift_Attachment::fromPath($attachment[0], $attachment[3])->setFilename($attachment[1]));
             }
         }
+    }
 
-        // add embedded images
-        if (isset($args['embeddedimages']) && !empty($args['embeddedimages'])) {
-            foreach ($args['embeddedimages'] as $embeddedimage) {
-                $this->message->attach(Swift_Attachment::fromPath($embeddedimage['path'], $embeddedimage['type'])->setFilename($embeddedimage['name']));
-            }
+    /**
+     * Adds given embedded images to the current message object.
+     *
+     * @param array $embeddedImages List of embedded images to add.
+     */
+    private function addEmbeddedImages(array $embeddedImages)
+    {
+        foreach ($embeddedImages as $embeddedImage) {
+            $this->message->attach(Swift_Attachment::fromPath($embeddedImage['path'], $embeddedImage['type'])->setFilename($embeddedImage['name']));
         }
     }
 
     /**
      * Does the actual sending of the current message.
-     *
-     * @param mixed[] $args
      */
-    private function performSending($args)
+    private function performSending()
     {
         $logFile = 'app/logs/mailer.log';
 
         if (!$this->mailer->send($this->message, $failedEmails)) {
-            // message was not sent successfully
+            // message was not sent successfully, do error handling
+
             $emailList = implode(', ', $failedEmails);
-            $args['errorinfo'] = $this->__f('Error! Could not send mail to: %s.', ['%s' => $emailList]);
 
             if ($this->dataValues['enableLogging']) {
                 // access the logging channel
@@ -320,7 +255,7 @@ private function performSending($args)
             }
 
             if ($this->permissionApi->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
-                throw new \RuntimeException($args['errorinfo']);
+                throw new \RuntimeException($this->__f('Error! Could not send mail to: %s.', ['%s' => $emailList]));
             } else {
                 throw new \RuntimeException($this->__('Error! A problem occurred while sending the e-mail message.'));
             }
diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index 477754e004..f963bd2404 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -29,9 +29,6 @@ class UserApi extends \Zikula_AbstractApi
      *       @type string       $replytoname name to reply to
      *       @type string       $replytoaddress address to reply to
      *       @type string       $subject message subject
-     *       @type string       $contenttype optional contenttype of the mail (default config)
-     *       @type string       $charset optional charset of the mail (default config)
-     *       @type string       $encoding optional mail encoding (default config)
      *       @type string       $body message body, if altbody is provided then
      *                                    this is the HTML version of the body
      *       @type string       $altbody alternative plain-text message body, if specified the
@@ -56,8 +53,89 @@ class UserApi extends \Zikula_AbstractApi
      */
     public function sendmessage($args)
     {
+        $dumper = $this->getContainer()->get('zikula.dynamic_config_dumper');
+        $params = $dumper->getConfiguration('swiftmailer');
+
+        // Development mailer mode
+        if ($params['transport'] == 'test') {
+            $output = '<p>';
+            foreach ($args as $key => $value) {
+                if ($key == 'password') {
+                    // do not expose the password (#2149)
+                    continue;
+                }
+                $output .= '<strong>' . $key . '</strong>: ' . $value . '<br />';
+            }
+            $output .= '</p>';
+
+            $this->getContainer()->get('session')->getFlashBag()->add('status', $output);
+
+            return true;
+        }
+
         $mailer = $this->getContainer()->get('zikula_mailer_module.api.mailer');
+        $variableApi = $this->getContainer()->get('zikula_extensions_module.api.variable');
+
+        $sitename = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
+        $adminMail = $variableApi->get('ZConfig', 'adminmail');
+
+        // create new message instance
+        /** @var Swift_Message */
+        $message = Swift_Message::newInstance();
+
+        // set sender details
+        $fromName = (isset($args['fromname']) && $args['fromname']) ? $args['fromname'] : $sitename;
+        $fromAddress = (isset($args['fromaddress'])) ? $args['fromaddress'] : $adminMail;
+        $message->setFrom([$fromAddress => $fromName]);
+
+        // add any to addresses
+        if (is_array($args['toaddress'])) {
+            $toAdds = [];
+            foreach ($args['toaddress'] as $key => $address) {
+                $toAdds[] = isset($args['toname'][$key]) ? [$address => ? $args['toname'][$key]] : $address;
+            }
+            $message->setTo($toAdds);
+        } else {
+            $message->setTo(isset($args['toname']) ? [$args['toaddress'] => $args['toname']] : $args['toaddress'];
+        }
+
+        // if replytoname and replytoaddress have been provided use them else use the fromname and fromaddress built earlier
+        $args['replytoname'] = (!isset($args['replytoname']) || empty($args['replytoname'])) ? $fromname : $args['replytoname'];
+        $args['replytoaddress'] = (!isset($args['replytoaddress'])  || empty($args['replytoaddress'])) ? $fromaddress : $args['replytoaddress'];
+        $message->setReplyTo([$args['replytoaddress'] => $args['replytoname']]);
+
+        // add any cc addresses
+        if (isset($args['cc']) && is_array($args['cc'])) {
+            foreach ($args['cc'] as $email) {
+                if (isset($email['name'])) {
+                    $message->addCc([$email['address'] => $email['name']]);
+                } else {
+                    $message->addCc($email['address']);
+                }
+            }
+        }
+
+        // add any bcc addresses
+        if (isset($args['bcc']) && is_array($args['bcc'])) {
+            foreach ($args['bcc'] as $email) {
+                if (isset($email['name'])) {
+                    $message->addBcc([$email['address'] => $email['name']]);
+                } else {
+                    $message->addBcc($email['address']);
+                }
+            }
+        }
 
-        return $mailer->sendMessage($args);
+        return $mailer->sendMessage(
+            $message,
+            $args['subject'],
+            $args['body'],
+            isset($args['altbody']) ? $args['altbody'] : '',
+            isset($args['html']) ? $args['html'] : '',
+            isset($args['headers']) ? (is_array($args['headers']) ? $args['headers'] : [$args['headers']]) : [],
+            isset($args['attachments']) ? $args['attachments'] : [],
+            isset($args['stringattachments']) ? $args['stringattachments'] : [],
+            isset($args['embeddedimages']) ? $args['embeddedimages'] : []
+        );
     }
 }
diff --git a/src/system/MailerModule/Resources/config/services.xml b/src/system/MailerModule/Resources/config/services.xml
index 8ae281625b..719f19d175 100644
--- a/src/system/MailerModule/Resources/config/services.xml
+++ b/src/system/MailerModule/Resources/config/services.xml
@@ -28,7 +28,6 @@
             <argument>%swiftmailer%</argument>
             <argument type="service" id="zikula_extensions_module.api.variable" />
             <argument type="service" id="mailer" />
-            <argument type="service" id="session" />
             <argument type="service" id="zikula_permissions_module.api.permission" />
         </service>
     </services>

From b61435e0a5288fd69678f0bc8df1dd20320a66cb Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Wed, 20 Apr 2016 16:26:37 +0200
Subject: [PATCH 13/31] syntax fix

---
 src/system/MailerModule/Api/MailerApi.php | 2 +-
 src/system/MailerModule/Api/UserApi.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index 3da9dd3a34..b1e4bb9246 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -144,7 +144,7 @@ public function sendMessage(Swift_Message $message, $subject, $body, $altBody, $
 
         // add body with formatting
         $bodyFormat = 'text/plain';
-        if (!empty($altBody) || ((bool) $html) || $this->dataValues['html'])) {
+        if (!empty($altBody) || ((bool) $html) || $this->dataValues['html']) {
             $bodyFormat = 'text/html';
         }
         $this->message->setBody($body);
diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index f963bd2404..7893dc3d61 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -92,7 +92,7 @@ public function sendmessage($args)
         if (is_array($args['toaddress'])) {
             $toAdds = [];
             foreach ($args['toaddress'] as $key => $address) {
-                $toAdds[] = isset($args['toname'][$key]) ? [$address => ? $args['toname'][$key]] : $address;
+                $toAdds[] = isset($args['toname'][$key]) ? [$address => $args['toname'][$key]] : $address;
             }
             $message->setTo($toAdds);
         } else {

From e8a40ab80b9ce0d3765bf3cbf3103f50c77a293d Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Wed, 20 Apr 2016 16:27:24 +0200
Subject: [PATCH 14/31] syntax fix

---
 src/system/MailerModule/Api/UserApi.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index 7893dc3d61..62d73ff62e 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -96,7 +96,7 @@ public function sendmessage($args)
             }
             $message->setTo($toAdds);
         } else {
-            $message->setTo(isset($args['toname']) ? [$args['toaddress'] => $args['toname']] : $args['toaddress'];
+            $message->setTo(isset($args['toname']) ? [$args['toaddress'] => $args['toname']] : $args['toaddress']);
         }
 
         // if replytoname and replytoaddress have been provided use them else use the fromname and fromaddress built earlier

From 0f724d4c399746d6d6b91899dab2d2756c4ce06a Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Thu, 21 Apr 2016 10:40:05 +0200
Subject: [PATCH 15/31] several amendments

---
 CHANGELOG-1.4.md                              |  1 +
 src/docs/Core-2.0/Api/MailerApi.md            | 28 +++++++++++++++++++
 src/system/MailerModule/Api/UserApi.php       |  2 ++
 .../Controller/ConfigController.php           | 20 +++++++------
 .../MailerModule/Form/Type/TestType.php       | 12 ++++++++
 5 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 src/docs/Core-2.0/Api/MailerApi.md

diff --git a/CHANGELOG-1.4.md b/CHANGELOG-1.4.md
index bae77f2681..b05e2aa3f3 100644
--- a/CHANGELOG-1.4.md
+++ b/CHANGELOG-1.4.md
@@ -16,6 +16,7 @@ CHANGELOG - ZIKULA 1.4.x
     - Add help text, alert text and input groups to forms utilizing the provided form themes.
 
  - Core-2.0 Features:
+    - MailerModule updated to Core-2.0 Spec.
     - SettingsModule updated to Core-2.0 Spec.
 
  - Vendor updates:
diff --git a/src/docs/Core-2.0/Api/MailerApi.md b/src/docs/Core-2.0/Api/MailerApi.md
new file mode 100644
index 0000000000..6893eb3d6b
--- /dev/null
+++ b/src/docs/Core-2.0/Api/MailerApi.md
@@ -0,0 +1,28 @@
+MailerApi
+=========
+
+classname: \Zikula\MailerModule\Api\MailerApi
+
+service id="zikula_mailer_module.api.mailer"
+
+This class is used to send a mail using SwiftMailer configured with settings from the Mailer module configuration.
+
+The class makes the following methods available:
+
+    - sendMessage(Swift_Message $message, $subject, $body, $altBody, $html, array $headers = array(), array $attachments = array(), array $stringAttachments = array(), array $embeddedImages = array())
+
+It is assumed that basic parameters for sender and recipient(s) have already been set.
+
+One example for using this service can be found in the `Zikula\MailerModule\Controller\ConfigController#testAction(Request $request)` method:
+
+```
+    // create new message instance
+    /** @var Swift_Message */
+    $message = Swift_Message::newInstance();
+
+    $message->setFrom([$adminMail => $sitename]);
+    $message->setTo([$formData['toAddress'] => $formData['toName']]);
+
+    $mailer = $this->get('zikula_mailer_module.api.mailer');
+    $result = $mailer->sendMessage($message, $formData['subject'], $msgBody, $altBody, $html);
+```
diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index 62d73ff62e..f170a8516f 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -13,6 +13,8 @@
 
 namespace Zikula\MailerModule\Api;
 
+use Swift_Message;
+
 /**
  * API functions used by user controllers
  */
diff --git a/src/system/MailerModule/Controller/ConfigController.php b/src/system/MailerModule/Controller/ConfigController.php
index 7d4bc43720..e4e370e97f 100644
--- a/src/system/MailerModule/Controller/ConfigController.php
+++ b/src/system/MailerModule/Controller/ConfigController.php
@@ -12,6 +12,7 @@
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Swift_Message;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Zikula\Core\Controller\AbstractController;
@@ -150,15 +151,18 @@ public function testAction(Request $request)
 
                 // send the email
                 try {
+                    $sitename = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
+                    $adminMail = $variableApi->get('ZConfig', 'adminmail');
+
+                    // create new message instance
+                    /** @var Swift_Message */
+                    $message = Swift_Message::newInstance();
+
+                    $message->setFrom([$adminMail => $sitename]);
+                    $message->setTo([$formData['toAddress'] => $formData['toName']]);
+
                     $mailer = $this->get('zikula_mailer_module.api.mailer');
-                    $result = $mailer->sendMessage([
-                        'toname' => $formData['toName'],
-                        'toaddress' => $formData['toAddress'],
-                        'subject' => $formData['subject'],
-                        'body' => $msgBody,
-                        'altbody' => $altBody,
-                        'html' => $html
-                    ]);
+                    $result = $mailer->sendMessage($message, $formData['subject'], $msgBody, $altBody, $html);
 
                     // check our result and return the correct error code
                     if (true === $result) {
diff --git a/src/system/MailerModule/Form/Type/TestType.php b/src/system/MailerModule/Form/Type/TestType.php
index 50748ba01a..f021849188 100644
--- a/src/system/MailerModule/Form/Type/TestType.php
+++ b/src/system/MailerModule/Form/Type/TestType.php
@@ -12,6 +12,8 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Validator\Constraints\Email;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 /**
  * Configuration form type class.
@@ -36,14 +38,24 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('toName', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
                 'label' => $translator->__('Recipient\'s name'),
+                'constraints' => [
+                    new NotBlank()
+                ],
                 'max_length' => 50
             ])
             ->add('toAddress', 'Symfony\Component\Form\Extension\Core\Type\EmailType', [
                 'label' => $translator->__('Recipient\'s e-mail address'),
+                'constraints' => [
+                    new NotBlank(),
+                    new Email()
+                ],
                 'max_length' => 50
             ])
             ->add('subject', 'Symfony\Component\Form\Extension\Core\Type\TextType', [
                 'label' => $translator->__('Subject'),
+                'constraints' => [
+                    new NotBlank()
+                ],
                 'max_length' => 50
             ])
             ->add('messageType', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', [

From 0372effa95efa8e682048fc6a382c7007ebdf97d Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Thu, 21 Apr 2016 10:48:22 +0200
Subject: [PATCH 16/31] added event class and additional events

---
 src/system/MailerModule/Api/MailerApi.php | 21 ++++++++++---
 src/system/MailerModule/MailerEvents.php  | 38 +++++++++++++++++++++++
 2 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 src/system/MailerModule/MailerEvents.php

diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index b1e4bb9246..842575d42b 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -21,6 +21,7 @@
 use Zikula\Common\Translator\TranslatorTrait;
 use Zikula\Core\Event\GenericEvent;
 use Zikula\ExtensionsModule\Api\VariableApi;
+use Zikula\MailerModule\MailerEvents;
 use Zikula\PermissionsModule\Api\PermissionApi;
 
 /**
@@ -116,15 +117,14 @@ public function setTranslator(/*TranslatorInterface */$translator)
      */
     public function sendMessage(Swift_Message $message, $subject, $body, $altBody, $html, array $headers = array(), array $attachments = array(), array $stringAttachments = array(), array $embeddedImages = array())
     {
-        // Allow other bundles to control mailer behavior
-        $event = new GenericEvent($this, $args);
-        $this->eventDispatcher->dispatch('module.mailer.api.sendmessage', $event);
+        $this->message = $message;
+
+        $event = new GenericEvent($this, $this->message);
+        $this->eventDispatcher->dispatch(MailerEvents::SEND_MESSAGE_START, $event);
         if ($event->isPropagationStopped()) {
             return $event->getData();
         }
 
-        $this->message = $message;
-
         $this->setTechnicalParameters();
 
         // add any custom headers
@@ -163,6 +163,12 @@ public function sendMessage(Swift_Message $message, $subject, $body, $altBody, $
             $this->addEmbeddedImages($embeddedImages);
         }
 
+        $event = new GenericEvent($this, $this->message);
+        $this->eventDispatcher->dispatch(MailerEvents::SEND_MESSAGE_PERFORM, $event);
+        if ($event->isPropagationStopped()) {
+            return $event->getData();
+        }
+
         // send message
         $this->performSending();
 
@@ -241,6 +247,7 @@ private function addEmbeddedImages(array $embeddedImages)
     private function performSending()
     {
         $logFile = 'app/logs/mailer.log';
+        $event = new GenericEvent($this, $this->message);
 
         if (!$this->mailer->send($this->message, $failedEmails)) {
             // message was not sent successfully, do error handling
@@ -254,6 +261,8 @@ private function performSending()
                 $logger->addError("Could not send message to: $emailList :: " . $this->message->toString());
             }
 
+            $this->eventDispatcher->dispatch(MailerEvents::SEND_MESSAGE_FAILURE, $event);
+
             if ($this->permissionApi->hasPermission('ZikulaMailerModule::', '::', ACCESS_ADMIN)) {
                 throw new \RuntimeException($this->__f('Error! Could not send mail to: %s.', ['%s' => $emailList]));
             } else {
@@ -267,5 +276,7 @@ private function performSending()
             $logger->pushHandler(new StreamHandler($logFile, Logger::INFO));
             $logger->addInfo('Message sent: ' . $this->message->toString());
         }
+
+        $this->eventDispatcher->dispatch(MailerEvents::SEND_MESSAGE_SUCCESS, $event);
     }
 }
diff --git a/src/system/MailerModule/MailerEvents.php b/src/system/MailerModule/MailerEvents.php
new file mode 100644
index 0000000000..dff5e31a10
--- /dev/null
+++ b/src/system/MailerModule/MailerEvents.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * This file is part of the Zikula package.
+ *
+ * Copyright Zikula Foundation - http://zikula.org/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zikula\MailerModule;
+
+/**
+ * Class MailerEvents
+ * Contains constant values for mailer event names.
+ */
+class MailerEvents
+{
+    /**
+     * Occurs when a new message should be sent.
+     */
+    const SEND_MESSAGE_START = 'module.mailer.api.sendmessage';
+
+    /**
+     * Occurs right before a message is sent.
+     */
+    const SEND_MESSAGE_PERFORM = 'module.mailer.api.perform';
+
+    /**
+     * Occurs after a message has been sent successfully.
+     */
+    const SEND_MESSAGE_SUCCESS = 'module.mailer.api.success';
+
+    /**
+     * Occurs when a message could not be sent.
+     */
+    const SEND_MESSAGE_FAILURE = 'module.mailer.api.failure';
+}

From 776b5ec0700f527e8abb4f677ac42319759feb15 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Thu, 21 Apr 2016 19:09:31 +0200
Subject: [PATCH 17/31] updated header

---
 src/system/MailerModule/Api/UserApi.php           | 11 ++++-------
 src/system/MailerModule/MailerModuleInstaller.php | 11 ++++-------
 src/system/MailerModule/ZikulaMailerModule.php    | 11 ++++-------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index f170a8516f..e2c1a09767 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2014 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule\Api;
diff --git a/src/system/MailerModule/MailerModuleInstaller.php b/src/system/MailerModule/MailerModuleInstaller.php
index f663135ef5..bbe80f7fa1 100644
--- a/src/system/MailerModule/MailerModuleInstaller.php
+++ b/src/system/MailerModule/MailerModuleInstaller.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2009 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule;
diff --git a/src/system/MailerModule/ZikulaMailerModule.php b/src/system/MailerModule/ZikulaMailerModule.php
index 363bf58281..f925e1a631 100644
--- a/src/system/MailerModule/ZikulaMailerModule.php
+++ b/src/system/MailerModule/ZikulaMailerModule.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2014 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\MailerModule;

From 93e94702e1dfe87fad7bc09ad3a8a56cb8adb75d Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Thu, 21 Apr 2016 19:14:22 +0200
Subject: [PATCH 18/31] minor typo

---
 src/system/BlocksModule/Container/LinkContainer.php | 13 +++++--------
 .../ExtensionsModule/Container/LinkContainer.php    | 13 +++++--------
 src/system/MailerModule/Container/LinkContainer.php |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/system/BlocksModule/Container/LinkContainer.php b/src/system/BlocksModule/Container/LinkContainer.php
index 374a783825..80624e3521 100644
--- a/src/system/BlocksModule/Container/LinkContainer.php
+++ b/src/system/BlocksModule/Container/LinkContainer.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2015 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\BlocksModule\Container;
@@ -108,7 +105,7 @@ private function getAdmin()
     }
 
     /**
-     * set the BundleName as required buy the interface
+     * set the BundleName as required by the interface
      *
      * @return string
      */
diff --git a/src/system/ExtensionsModule/Container/LinkContainer.php b/src/system/ExtensionsModule/Container/LinkContainer.php
index babc7f606f..84b7084290 100644
--- a/src/system/ExtensionsModule/Container/LinkContainer.php
+++ b/src/system/ExtensionsModule/Container/LinkContainer.php
@@ -1,14 +1,11 @@
 <?php
 /**
- * Copyright Zikula Foundation 2016 - Zikula Application Framework
+ * This file is part of the Zikula package.
  *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
+ * Copyright Zikula Foundation - http://zikula.org/
  *
- * @license GNU/LGPLv3 (or at your option, any later version).
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Zikula\ExtensionsModule\Container;
@@ -143,7 +140,7 @@ private function getAdmin()
     }
 
     /**
-     * set the BundleName as required buy the interface
+     * set the BundleName as required by the interface
      *
      * @return string
      */
diff --git a/src/system/MailerModule/Container/LinkContainer.php b/src/system/MailerModule/Container/LinkContainer.php
index 72bbc57562..8f3aaca444 100644
--- a/src/system/MailerModule/Container/LinkContainer.php
+++ b/src/system/MailerModule/Container/LinkContainer.php
@@ -91,7 +91,7 @@ private function getAdmin()
     }
 
     /**
-     * set the BundleName as required buy the interface
+     * set the BundleName as required by the interface
      *
      * @return string
      */

From a4c00a91bb349825e9892d2845d5d74066064c28 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Fri, 22 Apr 2016 08:50:59 +0200
Subject: [PATCH 19/31] minor fix for composer.json

---
 src/system/MailerModule/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/MailerModule/composer.json b/src/system/MailerModule/composer.json
index 7bfb29e6ad..3f66196c2b 100644
--- a/src/system/MailerModule/composer.json
+++ b/src/system/MailerModule/composer.json
@@ -18,8 +18,8 @@
     },
     "extra": {
         "zikula": {
-            "url": "mailer",
             "class": "Zikula\\MailerModule\\ZikulaMailerModule",
+            "core-compatibility": ">=1.4.1",
             "displayname": "Mailer Module",
             "url": "mailer",
             "capabilities": {

From 3f0ff100dad883d4a8f4fd2aa104d9b79fc0962b Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Fri, 22 Apr 2016 09:10:28 +0200
Subject: [PATCH 20/31] use redirectToRoute method

---
 src/system/MailerModule/Controller/AdminController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/system/MailerModule/Controller/AdminController.php b/src/system/MailerModule/Controller/AdminController.php
index b9e4724ef8..8995c29a5b 100644
--- a/src/system/MailerModule/Controller/AdminController.php
+++ b/src/system/MailerModule/Controller/AdminController.php
@@ -30,7 +30,7 @@ public function indexAction()
     {
         @trigger_error('The zikulamailermodule_admin_index route is deprecated. please use zikulamailermodule_config_config instead.', E_USER_DEPRECATED);
 
-        return $this->redirect($this->generateUrl('zikulamailermodule_config_config'));
+        return $this->redirectToRoute('zikulamailermodule_config_config');
     }
 
     /**
@@ -49,6 +49,6 @@ public function configAction(Request $request)
 
         @trigger_error('The zikulamailermodule_admin_config route is deprecated. please use zikulamailermodule_config_config instead.', E_USER_DEPRECATED);
 
-        return $this->redirect($this->generateUrl('zikulamailermodule_config_config'));
+        return $this->redirectToRoute('zikulamailermodule_config_config');
     }
 }

From 37d1e586a640fe03fb3aa17e5a271bb53d302ef1 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Fri, 22 Apr 2016 09:15:23 +0200
Subject: [PATCH 21/31] use redirectToRoute method

---
 .../Controller/AdminController.php            |  4 +-
 .../Controller/BlockController.php            | 10 ++---
 .../Controller/PlacementController.php        |  2 +-
 .../Controller/PositionController.php         |  4 +-
 .../Controller/AdminController.php            | 45 ++++++++++---------
 .../Controller/ConfigController.php           |  2 +-
 6 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/system/BlocksModule/Controller/AdminController.php b/src/system/BlocksModule/Controller/AdminController.php
index bf9d76db15..33e64834da 100644
--- a/src/system/BlocksModule/Controller/AdminController.php
+++ b/src/system/BlocksModule/Controller/AdminController.php
@@ -37,7 +37,7 @@ public function indexAction()
     {
         @trigger_error('The zikulablocksmodule_admin_index route is deprecated. please use zikulablocksmodule_admin_view instead.', E_USER_DEPRECATED);
 
-        return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+        return $this->redirectToRoute('zikulablocksmodule_admin_view');
     }
 
     /**
@@ -159,7 +159,7 @@ public function configAction(Request $request)
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+            return $this->redirectToRoute('zikulablocksmodule_admin_view');
         }
 
         return [
diff --git a/src/system/BlocksModule/Controller/BlockController.php b/src/system/BlocksModule/Controller/BlockController.php
index 344e519ad2..5682d15c1a 100644
--- a/src/system/BlocksModule/Controller/BlockController.php
+++ b/src/system/BlocksModule/Controller/BlockController.php
@@ -60,7 +60,7 @@ public function newAction(Request $request)
         if ($form->isValid()) {
             $bkey = json_encode($form->getData()['bkey']);
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_block_edit', ['bkey' => $bkey]));
+            return $this->redirectToRoute('zikulablocksmodule_block_edit', ['bkey' => $bkey]);
         }
 
         return $this->render('@ZikulaBlocksModule/Admin/new.html.twig', [
@@ -83,7 +83,7 @@ public function editAction(Request $request, BlockEntity $blockEntity = null)
         if (null === $blockEntity) {
             $bKey = json_decode($request->query->get('bkey'));
             if (empty($bKey)) {
-                return $this->redirect('zikulablocksmodule_block_new');
+                return $this->redirectToRoute('zikulablocksmodule_block_new');
             }
             $blockEntity = new BlockEntity(); // sets defaults in constructor
             $blockEntity->setBkey($bKey);
@@ -137,12 +137,12 @@ public function editAction(Request $request, BlockEntity $blockEntity = null)
             $em->flush();
             $this->addFlash('status', $this->__('Block saved!'));
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+            return $this->redirectToRoute('zikulablocksmodule_admin_view');
         }
         if ($form->isSubmitted() and $form->get('cancel')->isClicked()) {
             $this->addFlash('status', $this->__('Operation cancelled.'));
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+            return $this->redirectToRoute('zikulablocksmodule_admin_view');
         }
 
         return $this->render('@ZikulaBlocksModule/Admin/edit.html.twig', [
@@ -199,7 +199,7 @@ public function deleteAction(Request $request, BlockEntity $blockEntity)
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+            return $this->redirectToRoute('zikulablocksmodule_admin_view');
         }
 
         return $this->render('@ZikulaBlocksModule/Admin/delete.html.twig', [
diff --git a/src/system/BlocksModule/Controller/PlacementController.php b/src/system/BlocksModule/Controller/PlacementController.php
index bfc1d48217..574287a8c5 100644
--- a/src/system/BlocksModule/Controller/PlacementController.php
+++ b/src/system/BlocksModule/Controller/PlacementController.php
@@ -40,7 +40,7 @@ class PlacementController extends AbstractController
      * @Template
      *
      * @param BlockPositionEntity $positionEntity
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function editAction(BlockPositionEntity $positionEntity)
     {
diff --git a/src/system/BlocksModule/Controller/PositionController.php b/src/system/BlocksModule/Controller/PositionController.php
index 39d0a029fb..4e34a758ce 100644
--- a/src/system/BlocksModule/Controller/PositionController.php
+++ b/src/system/BlocksModule/Controller/PositionController.php
@@ -65,7 +65,7 @@ public function editAction(Request $request, BlockPositionEntity $positionEntity
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+            return $this->redirectToRoute('zikulablocksmodule_admin_view');
         }
 
         return [
@@ -120,7 +120,7 @@ public function deleteAction(Request $request, BlockPositionEntity $positionEnti
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
-            return $this->redirect($this->generateUrl('zikulablocksmodule_admin_view'));
+            return $this->redirectToRoute('zikulablocksmodule_admin_view');
         }
 
         return [
diff --git a/src/system/ExtensionsModule/Controller/AdminController.php b/src/system/ExtensionsModule/Controller/AdminController.php
index 467cc3e972..ce2c4b0dae 100644
--- a/src/system/ExtensionsModule/Controller/AdminController.php
+++ b/src/system/ExtensionsModule/Controller/AdminController.php
@@ -316,10 +316,11 @@ public function initialisePluginAction(Request $request, $plugin)
             $request->getSession()->getFlashBag()->add('status', $this->__('Done! Installed plugin.'));
         }
 
-        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => $state,
-                                                                              'sort'  => $sort,
-                                                                              'bymodule' => $module,
-                                                                              'systemplugins' => $systemplugins), RouterInterface::ABSOLUTE_URL));
+        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', [
+            'state' => $state,
+            'sort'  => $sort,
+            'bymodule' => $module,
+            'systemplugins' => $systemplugins], RouterInterface::ABSOLUTE_URL));
     }
 
     /**
@@ -360,10 +361,11 @@ public function deactivatePluginAction(Request $request, $plugin)
             $request->getSession()->getFlashBag()->add('status', $this->__('Done! Deactivated plugin.'));
         }
 
-        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => $state,
-                                                                              'sort'  => $sort,
-                                                                              'bymodule' => $module,
-                                                                              'systemplugins' => $systemplugins), RouterInterface::ABSOLUTE_URL));
+        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', [
+            'state' => $state,
+            'sort'  => $sort,
+            'bymodule' => $module,
+            'systemplugins' => $systemplugins], RouterInterface::ABSOLUTE_URL));
     }
 
     /**
@@ -404,10 +406,11 @@ public function activatePluginAction(Request $request, $plugin)
             $request->getSession()->getFlashBag()->add('status', $this->__('Done! Activated plugin.'));
         }
 
-        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => $state,
-                                                                              'sort'  => $sort,
-                                                                              'bymodule' => $module,
-                                                                              'systemplugins' => $systemplugins), RouterInterface::ABSOLUTE_URL));
+        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', [
+            'state' => $state,
+            'sort'  => $sort,
+            'bymodule' => $module,
+            'systemplugins' => $systemplugins], RouterInterface::ABSOLUTE_URL));
     }
 
     /**
@@ -448,10 +451,11 @@ public function removePluginAction(Request $request, $plugin)
             $request->getSession()->getFlashBag()->add('status', $this->__('Done! De-installed plugin.'));
         }
 
-        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => $state,
-                                                                              'sort'  => $sort,
-                                                                              'bymodule' => $module,
-                                                                              'systemplugins' => $systemplugins), RouterInterface::ABSOLUTE_URL));
+        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', [
+            'state' => $state,
+            'sort'  => $sort,
+            'bymodule' => $module,
+            'systemplugins' => $systemplugins], RouterInterface::ABSOLUTE_URL));
     }
 
     /**
@@ -492,10 +496,11 @@ public function upgradePluginAction(Request $request, $plugin)
             $request->getSession()->getFlashBag()->add('status', $this->__('Done! Upgraded plugin.'));
         }
 
-        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', array('state' => $state,
-                                                                              'sort'  => $sort,
-                                                                              'bymodule' => $module,
-                                                                              'systemplugins' => $systemplugins), RouterInterface::ABSOLUTE_URL));
+        return new RedirectResponse($this->get('router')->generate('zikulaextensionsmodule_admin_viewplugins', [
+            'state' => $state,
+            'sort'  => $sort,
+            'bymodule' => $module,
+            'systemplugins' => $systemplugins], RouterInterface::ABSOLUTE_URL));
     }
 
     /**
diff --git a/src/system/ExtensionsModule/Controller/ConfigController.php b/src/system/ExtensionsModule/Controller/ConfigController.php
index 44517b97d6..fad1399e2f 100644
--- a/src/system/ExtensionsModule/Controller/ConfigController.php
+++ b/src/system/ExtensionsModule/Controller/ConfigController.php
@@ -88,7 +88,7 @@ public function configAction(Request $request)
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
-            return $this->redirect($this->generateUrl('zikulaextensionsmodule_module_viewmodulelist'));
+            return $this->redirectToRoute('zikulaextensionsmodule_module_viewmodulelist');
         }
 
         return [

From 3733467a5f63dd2c6649eb89d0ba5d0b74eb9771 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Fri, 22 Apr 2016 10:04:09 +0200
Subject: [PATCH 22/31] added default for translator option

---
 src/system/MailerModule/Form/Type/ConfigType.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/system/MailerModule/Form/Type/ConfigType.php b/src/system/MailerModule/Form/Type/ConfigType.php
index 1fd6287023..cfe48d833b 100644
--- a/src/system/MailerModule/Form/Type/ConfigType.php
+++ b/src/system/MailerModule/Form/Type/ConfigType.php
@@ -12,6 +12,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Configuration form type class.
@@ -168,4 +169,14 @@ public function getName()
     {
         return $this->getBlockPrefix();
     }
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'translator' => null
+        ]);
+    }
 }

From fd53812299a65b3012c1c7ea5316008a194755ff Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Fri, 22 Apr 2016 10:04:53 +0200
Subject: [PATCH 23/31] added default for translator option

---
 src/system/MailerModule/Form/Type/TestType.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/system/MailerModule/Form/Type/TestType.php b/src/system/MailerModule/Form/Type/TestType.php
index f021849188..be79593c9d 100644
--- a/src/system/MailerModule/Form/Type/TestType.php
+++ b/src/system/MailerModule/Form/Type/TestType.php
@@ -12,6 +12,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
@@ -109,4 +110,14 @@ public function getName()
     {
         return $this->getBlockPrefix();
     }
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'translator' => null
+        ]);
+    }
 }

From 221556b515859678077002524232c893e3a43734 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Fri, 22 Apr 2016 12:55:47 +0200
Subject: [PATCH 24/31] typo

---
 .../Twig/Extension/SimpleFunction/ModuleHeaderFunction.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/ExtensionsModule/Twig/Extension/SimpleFunction/ModuleHeaderFunction.php b/src/system/ExtensionsModule/Twig/Extension/SimpleFunction/ModuleHeaderFunction.php
index 9cb36d1ffb..a40349fed5 100644
--- a/src/system/ExtensionsModule/Twig/Extension/SimpleFunction/ModuleHeaderFunction.php
+++ b/src/system/ExtensionsModule/Twig/Extension/SimpleFunction/ModuleHeaderFunction.php
@@ -38,7 +38,7 @@ public function __construct(FragmentHandler $handler)
      *
      * Examples:
      *
-     * <samp>{( moduleHeader() }}</samp>
+     * <samp>{{ moduleHeader() }}</samp>
      *
      * @param string $type Type of header (defaults to 'user')
      * @param string $title Title to display in header (optional, defaults to module name)

From efc4b64bc0362a7f2be1c0b1b3ac6873b59bb47d Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Sat, 23 Apr 2016 07:51:18 +0200
Subject: [PATCH 25/31] form improvements in Settings module

---
 .../SettingsModule/Form/Type/LocaleSettingsType.php  | 12 ++++++++++--
 .../SettingsModule/Form/Type/MainSettingsType.php    | 12 ++++++++++--
 .../Resources/views/Settings/locale.html.twig        |  4 ++--
 .../Resources/views/Settings/main.html.twig          |  4 ++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/system/SettingsModule/Form/Type/LocaleSettingsType.php b/src/system/SettingsModule/Form/Type/LocaleSettingsType.php
index 8e627e96d6..1d4dfe7b23 100644
--- a/src/system/SettingsModule/Form/Type/LocaleSettingsType.php
+++ b/src/system/SettingsModule/Form/Type/LocaleSettingsType.php
@@ -48,10 +48,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => $options['translator']->__('Allow IDN domain names')
             ])
             ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
-                'label' => $options['translator']->__('Save')
+                'label' => $options['translator']->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
             ])
             ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
-                'label' => $options['translator']->__('Cancel')
+                'label' => $options['translator']->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
             ])
         ;
     }
diff --git a/src/system/SettingsModule/Form/Type/MainSettingsType.php b/src/system/SettingsModule/Form/Type/MainSettingsType.php
index 2e89bc4377..82b433047e 100644
--- a/src/system/SettingsModule/Form/Type/MainSettingsType.php
+++ b/src/system/SettingsModule/Form/Type/MainSettingsType.php
@@ -170,10 +170,18 @@ function ($submittedPageTitle) use ($options) {
                 'choices' => $options['modules']
             ])
             ->add('save', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
-                'label' => $options['translator']->__('Save')
+                'label' => $options['translator']->__('Save'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
             ])
             ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
-                'label' => $options['translator']->__('Cancel')
+                'label' => $options['translator']->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
             ])
         ;
         foreach ($options['languages'] as $languageCode => $language) {
diff --git a/src/system/SettingsModule/Resources/views/Settings/locale.html.twig b/src/system/SettingsModule/Resources/views/Settings/locale.html.twig
index 1d62955bd4..e09feac0c3 100644
--- a/src/system/SettingsModule/Resources/views/Settings/locale.html.twig
+++ b/src/system/SettingsModule/Resources/views/Settings/locale.html.twig
@@ -46,8 +46,8 @@
         </fieldset>
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
         {{ form_end(form) }}
diff --git a/src/system/SettingsModule/Resources/views/Settings/main.html.twig b/src/system/SettingsModule/Resources/views/Settings/main.html.twig
index 942f654fc8..06bfc568e1 100644
--- a/src/system/SettingsModule/Resources/views/Settings/main.html.twig
+++ b/src/system/SettingsModule/Resources/views/Settings/main.html.twig
@@ -152,8 +152,8 @@
 
         <div class="form-group">
             <div class="col-sm-offset-3 col-sm-9">
-                {{ form_widget(form.save, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-                {{ form_widget(form.cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+                {{ form_widget(form.save) }}
+                {{ form_widget(form.cancel) }}
             </div>
         </div>
 

From d69750b6b8e16d654687e07a68921b046f17f974 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Sat, 23 Apr 2016 07:54:17 +0200
Subject: [PATCH 26/31] form improvements in Theme module

---
 .../Controller/ThemeController.php            | 40 +++++++++++++++----
 .../Resources/views/Theme/delete.html.twig    |  4 +-
 .../views/Theme/setAsDefault.html.twig        |  4 +-
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/system/ThemeModule/Controller/ThemeController.php b/src/system/ThemeModule/Controller/ThemeController.php
index c6fdd85b51..4664f7507a 100644
--- a/src/system/ThemeModule/Controller/ThemeController.php
+++ b/src/system/ThemeModule/Controller/ThemeController.php
@@ -108,14 +108,26 @@ public function setAsDefaultAction(Request $request, $themeName)
                 'label' => $this->__('Override users\' theme settings'),
                 'required' => false,
             ])
-            ->add('Accept', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
-            ->add('Cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
+            ->add('accept', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Accept'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $options['translator']->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
 
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            if ($form->get('Accept')->isClicked()) {
+            if ($form->get('accept')->isClicked()) {
                 $data = $form->getData();
                 // Set the default theme
                 $this->get('zikula_extensions_module.api.variable')->set(VariableApi::CONFIG, 'Default_Theme', $data['themeName']);
@@ -132,7 +144,7 @@ public function setAsDefaultAction(Request $request, $themeName)
                 $this->get('zikula.cache_clearer')->clear('symfony.config');
                 $this->addFlash('status', $this->__('Done! Changed default theme.'));
             }
-            if ($form->get('Cancel')->isClicked()) {
+            if ($form->get('cancel')->isClicked()) {
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
@@ -173,14 +185,26 @@ public function deleteAction(Request $request, $themeName)
                 'label' => $this->__('Also delete theme files, if possible'),
                 'required' => false,
             ])
-            ->add('Accept', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
-            ->add('Cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType')
+            ->add('accept', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $this->__('Accept'),
+                'icon' => 'fa-check',
+                'attr' => [
+                    'class' => 'btn btn-success'
+                ]
+            ])
+            ->add('cancel', 'Symfony\Component\Form\Extension\Core\Type\SubmitType', [
+                'label' => $options['translator']->__('Cancel'),
+                'icon' => 'fa-times',
+                'attr' => [
+                    'class' => 'btn btn-default'
+                ]
+            ])
             ->getForm();
 
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            if ($form->get('Accept')->isClicked()) {
+            if ($form->get('accept')->isClicked()) {
                 $data = $form->getData();
                 $themeEntity = $this->getDoctrine()->getRepository('ZikulaThemeModule:ThemeEntity')->findOneBy(['name' => $themeName]);
                 if (empty($themeEntity)) {
@@ -210,7 +234,7 @@ public function deleteAction(Request $request, $themeName)
                 $this->get('zikula.cache_clearer')->clear('symfony.config');
                 $this->addFlash('status', $data['deletefiles'] ? $this->__('Done! Deleted the theme.') : $this->__('Done! Deactivated the theme.'));
             }
-            if ($form->get('Cancel')->isClicked()) {
+            if ($form->get('cancel')->isClicked()) {
                 $this->addFlash('status', $this->__('Operation cancelled.'));
             }
 
diff --git a/src/system/ThemeModule/Resources/views/Theme/delete.html.twig b/src/system/ThemeModule/Resources/views/Theme/delete.html.twig
index a2db6a49be..eb5185a11e 100644
--- a/src/system/ThemeModule/Resources/views/Theme/delete.html.twig
+++ b/src/system/ThemeModule/Resources/views/Theme/delete.html.twig
@@ -14,8 +14,8 @@
     {{ form_row(form.deletefiles) }}
     <div class="form-group">
         <div class="col-sm-offset-3 col-sm-9">
-            {{ form_widget(form.Accept, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-            {{ form_widget(form.Cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+            {{ form_widget(form.accept) }}
+            {{ form_widget(form.cancel) }}
         </div>
     </div>
 {{ form_end(form) }}
diff --git a/src/system/ThemeModule/Resources/views/Theme/setAsDefault.html.twig b/src/system/ThemeModule/Resources/views/Theme/setAsDefault.html.twig
index 9fba23c891..729906e71c 100644
--- a/src/system/ThemeModule/Resources/views/Theme/setAsDefault.html.twig
+++ b/src/system/ThemeModule/Resources/views/Theme/setAsDefault.html.twig
@@ -26,8 +26,8 @@
     </div>
     <div class="form-group">
         <div class="col-sm-offset-3 col-sm-9">
-            {{ form_widget(form.Accept, {attr: {class: 'btn btn-success'}, icon:'fa-check'}) }}
-            {{ form_widget(form.Cancel, {attr: {class: 'btn btn-default'}, icon:'fa-times'}) }}
+            {{ form_widget(form.accept) }}
+            {{ form_widget(form.cancel) }}
         </div>
     </div>
 {{ form_end(form) }}

From 187543e16c95f490231d904347e51ad64b454ed1 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Sat, 23 Apr 2016 08:34:52 +0200
Subject: [PATCH 27/31] minor docblock fix

---
 src/system/MailerModule/MailerModuleInstaller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/MailerModule/MailerModuleInstaller.php b/src/system/MailerModule/MailerModuleInstaller.php
index bbe80f7fa1..ebce066370 100644
--- a/src/system/MailerModule/MailerModuleInstaller.php
+++ b/src/system/MailerModule/MailerModuleInstaller.php
@@ -41,7 +41,7 @@ public function install()
      *
      * If the upgrade fails at some point, it returns the last upgraded version.
      *
-     * @param integer $oldVersion Version to upgrade from.
+     * @param string $oldVersion Version to upgrade from.
      *
      * @return boolean True on success, false otherwise.
      *

From 330b1f9e7b7b1f8d12543d2529bcb4bd8166ef52 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Sat, 23 Apr 2016 09:28:10 +0200
Subject: [PATCH 28/31] minor improvements

---
 src/system/BlocksModule/Container/LinkContainer.php  |  8 ++++----
 .../ExtensionsModule/Container/LinkContainer.php     |  8 ++++----
 src/system/MailerModule/Api/UserApi.php              |  6 ++++--
 src/system/MailerModule/Container/LinkContainer.php  |  8 ++++----
 .../MailerModule/Controller/ConfigController.php     | 10 ++++++----
 .../SettingsModule/Container/LinkContainer.php       | 10 ++++++----
 src/system/ThemeModule/Container/LinkContainer.php   | 12 ++++++++----
 7 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/system/BlocksModule/Container/LinkContainer.php b/src/system/BlocksModule/Container/LinkContainer.php
index 80624e3521..165603314d 100644
--- a/src/system/BlocksModule/Container/LinkContainer.php
+++ b/src/system/BlocksModule/Container/LinkContainer.php
@@ -33,11 +33,11 @@ class LinkContainer implements LinkContainerInterface
     private $permissionApi;
 
     /**
-     * constructor.
+     * LinkContainer constructor.
      *
-     * @param $translator
-     * @param RouterInterface $router
-     * @param PermissionApi $permissionApi
+     * @param Translator      $translator    Translator service instance.
+     * @param RouterInterface $router        RouterInterface service instance.
+     * @param PermissionApi   $permissionApi PermissionApi service instance.
      */
     public function __construct($translator, RouterInterface $router, PermissionApi $permissionApi)
     {
diff --git a/src/system/ExtensionsModule/Container/LinkContainer.php b/src/system/ExtensionsModule/Container/LinkContainer.php
index 84b7084290..c48b10f082 100644
--- a/src/system/ExtensionsModule/Container/LinkContainer.php
+++ b/src/system/ExtensionsModule/Container/LinkContainer.php
@@ -33,11 +33,11 @@ class LinkContainer implements LinkContainerInterface
     private $permissionApi;
 
     /**
-     * constructor.
+     * LinkContainer constructor.
      *
-     * @param $translator
-     * @param RouterInterface $router
-     * @param PermissionApi $permissionApi
+     * @param Translator      $translator    Translator service instance.
+     * @param RouterInterface $router        RouterInterface service instance.
+     * @param PermissionApi   $permissionApi PermissionApi service instance.
      */
     public function __construct($translator, RouterInterface $router, PermissionApi $permissionApi)
     {
diff --git a/src/system/MailerModule/Api/UserApi.php b/src/system/MailerModule/Api/UserApi.php
index e2c1a09767..18b55d830e 100644
--- a/src/system/MailerModule/Api/UserApi.php
+++ b/src/system/MailerModule/Api/UserApi.php
@@ -11,6 +11,8 @@
 namespace Zikula\MailerModule\Api;
 
 use Swift_Message;
+use Zikula\ExtensionsModule\Api\VariableApi;
+use ZLanguage;
 
 /**
  * API functions used by user controllers
@@ -75,8 +77,8 @@ public function sendmessage($args)
         $mailer = $this->getContainer()->get('zikula_mailer_module.api.mailer');
         $variableApi = $this->getContainer()->get('zikula_extensions_module.api.variable');
 
-        $sitename = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
-        $adminMail = $variableApi->get('ZConfig', 'adminmail');
+        $sitename = $variableApi->get(VariableApi::CONFIG, 'sitename_' . ZLanguage::getLanguageCode(), $variableApi->get(VariableApi::CONFIG, 'sitename_en'));
+        $adminMail = $variableApi->get(VariableApi::CONFIG, 'adminmail');
 
         // create new message instance
         /** @var Swift_Message */
diff --git a/src/system/MailerModule/Container/LinkContainer.php b/src/system/MailerModule/Container/LinkContainer.php
index 8f3aaca444..eeec4dbe8c 100644
--- a/src/system/MailerModule/Container/LinkContainer.php
+++ b/src/system/MailerModule/Container/LinkContainer.php
@@ -33,11 +33,11 @@ class LinkContainer implements LinkContainerInterface
     private $permissionApi;
 
     /**
-     * constructor.
+     * LinkContainer constructor.
      *
-     * @param $translator
-     * @param RouterInterface $router
-     * @param PermissionApi $permissionApi
+     * @param Translator      $translator    Translator service instance.
+     * @param RouterInterface $router        RouterInterface service instance.
+     * @param PermissionApi   $permissionApi PermissionApi service instance.
      */
     public function __construct($translator, RouterInterface $router, PermissionApi $permissionApi)
     {
diff --git a/src/system/MailerModule/Controller/ConfigController.php b/src/system/MailerModule/Controller/ConfigController.php
index e4e370e97f..9f129d6fce 100644
--- a/src/system/MailerModule/Controller/ConfigController.php
+++ b/src/system/MailerModule/Controller/ConfigController.php
@@ -16,7 +16,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Zikula\Core\Controller\AbstractController;
+use Zikula\ExtensionsModule\Api\VariableApi;
 use Zikula\ThemeModule\Engine\Annotation\Theme;
+use ZLanguage;
 
 /**
  * Class ConfigController
@@ -151,8 +153,8 @@ public function testAction(Request $request)
 
                 // send the email
                 try {
-                    $sitename = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
-                    $adminMail = $variableApi->get('ZConfig', 'adminmail');
+                    $sitename = $variableApi->get(VariableApi::CONFIG, 'sitename_' . ZLanguage::getLanguageCode(), $variableApi->get(VariableApi::CONFIG, 'sitename_en'));
+                    $adminMail = $variableApi->get(VariableApi::CONFIG, 'adminmail');
 
                     // create new message instance
                     /** @var Swift_Message */
@@ -199,8 +201,8 @@ private function getDataValues()
 
         $dataValues = array_merge($params, $modVars);
 
-        $dataValues['sitename'] = $variableApi->get('ZConfig', 'sitename_' . \ZLanguage::getLanguageCode(), $variableApi->get('ZConfig', 'sitename_en'));
-        $dataValues['adminmail'] = $variableApi->get('ZConfig', 'adminmail');
+        $dataValues['sitename'] = $variableApi->get(VariableApi::CONFIG, 'sitename_' . ZLanguage::getLanguageCode(), $variableApi->get(VariableApi::CONFIG, 'sitename_en'));
+        $dataValues['adminmail'] = $variableApi->get(VariableApi::CONFIG, 'adminmail');
 
         return $dataValues;
     }
diff --git a/src/system/SettingsModule/Container/LinkContainer.php b/src/system/SettingsModule/Container/LinkContainer.php
index 7bfada4d15..8ecac4deeb 100644
--- a/src/system/SettingsModule/Container/LinkContainer.php
+++ b/src/system/SettingsModule/Container/LinkContainer.php
@@ -24,21 +24,23 @@ class LinkContainer implements LinkContainerInterface
      * @var Translator
      */
     private $translator;
+
     /**
      * @var RouterInterface
      */
     private $router;
+
     /**
      * @var PermissionApi
      */
     private $permissionApi;
 
     /**
-     * constructor.
+     * LinkContainer constructor.
      *
-     * @param $translator
-     * @param RouterInterface $router
-     * @param PermissionApi $permissionApi
+     * @param Translator      $translator    Translator service instance.
+     * @param RouterInterface $router        RouterInterface service instance.
+     * @param PermissionApi   $permissionApi PermissionApi service instance.
      */
     public function __construct($translator, RouterInterface $router, PermissionApi $permissionApi)
     {
diff --git a/src/system/ThemeModule/Container/LinkContainer.php b/src/system/ThemeModule/Container/LinkContainer.php
index 3901104ca3..c3e3a82d30 100644
--- a/src/system/ThemeModule/Container/LinkContainer.php
+++ b/src/system/ThemeModule/Container/LinkContainer.php
@@ -25,25 +25,29 @@ class LinkContainer implements LinkContainerInterface
      * @var Translator
      */
     private $translator;
+
     /**
      * @var RouterInterface
      */
     private $router;
+
     /**
      * @var PermissionApi
      */
     private $permissionApi;
+
     /**
      * @var VariableApi
      */
     private $variableApi;
 
     /**
-     * constructor.
+     * LinkContainer constructor.
      *
-     * @param $translator
-     * @param RouterInterface $router
-     * @param PermissionApi $permissionApi
+     * @param Translator      $translator    Translator service instance.
+     * @param RouterInterface $router        RouterInterface service instance.
+     * @param PermissionApi   $permissionApi PermissionApi service instance.
+     * @param VariableApi     $variableApi   VariableApi service instance.
      */
     public function __construct($translator, RouterInterface $router, PermissionApi $permissionApi, VariableApi $variableApi)
     {

From bbf06b95359334d8fd16fe760ffe628dc9e87f33 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Sat, 23 Apr 2016 20:03:17 +0200
Subject: [PATCH 29/31] minor amendments

---
 .../DependencyInjection/ZikulaBlocksExtension.php      |  2 +-
 .../DependencyInjection/ZikulaExtensionsExtension.php  |  2 +-
 .../DependencyInjection/ZikulaMailerExtension.php      |  2 +-
 .../DependencyInjection/ZikulaSettingsExtension.php    |  2 +-
 .../DependencyInjection/ZikulaThemeExtension.php       | 10 +++++++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php b/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
index 6c3e02c99a..33c3267f23 100644
--- a/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
+++ b/src/system/BlocksModule/DependencyInjection/ZikulaBlocksExtension.php
@@ -10,10 +10,10 @@
 
 namespace Zikula\BlocksModule\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
 
 class ZikulaBlocksExtension extends Extension
 {
diff --git a/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php b/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
index 15be398074..d0ff465676 100644
--- a/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
+++ b/src/system/ExtensionsModule/DependencyInjection/ZikulaExtensionsExtension.php
@@ -10,10 +10,10 @@
 
 namespace Zikula\ExtensionsModule\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
 
 class ZikulaExtensionsExtension extends Extension
 {
diff --git a/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php b/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
index d15fa6bfa2..37578ff1f6 100644
--- a/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
+++ b/src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php
@@ -10,10 +10,10 @@
 
 namespace Zikula\MailerModule\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
 
 class ZikulaMailerExtension extends Extension
 {
diff --git a/src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php b/src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php
index 09c2051a93..5e8e1e8458 100644
--- a/src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php
+++ b/src/system/SettingsModule/DependencyInjection/ZikulaSettingsExtension.php
@@ -13,10 +13,10 @@
 
 namespace Zikula\SettingsModule\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
 
 class ZikulaSettingsExtension extends Extension
 {
diff --git a/src/system/ThemeModule/DependencyInjection/ZikulaThemeExtension.php b/src/system/ThemeModule/DependencyInjection/ZikulaThemeExtension.php
index 1fdc257e73..7a4fb9b00f 100644
--- a/src/system/ThemeModule/DependencyInjection/ZikulaThemeExtension.php
+++ b/src/system/ThemeModule/DependencyInjection/ZikulaThemeExtension.php
@@ -1,11 +1,19 @@
 <?php
+/**
+ * This file is part of the Zikula package.
+ *
+ * Copyright Zikula Foundation - http://zikula.org/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Zikula\ThemeModule\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
 
 class ZikulaThemeExtension extends Extension
 {

From 1ca430efe0466789fdb3d925a6bd86a6cbb45eb5 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Mon, 25 Apr 2016 10:20:52 +0200
Subject: [PATCH 30/31] enhanced changelog entry

---
 CHANGELOG-1.4.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-1.4.md b/CHANGELOG-1.4.md
index b05e2aa3f3..4b39cccd91 100644
--- a/CHANGELOG-1.4.md
+++ b/CHANGELOG-1.4.md
@@ -14,9 +14,14 @@ CHANGELOG - ZIKULA 1.4.x
 
  - Features:
     - Add help text, alert text and input groups to forms utilizing the provided form themes.
+    - Extend mailer-related events (#2849)
+      - MailerEvents::SEND_MESSAGE_START - Occurs when a new message should be sent.
+      - MailerEvents::SEND_MESSAGE_PERFORM - Occurs right before a message is sent.
+      - MailerEvents::SEND_MESSAGE_SUCCESS - Occurs after a message has been sent successfully.
+      - MailerEvents::SEND_MESSAGE_FAILURE - Occurs when a message could not be sent.
 
  - Core-2.0 Features:
-    - MailerModule updated to Core-2.0 Spec.
+    - MailerModule updated to Core-2.0 Spec (#2849).
     - SettingsModule updated to Core-2.0 Spec.
 
  - Vendor updates:

From d6ad7fffa3edd2a3baf8015d30872c6dcfd87452 Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Mon, 25 Apr 2016 13:46:00 +0200
Subject: [PATCH 31/31] use config dumper instead of swift mailer argument

---
 .../Bundle/CoreBundle/Resources/config/services.xml  |  6 ++++--
 src/system/MailerModule/Api/MailerApi.php            | 12 ++++++++++--
 .../MailerModule/Resources/config/services.xml       |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/lib/Zikula/Bundle/CoreBundle/Resources/config/services.xml b/src/lib/Zikula/Bundle/CoreBundle/Resources/config/services.xml
index d025860fb7..5de8b8233f 100644
--- a/src/lib/Zikula/Bundle/CoreBundle/Resources/config/services.xml
+++ b/src/lib/Zikula/Bundle/CoreBundle/Resources/config/services.xml
@@ -10,6 +10,8 @@
         <parameter key="controller_resolver.class">Zikula\Bundle\CoreBundle\Controller\ControllerResolver</parameter>
         <parameter key="zikula_core.controller.main_controller.class">Zikula\Bundle\CoreBundle\Controller\MainController</parameter>
         <parameter key="zikula_core.controller.legacy_controller.class">Zikula\Bundle\CoreBundle\Controller\LegacyController</parameter>
+        <parameter key="zikula.data_collector.class">Zikula\Bundle\CoreBundle\DataCollector\ZikulaVersionDataCollector</parameter>
+        <parameter key="zikula.dynamic_config_dumper.class">Zikula\Bundle\CoreBundle\DynamicConfigDumper</parameter>
         <parameter key="zikula.cache_clearer.class">Zikula\Bundle\CoreBundle\CacheClearer</parameter>
         <parameter key="zikula.link_container_collector.class">Zikula\Core\LinkContainer\LinkContainerCollector</parameter>
     </parameters>
@@ -24,11 +26,11 @@
             <argument type="service" id="zikula_extensions_module.api.variable" />
             <argument type="service" id="zikula_permissions_module.api.permission" />
         </service>
-        <service id="data_collector.zikula_version" class="Zikula\Bundle\CoreBundle\DataCollector\ZikulaVersionDataCollector" public="false">
+        <service id="data_collector.zikula_version" class="%zikula.data_collector.class%" public="false">
             <argument type="service" id="zikula_core.common.theme_engine" />
             <tag name="data_collector" template="CoreBundle:Collector:ZikulaVersion.html.twig" id="zikula_version" priority="300" />
         </service>
-        <service id="zikula.dynamic_config_dumper" class="Zikula\Bundle\CoreBundle\DynamicConfigDumper">
+        <service id="zikula.dynamic_config_dumper" class="%zikula.dynamic_config_dumper.class%">
             <argument type="expression">service('kernel').getRootDir() ~ "/config"</argument>
         </service>
         <service id="zikula.cache_clearer" class="%zikula.cache_clearer.class%">
diff --git a/src/system/MailerModule/Api/MailerApi.php b/src/system/MailerModule/Api/MailerApi.php
index 842575d42b..d0029d6af0 100644
--- a/src/system/MailerModule/Api/MailerApi.php
+++ b/src/system/MailerModule/Api/MailerApi.php
@@ -17,6 +17,7 @@
 use Swift_Mailer;
 use Swift_Message;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Zikula\Bundle\CoreBundle\DynamicConfigDumper;
 use Zikula\Common\Translator\TranslatorInterface;
 use Zikula\Common\Translator\TranslatorTrait;
 use Zikula\Core\Event\GenericEvent;
@@ -65,17 +66,24 @@ class MailerApi
      *
      * @param TranslatorInterface      $translator      Translator service instance.
      * @param EventDispatcherInterface $eventDispatcher EventDispatcher service instance.
-     * @param array                    $mailerParams    SwiftMailer configuration parameters.
+     * @param DynamicConfigDumper      $configDumper    Configuration dumper for retrieving SwiftMailer configuration parameters.
      * @param VariableApi              $variableApi     VariableApi service instance.
      * @param PermissionApi            $permissionApi   PermissionApi service instance.
      */
-    public function __construct(TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, array $mailerParams, VariableApi $variableApi, Swift_Mailer $mailer, PermissionApi $permissionApi)
+    public function __construct(
+        TranslatorInterface $translator,
+        EventDispatcherInterface $eventDispatcher,
+        DynamicConfigDumper $configDumper,
+        VariableApi $variableApi,
+        Swift_Mailer $mailer,
+        PermissionApi $permissionApi)
     {
         $this->setTranslator($translator);
         $this->eventDispatcher = $eventDispatcher;
         $this->mailer = $mailer;
         $this->permissionApi = $permissionApi;
 
+        $mailerParams = $configDumper->getConfiguration('swiftmailer');
         $modVars = $variableApi->getAll('ZikulaMailerModule');
         $this->dataValues = array_merge($mailerParams, $modVars);
     }
diff --git a/src/system/MailerModule/Resources/config/services.xml b/src/system/MailerModule/Resources/config/services.xml
index 719f19d175..c74045b6e8 100644
--- a/src/system/MailerModule/Resources/config/services.xml
+++ b/src/system/MailerModule/Resources/config/services.xml
@@ -25,7 +25,7 @@
         <service id="zikula_mailer_module.api.mailer" class="%zikula_mailer_module.api.mailer.class%">
             <argument type="service" id="translator.default" />
             <argument type="service" id="event_dispatcher" />
-            <argument>%swiftmailer%</argument>
+            <argument type="service" id="zikula.dynamic_config_dumper" />
             <argument type="service" id="zikula_extensions_module.api.variable" />
             <argument type="service" id="mailer" />
             <argument type="service" id="zikula_permissions_module.api.permission" />