chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Code conventions - refs BT#9896 #TMI

Browse Source
1.10.x
Angel Fernando Quiroz Campos 11 years ago
parent f0972543a9
commit 6010ecd34e
6 changed files with 64 additions and 67 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 68
      main/inc/lib/sessionmanager.lib.php
  2. 18
      main/inc/lib/usermanager.lib.php
  3. 22
      main/template/default/mail/content_registration_platform.tpl
  4. 19
      main/template/default/mail/content_subscription_to_session_confirmation.tpl
  5. 2
      main/template/default/mail/subject_registration_platform.tpl
  6. 2
      main/template/default/mail/subject_subscription_to_session_confirmation.tpl

68
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -1568,40 +1568,42 @@ class SessionManager
// Sending emails only
if (is_array($user_list) && count($user_list) > 0) {
foreach ($user_list as $user_id) {
if (!in_array($user_id, $existingUsers)) {
$tplSubject = new Template(null, false, false, false, false, false);
$tplSubject->assign('mailSiteName', api_get_setting('siteName'));
$layoutSubject = $tplSubject->get_template('mail/subject_subscription_to_session_confirmation.tpl');
$subject = $tplSubject->fetch($layoutSubject);
$user_info = api_get_user_info($user_id);
$tplContent = new Template(null, false, false, false, false, false);
// Variables for default template
$tplContent->assign('mailCompleteName', stripslashes($user_info['complete_name']));
$tplContent->assign('mailSessionName', $session_name);
$tplContent->assign('mailSiteName', api_get_setting('siteName'));
$tplContent->assign('mailWebPath', api_get_path(WEB_PATH));
$tplContent->assign('mailAdministratorName', api_get_setting('administratorName'));
$tplContent->assign('mailAdministratorSurname', api_get_setting('administratorSurname'));
$tplContent->assign('mailAdministratorTelephone', api_get_setting('administratorTelephone'));
$tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator'));
$layoutContent = $tplContent->get_template('mail/content_subscription_to_session_confirmation.tpl');
$content = $tplContent->fetch($layoutContent);
MessageManager::send_message(
$user_id,
$subject,
$content,
array(),
array(),
null,
null,
null,
null,
null
);
if (in_array($user_id, $existingUsers)) {
continue;
}
$tplSubject = new Template(null, false, false, false, false, false);
$layoutSubject = $tplSubject->get_template(
'mail/subject_subscription_to_session_confirmation.tpl'
);
$subject = $tplSubject->fetch($layoutSubject);
$user_info = api_get_user_info($user_id);
$tplContent = new Template(null, false, false, false, false, false);
// Variables for default template
$tplContent->assign(
'complete_name',
stripslashes($user_info['complete_name'])
);
$tplContent->assign('session_name', $session_name);
$layoutContent = $tplContent->get_template(
'mail/content_subscription_to_session_confirmation.tpl'
);
$content = $tplContent->fetch($layoutContent);
MessageManager::send_message(
$user_id,
$subject,
$content,
array(),
array(),
null,
null,
null,
null,
null
);
}
}
}

18
main/inc/lib/usermanager.lib.php
Unescape View File

@ -364,8 +364,9 @@ class UserManager
if (!empty($email) && $send_mail) {
$recipient_name = api_get_person_name($firstName, $lastName, null, PERSON_NAME_EMAIL_ADDRESS);
$tplSubject = new Template(null, false, false, false, false, false);
$tplSubject->assign('mailSiteName', api_get_setting('siteName'));
$layoutSubject = $tplSubject->get_template('mail/subject_registration_platform.tpl');
$layoutSubject = $tplSubject->get_template(
'mail/subject_registration_platform.tpl'
);
$emailSubject = $tplSubject->fetch($layoutSubject);
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
@ -380,17 +381,10 @@ class UserManager
}
$tplContent = new Template(null, false, false, false, false, false);
// variables for the default template
$tplContent->assign('mailCompleteName', stripslashes(api_get_person_name($firstName, $lastName)));
$tplContent->assign('mailSiteName', api_get_setting('siteName'));
$tplContent->assign('mailLoginName', $loginName);
$tplContent->assign('mailOriginalPassword', stripslashes($original_password));
$tplContent->assign('complete_name', stripslashes(api_get_person_name($firstName, $lastName)));
$tplContent->assign('login_name', $loginName);
$tplContent->assign('original_password', stripslashes($original_password));
$tplContent->assign('mailWebPath', $url);
$tplContent->assign('mailAdministratorName', api_get_setting('administratorName'));
$tplContent->assign('mailAdministratorSurname', api_get_setting('administratorSurname'));
$tplContent->assign('mailAdministratorTelephone', api_get_setting('administratorTelephone'));
$tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator'));
// variables for others templates
$tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator'));
$layoutContent = $tplContent->get_template('mail/content_registration_platform.tpl');
$emailBody = $tplContent->fetch($layoutContent);

22
main/template/default/mail/content_registration_platform.tpl
Unescape View File

@ -1,14 +1,14 @@
{{ 'Dear' | get_lang}} {{ mailCompleteName }},
{{ 'Dear'|get_lang }} {{ complete_name }},
</br>
{{ 'YouAreReg' | get_lang }} {{ mailSiteName }} {{ 'WithTheFollowingSettings' | get_lang }}</br>
{{ 'Username' | get_lang }} : {{ mailLoginName }}
{{ 'Pass' | get_lang }} : {{ mailOriginalPassword }}
{{ 'YouAreReg'|get_lang }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|get_lang }}</br>
{{ 'Username'|get_lang }} : {{ login_name }}
{{ 'Pass'|get_lang }} : {{ original_password }}
</br></br>
{{ 'Address' | get_lang}} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}</br>
{{ 'Problem' | get_lang}}</br>
{{ 'SignatureFormula' | get_lang }}</br>
{{ mailAdministratorName }}, {{ mailAdministratorSurname }}
{{ 'Manager' | get_lang }} {{ mailSiteName }}
T. {{ mailAdministratorTelephone}}
{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ mailWebPath }}</br>
{{ 'Problem'|get_lang }}</br>
{{ 'SignatureFormula'|get_lang }}</br>
{{ _admin.name }}, {{ _admin.surname }}
{{ 'Manager'|get_lang }} {{ _s.site_name }}
T. {{ _admin.telephone}}
</br>
{{ 'Email' | get_lang }} : {{ emailAdministrator }}
{{ 'Email'|get_lang }} : {{ _admin.email }}

19
main/template/default/mail/content_subscription_to_session_confirmation.tpl
Unescape View File

@ -1,12 +1,13 @@
{{ 'Dear' | get_lang}} {{ mailCompleteName }},
{{ 'Dear'|get_lang }} {{ complete_name }},
</br>
{{ 'YouAreRegisterToSessionX' | get_lang | format(mailSessionName)}}
{{ 'YouAreRegisterToSessionX'|get_lang|format(session_name) }}
</br>
{{ 'Address' | get_lang }} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}</br>
{{ 'Problem' | get_lang}}</br>
{{ 'SignatureFormula' | get_lang }}</br>
{{ mailAdministratorName }} {{ mailAdministratorSurname }}
{{ 'Manager' | get_lang }} {{ mailSiteName }}
T. {{ mailAdministratorTelephone}}
{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ _p.web }}
</br>
{{ 'Email' | get_lang }} : {{ emailAdministrator }}
{{ 'Problem'|get_lang}}</br>
{{ 'SignatureFormula'|get_lang }}</br>
{{ _admin.name }} {{ _admin.surname }}
{{ 'Manager'|get_lang }} {{ _s.site_name }}
T. {{ _admin.telephone }}
</br>
{{ 'Email'|get_lang }} : {{ _admin.email }}

2
main/template/default/mail/subject_registration_platform.tpl
Unescape View File

@ -1 +1 @@
{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}}
{{ _s.site_name ~ 'YourReg'|get_lang ~ _s.site_name }}

2
main/template/default/mail/subject_subscription_to_session_confirmation.tpl
Unescape View File

@ -1 +1 @@
{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}}
{{ _s.site_name ~ 'YoureReg'|get_lang ~ _s.site_name }}

Write Preview
Loading…
Cancel
Save