Skip to content

Commit

Permalink
Cookie and Remember me config removed from the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@escopecz
escopecz committed Mar 2, 2017
1 parent ac2e743 commit 686a4f6
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 158 deletions.
113 changes: 0 additions & 113 deletions app/bundles/CoreBundle/Form/Type/ConfigType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,60 +306,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
)->addViewTransformer($arrayLinebreakTransformer)
);

$builder->add(
'rememberme_lifetime',
'text',
[
'label' => 'mautic.core.config.form.rememberme.lifetime',
'label_attr' => ['class' => 'control-label'],
'attr' => [
'class' => 'form-control',
'tooltip' => 'mautic.core.config.form.rememberme.lifetime.tooltip',
],
'constraints' => [
new NotBlank(
[
'message' => 'mautic.core.value.required',
]
),
],
]
);

$builder->add(
'rememberme_path',
'text',
[
'label' => 'mautic.core.config.form.rememberme.path',
'label_attr' => ['class' => 'control-label'],
'attr' => [
'class' => 'form-control',
'tooltip' => 'mautic.core.config.form.rememberme.path.tooltip',
],
'constraints' => [
new NotBlank(
[
'message' => 'mautic.core.value.required',
]
),
],
]
);

$builder->add(
'rememberme_domain',
'text',
[
'label' => 'mautic.core.config.form.rememberme.domain',
'label_attr' => ['class' => 'control-label'],
'attr' => [
'class' => 'form-control',
'tooltip' => 'mautic.core.config.form.rememberme.domain.tooltip',
],
'required' => false,
]
);

$builder->add(
'default_pagelimit',
'choice',
Expand Down Expand Up @@ -623,65 +569,6 @@ function (FormEvent $event) use ($formModifier) {
]
);

$builder->add(
'cookie_path',
'text',
[
'label' => 'mautic.core.config.form.cookie.path',
'label_attr' => ['class' => 'control-label'],
'attr' => [
'class' => 'form-control',
'tooltip' => 'mautic.core.config.form.cookie.path.tooltip',
],
'constraints' => [
new NotBlank(
[
'message' => 'mautic.core.value.required',
]
),
],
]
);

$builder->add(
'cookie_domain',
'text',
[
'label' => 'mautic.core.config.form.cookie.domain',
'label_attr' => ['class' => 'control-label'],
'attr' => [
'class' => 'form-control',
'tooltip' => 'mautic.core.config.form.cookie.domain.tooltip',
],
'required' => false,
]
);

$builder->add(
'cookie_secure',
'yesno_button_group',
[
'label' => 'mautic.core.config.form.cookie.secure',
'empty_value' => 'mautic.core.form.default',
'data' => (array_key_exists('cookie_secure', $options['data'])) ? $options['data']['cookie_secure'] : '',
'attr' => [
'tooltip' => 'mautic.core.config.form.cookie.secure.tooltip',
],
]
);

$builder->add(
'cookie_httponly',
'yesno_button_group',
[
'label' => 'mautic.core.config.form.cookie.httponly',
'data' => (array_key_exists('cookie_httponly', $options['data']) && !empty($options['data']['cookie_httponly'])) ? true : false,
'attr' => [
'tooltip' => 'mautic.core.config.form.cookie.httponly.tooltip',
],
]
);

$builder->add(
'link_shortener_url',
'text',
Expand Down
15 changes: 0 additions & 15 deletions app/bundles/CoreBundle/Translations/en_US/messages.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ mautic.core.config.cors.valid.domains="Valid Domains"
mautic.core.config.cors.valid.domains.tooltip="Enter the domains (http://yourdomain.com), one per line, to which you'd like to restrict incoming CORS requests."
mautic.core.config.form.cache.path="Path to the cache directory"
mautic.core.config.form.cache.path.tooltip="Set the absolute path to the cache directory. %kernel.root_dir% can be used as a placeholder to the app directory in the public web root. It is advised to use a directory outside of the public web root to prevent the cache from being accessible by the public."
mautic.core.config.form.cookie.domain="Cookie domain"
mautic.core.config.form.cookie.domain.tooltip="Determines the domain to set cookies"
mautic.core.config.form.cookie.httponly="Set cookie as http only"
mautic.core.config.form.cookie.httponly.tooltip="Set the cookie as http only (meaning it is only avaiable for http requests)"
mautic.core.config.form.cookie.path="Cookie path"
mautic.core.config.form.cookie.path.tooltip="Determines the path to set cookies"
mautic.core.config.form.cookie.secure="Set cookie as secure"
mautic.core.config.form.cookie.secure.tooltip="Set cookie as https only"
mautic.core.config.form.date.format.dateonly="Default format for date only"
mautic.core.config.form.date.format.dateonly.tooltip="Set the default format for date only. Use PHP's date format (http://php.net/manual/en/function.date.php) to customize. For example, F j, Y will be formatted to December 21, 2014."
mautic.core.config.form.date.format.full="Default format for full dates"
Expand Down Expand Up @@ -108,12 +100,6 @@ mautic.core.config.form.locale="Default language"
mautic.core.config.form.locale.tooltip="Set the site's default language. Users can set their own default language via their profile."
mautic.core.config.form.log.path="Path to the log directory"
mautic.core.config.form.log.path.tooltip="Set the absolute path to the log directory. %kernel.root_dir% can be used as a placeholder to the app directory in the public web root. It is advised to use a directory outside of the public web root to prevent the logs from being accessible by the public."
mautic.core.config.form.rememberme.domain="Remember me cookie domain"
mautic.core.config.form.rememberme.domain.tooltip="Determines the domain to set the remember me cookie"
mautic.core.config.form.rememberme.lifetime="Remember me cookie lifetime"
mautic.core.config.form.rememberme.lifetime.tooltip="Set the lifetime in seconds for the remember me cookie"
mautic.core.config.form.rememberme.path="Remember me cookie path"
mautic.core.config.form.rememberme.path.tooltip="Determines the path to set the remember me cookie"
mautic.core.config.form.site.url="Site URL"
mautic.core.config.form.site.url.tooltip="Set the URL to this site here. This is required for cronjobs to correctly determine absolute URLs when generating links for emails, etc"
mautic.core.config.form.theme="Default theme"
Expand All @@ -131,7 +117,6 @@ mautic.core.config.form.update.stability.tooltip="Set the minimum stability leve
mautic.core.config.form.webroot="Mautic's root URL"
mautic.core.config.form.webroot.dashboard="Mautic's dashboard"
mautic.core.config.form.webroot.tooltip="Choose the page to show when browsing to Mautic's root URL (i.e. http://your-mautic-site.com/). Leave blank to be redirected to Mautic's dashboard."
mautic.core.config.header.cookie="Cookie Settings"
mautic.core.config.header.cors="CORS Settings"
mautic.core.config.header.defaults="System Defaults"
mautic.core.config.header.general="General Settings"
Expand Down
30 changes: 0 additions & 30 deletions app/bundles/CoreBundle/Views/FormTheme/Config/_config_coreconfig_widget.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,36 +57,6 @@
</div>
<?php endif; ?>

<?php // Email specific settings moved to EmailBundle to prevent confusion due to tab names?>

<?php if (count(array_intersect($fieldKeys, ['cookie_path']))): ?>
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title"><?php echo $view['translator']->trans('mautic.core.config.header.cookie'); ?></h3>
</div>
<div class="panel-body">
<div class="row">
<?php echo $view['form']->rowIfExists($fields, 'cookie_path', $template); ?>
<?php echo $view['form']->rowIfExists($fields, 'cookie_domain', $template); ?>
</div>

<div class="row">
<?php echo $view['form']->rowIfExists($fields, 'cookie_secure', $template); ?>
<?php echo $view['form']->rowIfExists($fields, 'cookie_httponly', $template); ?>
</div>

<div class="row">
<?php echo $view['form']->rowIfExists($fields, 'rememberme_lifetime', $template); ?>
</div>

<div class="row">
<?php echo $view['form']->rowIfExists($fields, 'rememberme_path', $template); ?>
<?php echo $view['form']->rowIfExists($fields, 'rememberme_domain', $template); ?>
</div>
</div>
</div>
<?php endif; ?>

<?php if (count(array_intersect($fieldKeys, ['cors_restrict_domains']))): ?>
<div class="panel panel-primary">
<div class="panel-heading">
Expand Down

0 comments on commit 686a4f6

Please sign in to comment.