From 6010ecd34e3e95cd109dd2f09f8346a402ede6b2 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 5 Aug 2015 15:50:51 -0500 Subject: [PATCH] Minor - Code conventions - refs BT#9896 #TMI --- main/inc/lib/sessionmanager.lib.php | 68 ++++++++++--------- main/inc/lib/usermanager.lib.php | 18 ++--- .../mail/content_registration_platform.tpl | 22 +++--- ...t_subscription_to_session_confirmation.tpl | 19 +++--- .../mail/subject_registration_platform.tpl | 2 +- ...t_subscription_to_session_confirmation.tpl | 2 +- 6 files changed, 64 insertions(+), 67 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index baf3424298..ea5e63d132 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -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 + ); } } } diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 629f4c51eb..178b3882e3 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -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); diff --git a/main/template/default/mail/content_registration_platform.tpl b/main/template/default/mail/content_registration_platform.tpl index 41424b5538..23ecfab7bb 100644 --- a/main/template/default/mail/content_registration_platform.tpl +++ b/main/template/default/mail/content_registration_platform.tpl @@ -1,14 +1,14 @@ -{{ 'Dear' | get_lang}} {{ mailCompleteName }}, +{{ 'Dear'|get_lang }} {{ complete_name }},
-{{ 'YouAreReg' | get_lang }} {{ mailSiteName }} {{ 'WithTheFollowingSettings' | get_lang }}
-{{ 'Username' | get_lang }} : {{ mailLoginName }} -{{ 'Pass' | get_lang }} : {{ mailOriginalPassword }} +{{ 'YouAreReg'|get_lang }} {{ _s.site_name }} {{ 'WithTheFollowingSettings'|get_lang }}
+{{ 'Username'|get_lang }} : {{ login_name }} +{{ 'Pass'|get_lang }} : {{ original_password }}

-{{ 'Address' | get_lang}} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}
-{{ 'Problem' | get_lang}}
-{{ 'SignatureFormula' | get_lang }}
-{{ mailAdministratorName }}, {{ mailAdministratorSurname }} -{{ 'Manager' | get_lang }} {{ mailSiteName }} -T. {{ mailAdministratorTelephone}} +{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ mailWebPath }}
+{{ 'Problem'|get_lang }}
+{{ 'SignatureFormula'|get_lang }}
+{{ _admin.name }}, {{ _admin.surname }} +{{ 'Manager'|get_lang }} {{ _s.site_name }} +T. {{ _admin.telephone}}
-{{ 'Email' | get_lang }} : {{ emailAdministrator }} \ No newline at end of file +{{ 'Email'|get_lang }} : {{ _admin.email }} diff --git a/main/template/default/mail/content_subscription_to_session_confirmation.tpl b/main/template/default/mail/content_subscription_to_session_confirmation.tpl index 7726b1e1b2..069480b2d2 100644 --- a/main/template/default/mail/content_subscription_to_session_confirmation.tpl +++ b/main/template/default/mail/content_subscription_to_session_confirmation.tpl @@ -1,12 +1,13 @@ -{{ 'Dear' | get_lang}} {{ mailCompleteName }}, +{{ 'Dear'|get_lang }} {{ complete_name }},
-{{ 'YouAreRegisterToSessionX' | get_lang | format(mailSessionName)}} +{{ 'YouAreRegisterToSessionX'|get_lang|format(session_name) }}
-{{ 'Address' | get_lang }} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}
-{{ 'Problem' | get_lang}}
-{{ 'SignatureFormula' | get_lang }}
-{{ mailAdministratorName }} {{ mailAdministratorSurname }} -{{ 'Manager' | get_lang }} {{ mailSiteName }} -T. {{ mailAdministratorTelephone}} +{{ 'Address'|get_lang }} {{ _s.site_name }} {{ 'Is'|get_lang }} : {{ _p.web }}
-{{ 'Email' | get_lang }} : {{ emailAdministrator }} \ No newline at end of file +{{ 'Problem'|get_lang}}
+{{ 'SignatureFormula'|get_lang }}
+{{ _admin.name }} {{ _admin.surname }} +{{ 'Manager'|get_lang }} {{ _s.site_name }} +T. {{ _admin.telephone }} +
+{{ 'Email'|get_lang }} : {{ _admin.email }} diff --git a/main/template/default/mail/subject_registration_platform.tpl b/main/template/default/mail/subject_registration_platform.tpl index 46a6fc426c..6cb4d82c62 100644 --- a/main/template/default/mail/subject_registration_platform.tpl +++ b/main/template/default/mail/subject_registration_platform.tpl @@ -1 +1 @@ -{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}} \ No newline at end of file +{{ _s.site_name ~ 'YourReg'|get_lang ~ _s.site_name }} diff --git a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl index 46a6fc426c..74e691c734 100644 --- a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl +++ b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl @@ -1 +1 @@ -{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}} \ No newline at end of file +{{ _s.site_name ~ 'YoureReg'|get_lang ~ _s.site_name }}