forked from mautic/mautic
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added configuring how email will be sent from mautic to the installer…
… and updated UI some
- Loading branch information
Alan Hartless
authored and
Alan Hartless
committed
Nov 28, 2014
1 parent
4e6286a
commit dd14504
Showing
26 changed files
with
984 additions
and
252 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
| 'mailer_from_email' => '[email protected]', | ||
| 'mailer_transport' => 'mail', | ||
| 'mailer_host' => '', | ||
| 'mailer_port' => null, | ||
| 'mailer_user' => null, | ||
| 'mailer_password' => null, | ||
| 'mailer_encryption' => null, //tls or ssl, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
app/bundles/CoreBundle/Swiftmailer/Transport/PostmarkTransport.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?php | ||
| /** | ||
| * @package Mautic | ||
| * @copyright 2014 Mautic Contributors. All rights reserved. | ||
| * @author Mautic | ||
| * @link http://mautic.org | ||
| * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html | ||
| */ | ||
|
|
||
| namespace Mautic\CoreBundle\Swiftmailer\Transport; | ||
|
|
||
| /** | ||
| * Class PostmarkTransport | ||
| */ | ||
| class PostmarkTransport extends \Swift_SmtpTransport | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function __construct($host = 'localhost', $port = 25, $security = null) | ||
| { | ||
| parent::__construct('smtp.postmarkapp.com', 587, 'tls'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
189 changes: 189 additions & 0 deletions
189
app/bundles/InstallBundle/Configurator/Form/EmailStepType.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| <?php | ||
| /** | ||
| * @package Mautic | ||
| * @copyright 2014 Mautic Contributors. All rights reserved. | ||
| * @author Mautic | ||
| * @link http://mautic.org | ||
| * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html | ||
| */ | ||
|
|
||
| namespace Mautic\InstallBundle\Configurator\Form; | ||
|
|
||
| use Symfony\Component\Form\AbstractType; | ||
| use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList; | ||
| use Symfony\Component\Form\FormBuilderInterface; | ||
|
|
||
| /** | ||
| * Email Form Type. | ||
| */ | ||
| class EmailStepType extends AbstractType | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function buildForm(FormBuilderInterface $builder, array $options) | ||
| { | ||
| $builder->add('mailer_from_name', 'text', array( | ||
| 'label' => false, | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control', | ||
| 'placeholder' => 'mautic.install.form.email.from_name' | ||
| ), | ||
| 'required' => true | ||
| )); | ||
|
|
||
| $builder->add('mailer_from_email', 'email', array( | ||
| 'label' => false, | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control', | ||
| 'preaddon' => 'fa fa-envelope', | ||
| 'placeholder' => 'mautic.install.form.email.from_address', | ||
| ), | ||
| 'required' => true | ||
| )); | ||
|
|
||
| $builder->add('mailer_transport', 'choice', array( | ||
| 'choices' => array( | ||
| 'mail' => 'mautic.core.config.mailer_transport.mail', | ||
| 'mautic.transport.mandrill' => 'mautic.core.config.mailer_transport.mandrill', | ||
| 'mautic.transport.sendgrid' => 'mautic.core.config.mailer_transport.sendgrid', | ||
| 'mautic.transport.amazon' => 'mautic.core.config.mailer_transport.amazon', | ||
| 'mautic.transport.postmark' => 'mautic.core.config.mailer_transport.postmark', | ||
| 'gmail' => 'mautic.core.config.mailer_transport.gmail', | ||
| 'smtp' => 'mautic.core.config.mailer_transport.smtp', | ||
| 'sendmail' => 'mautic.core.config.mailer_transport.sendmail' | ||
| ), | ||
| 'label' => 'mautic.install.form.email.transport', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'empty_value' => false, | ||
| 'attr' => array( | ||
| 'class' => 'form-control', | ||
| 'tooltip' => 'mautic.install.form.email.transport_descr', | ||
| 'onchange' => 'MauticInstaller.toggleTransportDetails(this.value);' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_host', 'text', array( | ||
| 'label' => 'mautic.install.form.email.mailer_host', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_port', 'text', array( | ||
| 'label' => 'mautic.install.form.email.mailer_port', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_user', 'text', array( | ||
| 'label' => 'mautic.install.form.email.mailer_user', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_password', 'password', array( | ||
| 'label' => 'mautic.install.form.email.mailer_password', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control', | ||
| 'preaddon' => 'fa fa-lock' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_encryption', 'button_group', array( | ||
| 'choice_list' => new ChoiceList( | ||
| array('tls', 'ssl'), | ||
| array('mautic.install.form.email.encryption_tls', 'mautic.install.form.email.encryption_ssl') | ||
| ), | ||
| 'label' => 'mautic.install.form.email.encryption', | ||
| 'expanded' => true, | ||
| 'empty_value' => 'mautic.install.form.none' | ||
| )); | ||
|
|
||
| $builder->add('mailer_auth_mode', 'choice', array( | ||
| 'choice_list' => new ChoiceList( | ||
| array( | ||
| 'plain', | ||
| 'login', | ||
| 'cram-md5' | ||
| ), | ||
| array( | ||
| 'mautic.install.form.email.auth_mode_plain', | ||
| 'mautic.install.form.email.auth_mode_login', | ||
| 'mautic.install.form.email.auth_mode_cram-md5' | ||
| ) | ||
| ), | ||
| 'label' => 'mautic.install.form.email.auth_mode', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'empty_value' => 'mautic.install.form.none', | ||
| 'attr' => array( | ||
| 'class' => 'form-control', | ||
| 'onchange' => 'MauticInstaller.toggleAuthDetails(this.value);' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_spool_type', 'button_group', array( | ||
| 'choice_list' => new ChoiceList( | ||
| array('memory', 'file'), | ||
| array( | ||
| 'mautic.install.form.email.spool_memory', | ||
| 'mautic.install.form.email.spool_file' | ||
| ) | ||
| ), | ||
| 'label' => 'mautic.install.form.email.spool_type', | ||
| 'expanded' => true, | ||
| 'empty_value' => false, | ||
| 'attr' => array( | ||
| 'onchange' => 'MauticInstaller.toggleSpoolQueue();' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('mailer_spool_path', 'text', array( | ||
| 'label' => 'mautic.install.form.email.spool_path', | ||
| 'label_attr' => array('class' => 'control-label'), | ||
| 'attr' => array( | ||
| 'class' => 'form-control', | ||
| 'tooltip' => 'mautic.install.form.email.spool_path_descr' | ||
| ) | ||
| )); | ||
|
|
||
| $builder->add('buttons', 'form_buttons', array( | ||
| 'pre_extra_buttons' => array( | ||
| array( | ||
| 'name' => 'next', | ||
| 'label' => 'mautic.install.next.step', | ||
| 'type' => 'submit', | ||
| 'attr' => array( | ||
| 'class' => 'btn btn-success pull-right btn-next', | ||
| 'icon' => 'fa fa-arrow-circle-right', | ||
| 'onclick' => 'MauticInstaller.showWaitMessage(event);' | ||
| ) | ||
| ) | ||
| ), | ||
| 'apply_text' => '', | ||
| 'save_text' => '', | ||
| 'cancel_text' => '' | ||
| )); | ||
|
|
||
|
|
||
| if (!empty($options['action'])) { | ||
| $builder->setAction($options['action']); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getName() | ||
| { | ||
| return 'install_email_step'; | ||
| } | ||
| } |
Oops, something went wrong.