Mailer: Fix tpls

4 years ago · 930ebbbff1
parent 74130e5df4
commit 930ebbbff1
14 changed files with 23 additions and 30 deletions
--- a/public/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@ -7119,8 +7119,8 @@ function api_mail_html(
        }

        $message
-            ->htmlTemplate('ChamiloCoreBundle:Mailer:Default/default.html.twig')
-            ->textTemplate('ChamiloCoreBundle:Mailer:Default/default.text.twig')
+            ->htmlTemplate('@ChamiloCore/Mailer/Default/default.html.twig')
+            ->textTemplate('@ChamiloCore/Mailer/Default/default.text.twig')
        ;
        $message->context($params);
        Container::getMailer()->send($message);
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@ -1164,8 +1164,7 @@ class UserManager
            $tplContent->assign('original_password', $originalPassword);
            $tplContent->assign('portal_url', $url);

-            $layoutContent = $tplContent->get_template('mail/user_edit_content.tpl');
-            $emailBody = $tplContent->fetch($layoutContent);
+            $emailBody = $tplContent->fetch('@ChamiloCore/Mailer/Legacy/user_edit_content.html.twig');

            $mailTemplateManager = new MailTemplateManager();

@ -1195,14 +1194,6 @@ class UserManager
            );
        }

-        $cacheAvailable = api_get_configuration_value('apc');
-        if (true === $cacheAvailable) {
-            $apcVar = api_get_configuration_value('apc_prefix').'userinfo_'.$user_id;
-            if (apcu_exists($apcVar)) {
-                apcu_delete($apcVar);
-            }
-        }
-
        return $user->getId();
    }

--- a/src/CoreBundle/Resources/views/Mailer/Default/default.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Default/default.html.twig
@ -2,7 +2,9 @@
 <html>
 <head>
    <meta charset="UTF-8">
-    <title>{{ _s.institution }}</title>
+    <title>
+        {{ 'platform.site_name' | api_get_setting }}
+    </title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <script type="application/ld+json">
        {
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/_admin_signature_footer.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/_admin_signature_footer.html.twig
@ -1,6 +1,6 @@
 <p>{{ 'Sincerely'|trans }}</p>
 <p>{{ 'admin.administrator_name' | api_get_setting }} {{ 'admin.administrator_surname' | api_get_setting }}<br />
-    {{ 'Manager'|trans }} {{ 'site_name' | api_get_setting }}<br />
+    {{ 'Manager'|trans }} {{ 'platform.site_name' | api_get_setting }}<br />

    {% if 'admin.administrator_phone' | api_get_setting %}
        {{ 'T. ' ~ 'admin.administrator_phone' | api_get_setting }}<br />
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/content_registration_platform.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/content_registration_platform.html.twig
@ -1,9 +1,9 @@
 <p>{{ 'Dear'|trans }} {{ complete_name }},</p>
-<p>{{ 'You are registered to'|trans }} {{ 'site_name' | api_get_setting }} {{ 'with the following settings:'|trans }}</p>
+<p>{{ 'You are registered to'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'with the following settings:'|trans }}</p>
 <p>{{ 'Username'|trans }} : {{ login_name }}<br>
    {{ 'Pass'|trans }} : {{ original_password }}</p>
-<p>{{ 'Thanks for registering to %s.'|trans|format('site_name' | api_get_setting) }}</p>
-<p>{{ 'Address'|trans }} {{ 'site_name' | api_get_setting }} {{ 'is'|trans }} : {{ mailWebPath }}</p>
+<p>{{ 'Thanks for registering to %s.'|trans|format('platform.site_name' | api_get_setting) }}</p>
+<p>{{ 'Address'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'is'|trans }} : {{ mailWebPath }}</p>
 <p>{{ 'In case of trouble, contact us.'|trans }}</p>

 {% include '@ChamiloCore/Mailer/Legacy/_admin_signature_footer.html.twig' %}
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/content_subscription_to_session_confirmation.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/content_subscription_to_session_confirmation.html.twig
@ -1,5 +1,5 @@
 <p>{{ 'Dear'|trans }} {{ complete_name }},</p>
 <p>{{ 'YouAreRegisterToSessionX'|trans|format(session_name) }}</p>
-<p>{{ 'Address'|trans }}  {{ _s.site_name }} {{ 'Is'|trans }} : {{ _p.web }}</p>
+<p>{{ 'Address'|trans }}  {{ 'platform.site_name' | api_get_setting }} {{ 'Is'|trans }} : {{ _p.web }}</p>
 <p>{{ 'Problem'|trans }}</p>
 {% include '@ChamiloCore/Mailer/Legacy/_admin_signature_footer.html.twig' %}
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/mail.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/mail.html.twig
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>{{ _s.institution }}</title>
+    <title>{{ 'platform.institution' | api_get_setting }}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <script type="application/ld+json">
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/new_user_first_email_confirmation.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/new_user_first_email_confirmation.html.twig
@ -1,8 +1,8 @@
 <p>{{ 'Dear'|trans }} {{ complete_name }},</p>
-<p>{{ 'YouAreReg'|trans }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|trans }}</p>
+<p>{{ 'YouAreReg'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'WithTheFollowingSettings'|trans }}</p>
 <p>{{ 'Username'|trans }} : {{ login_name }}<br>
 <p>{{ 'YouWillReceivedASecondEmail'|trans }}</p>
-<p>{{ 'Address'|trans }} {{ _s.site_name }} {{ 'Is'|trans }} : {{ mailWebPath }}</p>
+<p>{{ 'Address'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'Is'|trans }} : {{ mailWebPath }}</p>
 <p>{{ 'Problem'|trans }}</p>

 {% include '@ChamiloCore/Mailer/Legacy/_admin_signature_footer.html.twig' %}
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/new_user_second_email_confirmation.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/new_user_second_email_confirmation.html.twig
@ -1,5 +1,5 @@
 <p>{{ 'Dear'|trans }} {{ complete_name }},</p>
-<p>{{ 'YouAreReg'|trans }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|trans }}</p>
+<p>{{ 'YouAreReg'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'WithTheFollowingSettings'|trans }}</p>
    {{ 'Pass'|trans }} : {{ original_password }}</p>
 <p>{{ 'YouReceivedAnEmailWithTheUsername'|trans }}</p>
 <p>{{ 'ThanksForRegisteringToSite'|trans|format(_s.site_name) }}</p>
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/subject_registration_platform.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/subject_registration_platform.html.twig
@ -1 +1 @@
-{{ '['~ 'site_name' | api_get_setting ~ '] ' ~ 'YourReg'|trans ~ ' ' ~ 'site_name' | api_get_setting }}
+{{ '['~ 'platform.site_name' | api_get_setting ~ '] ' ~ 'YourReg'|trans ~ ' ' ~ 'platform.site_name' | api_get_setting }}
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/subject_subscription_to_session_confirmation.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/subject_subscription_to_session_confirmation.html.twig
@ -1 +1 @@
-{{ '[' ~ _s.site_name ~ '] ' ~ 'YourReg'|trans ~ ' ' ~ _s.site_name }}
+[ {{ 'platform.site_name' | api_get_setting }} ] {{ 'YourReg'|trans  }}  {{ 'platform.site_name' | api_get_setting }}
--- a/src/CoreBundle/Resources/views/Mailer/Legacy/user_edit_content.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Legacy/user_edit_content.html.twig
@ -1,9 +1,9 @@
 <p>{{ 'Dear'|trans }} {{ complete_name }},</p>
-<p>{{ 'You are registered to'|trans }} {{ _s.site_name }} {{ 'with the following settings:'|trans }}</p>
+<p>{{ 'You are registered to'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'with the following settings:'|trans }}</p>
 <p>{{ 'Username'|trans }} : {{ login_name }}<br>
 {% if original_password != '' %}
 {{ 'Password'|trans }} : {{ original_password }}</p>
 {% endif %}
-<p>{{ 'Address'|trans }} {{ _s.site_name }} {{ 'is'|trans }} : {{ portal_url }}</p>
+<p>{{ 'Address'|trans }} {{ 'platform.site_name' | api_get_setting }} {{ 'is'|trans }} : {{ portal_url }}</p>
 <p>{{ 'In case of trouble, contact us.'|trans }}</p>
 {% include '@ChamiloCore/Mailer/Legacy/_admin_signature_footer.html.twig' %}
--- a/src/CoreBundle/Resources/views/reset_password/check_email.html.twig
+++ b/src/CoreBundle/Resources/views/reset_password/check_email.html.twig
@ -1,8 +1,8 @@
-{% extends 'base.html.twig' %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}

 {% block title %}Password Reset Email Sent{% endblock %}

-{% block body %}
+{% block content %}
    <p>
        If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.
        This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
--- a/src/CoreBundle/Resources/views/reset_password/request.html.twig
+++ b/src/CoreBundle/Resources/views/reset_password/request.html.twig
@ -1,8 +1,8 @@
-{% extends 'base.html.twig' %}
+{% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %}

 {% block title %}Reset your password{% endblock %}

-{% block body %}
+{% block content %}
    {% for flashError in app.flashes('reset_password_error') %}
        <div class="alert alert-danger" role="alert">{{ flashError }}</div>
    {% endfor %}