Minor - remove unused setting activate_email_template #2329

pull/2715/head
Julio 7 years ago
parent 9b683a90f2
commit ffeef707d3
  1. 7
      main/admin/index.php
  2. 9
      src/CoreBundle/Controller/Admin/AdminController.php
  3. 2
      src/CoreBundle/Migrations/Schema/V200/Version20.php
  4. 3
      src/CoreBundle/Settings/MailSettingsSchema.php
  5. 2
      src/SettingsBundle/Manager/SettingsManager.php

@ -258,13 +258,6 @@ if (api_is_platform_admin()) {
];
}
/* Event settings */
if (api_get_setting('activate_email_template') == 'true') {
// @deprecated to be removed in 2.x
$items[] = ['url' => 'event_controller.php?action=listing', 'label' => get_lang('EventMessageManagement')];
}
$items[] = ['url' => 'extra_field_list.php', 'label' => get_lang('ExtraFields')];
if (!empty($_configuration['multiple_access_urls'])) {

@ -284,15 +284,6 @@ class AdminController extends BaseController
'label' => get_lang('Reports'),
];
/* Event settings */
if (api_get_setting('mail.activate_email_template') == 'true') {
$items[] = [
'url' => $adminUrl.'event_controller.php?action=listing',
'label' => get_lang('EventMessageManagement'),
];
}
if (api_get_multiple_access_url()) {
if (api_is_global_platform_admin()) {
$items[] = [

@ -342,7 +342,6 @@ class Version20 extends AbstractMigrationChamilo
'allow_hr_skills_management' => 'skill',
'accessibility_font_resize' => 'display',
'account_valid_duration' => 'profile',
'activate_email_template' => 'mail',
'allow_global_chat' => 'chat',
'allow_lostpassword' => 'registration',
'allow_registration' => 'registration',
@ -456,6 +455,7 @@ class Version20 extends AbstractMigrationChamilo
'sso_authentication_unauth_uri',
'sso_authentication_protocol',
'sso_force_redirect',
'activate_email_template'
];
foreach ($settings as $setting) {

@ -23,7 +23,6 @@ class MailSettingsSchema extends AbstractSettingsSchema
->setDefaults(
[
'noreply_email_address' => 'no_reply@example.com',
'activate_email_template' => 'false',
]
)
;
@ -37,6 +36,6 @@ class MailSettingsSchema extends AbstractSettingsSchema
{
$builder
->add('noreply_email_address', 'email')
->add('activate_email_template', YesNoType::class);
;
}
}

@ -329,7 +329,6 @@ class SettingsManager implements SettingsManagerInterface
'allow_skills_tool' => 'Platform',
'allow_public_certificates' => 'Course',
'platform_unsubscribe_allowed' => 'Platform',
'activate_email_template' => 'Platform',
'enable_iframe_inclusion' => 'Editor',
'show_hot_courses' => 'Platform',
'enable_webcam_clip' => 'Tools',
@ -496,7 +495,6 @@ class SettingsManager implements SettingsManagerInterface
'allow_hr_skills_management' => 'skill',
'accessibility_font_resize' => 'display',
'account_valid_duration' => 'profile',
'activate_email_template' => 'mail',
'allow_global_chat' => 'chat',
'allow_lostpassword' => 'registration',
'allow_registration' => 'registration',

Loading…
Cancel
Save