From fefef553a9f14bb868c030b55d17c694d58c0ca9 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 5 Jan 2021 10:47:52 +0100 Subject: [PATCH] Popravki emaila, ki ga prejme uporabnik, kateremu manager ustvari racun. --- admin/survey/classes/class.Dostop.php | 13 ++++++++++--- lang/1.php | 9 ++++++--- lang/2.php | 9 ++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php index 395348d75..0976acffe 100644 --- a/admin/survey/classes/class.Dostop.php +++ b/admin/survey/classes/class.Dostop.php @@ -384,7 +384,7 @@ class Dostop { { global $pass_salt; global $lang; - global $global_user_id, $site_path; + global $global_user_id, $site_path, $site_domain; global $admin_type; $error = FALSE; @@ -427,13 +427,20 @@ class Dostop { echo mysqli_error($GLOBALS['connect_db']); } - $subject = $lang['srv_dodanmail_1'] . ''; - $content = sprintf($lang['srv_dodanmail_2'], $MailReply) . '

' . sprintf($lang['srv_dodanmail_3'], $email, $password); + $subject = sprintf($lang['srv_dodanmail_1'], $site_domain); + + $content = sprintf($lang['srv_dodanmail_2'], $MailReply, $site_domain).'

'; + $content .= $lang['srv_dodanmail_3']; + $content .= ''; // Podpis $signature = Common::getEmailSignature(); $content .= $signature; + // Posljemo mail vsakemu uporabniku posebej try { $MA = new MailAdapter($this->anketa, $type='account'); diff --git a/lang/1.php b/lang/1.php index 9ea2c142e..00824a2e0 100644 --- a/lang/1.php +++ b/lang/1.php @@ -5622,9 +5622,12 @@ $lang = array ( "srv_dropdown_select" => 'Izberite', "srv_added_false" => 'Uporabnik s tem e-mail naslovom je že registriran.', "srv_analiza_options" => 'Možnosti', - "srv_dodanmail_1" => 'Registracija 1KA ankete', - "srv_dodanmail_2" => 'Uporabnik %s vam je dodelil dostop do 1KA spletnih anket.', - "srv_dodanmail_3" => 'Prijavite se lahko z vašim e-mail naslovom %s in geslom %s', + "srv_dodanmail_1" => 'Ustvarjen račun na %s (orodje za spletno anketiranje 1KA)', + "srv_dodanmail_2" => 'Uporabnik %s vam je ustvaril račun na orodju za spletno anketiranje 1KA (%s).', + "srv_dodanmail_3" => 'Podatki za prijavo:', + "srv_dodanmail_3_email" => 'Elektronski naslov:', + "srv_dodanmail_3_pass_1" => 'Geslo:', + "srv_dodanmail_3_pass_2" => 'priporočamo, da po prvi prijavi spremenite geslo', "srv_dodanmail_m_1" => 'Pregledni dostop do 1KA anket', "srv_dodanmail_m_2" => 'Administrator %s je na spletni strani %s pridobil dostop do vaših anket (%s).', "srv_dodanmail_m_3" => 'S tem ima dostop in pregled nad vsemi vašimi anketami. Če se s tem ne strinjate, kontaktirajte zgornjega uporabnika ali pa skrbnika spletnega mesta (Pomoč).', diff --git a/lang/2.php b/lang/2.php index becb5947c..91d8e2470 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5517,9 +5517,12 @@ $lang = array ( "srv_dropdown_select" => 'Select', "srv_added_false" => 'User with this e-mail is already registered.', "srv_analiza_options" => 'Options', - "srv_dodanmail_1" => '1KA registration', - "srv_dodanmail_2" => 'User %s has granted you access to 1KA surveys.', - "srv_dodanmail_3" => 'You can login with your e-mail %s and password %s', + "srv_dodanmail_1" => 'Created account on %s (online survey tool 1KA)', + "srv_dodanmail_2" => 'User %s has created you an account on online survey tool 1KA (%s).', + "srv_dodanmail_3" => 'Login data:', + "srv_dodanmail_3_email" => 'Email:', + "srv_dodanmail_3_pass_1" => 'Password:', + "srv_dodanmail_3_pass_2" => 'we recommend you change this password after first login', "srv_dodanmail_m_1" => '1KA view access', "srv_dodanmail_m_2" => 'Administrator %s has gained access to your surveys on %s.', "srv_dodanmail_m_3" => 'He now has access to all of your surveys. If you dissagree with that, you can contact him or system administrator (Help).',