diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php
index 9e3394bb4..3257fa26d 100644
--- a/admin/survey/classes/class.Dostop.php
+++ b/admin/survey/classes/class.Dostop.php
@@ -1443,9 +1443,10 @@ class Dostop {
echo 'ok';
}
- public function ajax_confirm_user_email()
- {
+ public function ajax_confirm_user_email(){
global $pass_salt;
+ global $lang;
+ global $app_settings;
$uid = (!empty($_POST['uid']) ? $_POST['uid'] : NULL);
@@ -1463,9 +1464,49 @@ class Dostop {
sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved)
VALUES ('" . $r['type'] . "', '" . $r['email'] . "', '" . $r['name'] . "', '" . $r['surname'] . "', '" . $g . "','" . $r['status'] . "', '" . $r['gdpr_agree'] . "','" . $r['when_reg'] . "', '" . $r['came_from'] . "', '" . $r['lang'] . "', 'Y')");
sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
+
- echo 'ok';
- } else {
+ // Uporabniku posljemo email da je bil njegov racun aktiviran
+ $Content = $lang['confirmed_user_mail'];
+
+ // Podpis
+ $signature = Common::getEmailSignature();
+ $Content .= $signature;
+
+ // Ce gre slucajno za virutalko
+ $Subject = $lang['confirmed_user_mail_subject'];
+
+ $PageName = $app_settings['app_name'];
+ $ZaMail = ''.' '.$Subject.'';
+
+ // Besedilo v lang dilu je potrebno popravit, ker nimamo vec cel kup parametrov
+ $Content = str_replace("SFNAME", $r['name'].' '.$r['surname'], $Content);
+ $Content = str_replace("SFPAGENAME", $PageName, $Content);
+
+ $Subject = str_replace("SFPAGENAME", $PageName, $Subject);
+
+ $ZaMail .= $Content;
+ $ZaMail .= "";
+
+ // Za testiranje brez posiljanja maila
+ if(isDebug()) {
+ echo $ZaMail;
+ die();
+ }
+
+ // Posljemo mail, da je bil racun aktiviran
+ try{
+ $MA = new MailAdapter(null, 'account');
+ $MA->addRecipients($r['email']);
+ $result = $MA->sendMail($ZaMail, $Subject);
+ }
+ catch (Exception $e){
+ echo $e;
+ }
+
+ echo 'ok';
+ }
+ else {
echo 'non';
}
}
diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php
index 5d65302a0..407c56f4f 100644
--- a/frontend/api/class.ApiLogin.php
+++ b/frontend/api/class.ApiLogin.php
@@ -1368,9 +1368,15 @@ class ApiLogin
if(isset($confirm_registration) && $confirm_registration == 1){
global $confirm_registration_admin;
- // Mail posljemo vsem nastavljenim adminom
- foreach($confirm_registration_admin as $admin_email){
- $MA->addRecipients($admin_email);
+ if(is_array($confirm_registration_admin)){
+ // Mail posljemo vsem nastavljenim adminom
+ foreach($confirm_registration_admin as $admin_email){
+ $MA->addRecipients($admin_email);
+ $result = $MA->sendMail($ZaMail, $Subject);
+ }
+ }
+ else{
+ $MA->addRecipients($confirm_registration_admin);
$result = $MA->sendMail($ZaMail, $Subject);
}
}
@@ -1445,19 +1451,19 @@ class ApiLogin
$Content = $lang['confirm_user_content'];
$Subject = $lang['confirm_user_subject'];
- // Ce je ga moramo po registraciji odobriti dobi drugacno sporocilo
- if (isset($confirm_registration) && $confirm_registration == 1){
+ // Ce je ga moramo po registraciji odobriti dobi drugacno sporocilo
+ if (isset($confirm_registration) && $confirm_registration == 1){
$UserContent = $lang['register_user_banned_content'];
}
- else{
+ else{
$UserContent = $lang['register_user_content'];
-
- // Podpis
- $signature = Common::getEmailSignature();
- $UserContent .= $signature;
-
- $UserContent .= $lang['register_user_content_edit'];
}
+
+ // Podpis
+ $signature = Common::getEmailSignature();
+ $UserContent .= $signature;
+
+ $UserContent .= $lang['register_user_content_edit'];
$change = '';
$out = '';
diff --git a/lang/1.php b/lang/1.php
index 212898d70..4c2914c5f 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3313,19 +3313,21 @@ $lang = array (
"has_been_successful" => "je bila uspešna",
"you_can_change_pass_anytime" => "Geslo lahko kadarkoli spremenite v urejanju profila.",
"set_users_email_activate" => "Registracija se potrdi preko emaila",
- "confirm_user_mail_subject" => "Potrditev registracije na spletnem mestu SFPAGENAME",
+ "confirm_user_mail_subject" => "Potrditev registracije na spletnem mestu SFPAGENAME",
"confirm_user_mail_subject_virtual" => "Potrditev registracije na spletnem mestu SFPAGENAME (virtualna domena SFVIRTUALNAME)",
"confirm_user_mail" => "Spoštovani, SFNAME!
Do uspešne registracije na spletnem mestu SFPAGENAME vam manjka le še en korak - da SFACTIVATEINpotrdite svojo registracijo s klikom na to povezavoSFACTIVATEOUT.",
"confirm_user_mail_ignore" => "
V kolikor se s tem e-mail naslovom niste prijavili na spletno mesto SFPAGENAME, enostavno ignorirajte to sporočilo.",
"confirm_user_mail_admin" => "Spoštovani,
Na spletno mesto SFPAGENAME se je registriral nov uporabnik SFNAME (SFMAIL), ki ga je potrebno potrditi. Potrdite ga preko povezave SFACTIVATEINpotrdite registracijo s klikom na to povezavoSFACTIVATEOUT.",
- "add_alternative_email_subject" => "Potrditev dodatnega elektronskega naslova na spletnem mestu #PAGENAME#",
+ "confirmed_user_mail_subject" => "Potrjena registracija na spletnem mestu SFPAGENAME",
+ "confirmed_user_mail" => "Spoštovani, SFNAME!
Registracija na spletnem mestu SFPAGENAME je bila uspešno potrjena. Prijavite se lahko s svojimi podatki, ki ste jih izbrali pri registraciji.",
+ "add_alternative_email_subject" => "Potrditev dodatnega elektronskega naslova na spletnem mestu #PAGENAME#",
"add_alternative_email" => "Spoštovani, #NAME#!
Na spletnem mestu #PAGENAME# ste dodali poleg primarnega elektronskega naslova #PRIMARNIEMAIL#, dodali še dodatni elektronski naslov #ALTERNATIVNIEMAIL#. Geslo za prijavo je enako kot za primarni elektronski naslov.
Omenjeni elektronski naslov aktivirate s klikom na to #CODESTART# povezavo#CODEEND#.
Lep pozdrav,",
- "add_alternative_primary_email_subject" => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
- "add_alternative_primary_email" => "Spoštovani, #NAME#!
Na spletnem mestu #PAGENAME# ste dodali nov elektronsk naslov #ALTERNATIVNIEMAIL#.
+ "add_alternative_primary_email_subject" => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
+ "add_alternative_primary_email" => "Spoštovani, #NAME#!
Na spletnem mestu #PAGENAME# ste dodali nov elektronsk naslov #ALTERNATIVNIEMAIL#.
V kolikor tega niste storili, nas o tem obvestite ali izbrišite elektronski naslov iz vašega profila.
Lep pozdrav,",
- "alternative_email_confirm_error" => "Pri aktivaciji dodatnega elektronskega naslova je prišlo do napake.
Prosimo, kontaktirajte urednika spletnega mesta za pomoč",
- "alternative_email_confirm_success" => "Poslali smo vam elektronsko sporočilo s kodo za aktivacijo omenjenega elektronskega naslova.",
+ "alternative_email_confirm_error" => "Pri aktivaciji dodatnega elektronskega naslova je prišlo do napake.
Prosimo, kontaktirajte urednika spletnega mesta za pomoč",
+ "alternative_email_confirm_success" => "Poslali smo vam elektronsko sporočilo s kodo za aktivacijo omenjenega elektronskega naslova.",
"confirm_user_in_db" => "Potrdi",
"delete_user_in_db" => "Izbriši",
"user_confirm_h" => "Potrditev veljavnosti e-naslova",
@@ -3389,7 +3391,7 @@ $lang = array (
"register_add_user_content" => "
Uspešno ste bili registrirani na SFPAGENAME.
Vaše izbrane nastavitve so naslednje:Ime: SFNAME
Email: SFMAIL
Geslo: SFPASS
",
"register_add_user_content_edit" => "
Sporočilo smo vam poslali na SFMAIL
Za odjavo kliknite SFOUT tukaj SFEND
Za spremembo nastavitev kliknite SFCHANGE tukaj SFEND",
"register_add_user_password" => "Prosimo, če geslo nemudoma spremenite!",
- "register_user_banned_content" => "Pozdravljeni, SFNAME!
Uspešno ste se prijavili na SFPAGENAME.
Ko bo vašo registracijo na SFPAGENAME odobril urednik, boste prejemali obvestila in imeli dostop do internih vsebin.
Vaše izbrane nastavitve so naslednje:Ime: SFNAME
Email: SFMAIL
Geslo: SFPASS
Lep pozdrav,SFPAGENAME
Sporočilo smo vam poslali na SFMAIL
Za odjavo kliknite SFOUT tukaj SFEND
Za spremembo nastavitev kliknite SFCHANGE tukaj SFEND",
+ "register_user_banned_content" => "Pozdravljeni, SFNAME!
Vaša registracija na SFPAGENAME je bila uspešno potrjena s strani urednika.
Vaše izbrane nastavitve so naslednje:Ime: SFNAME
Email: SFMAIL
Geslo: SFPASS
Lep pozdrav,SFPAGENAME
Sporočilo smo vam poslali na SFMAIL
Za odjavo kliknite SFOUT tukaj SFEND
Za spremembo nastavitev kliknite SFCHANGE tukaj SFEND",
"add_new_user_content" => "Na spletnem mestu SFPAGENAME je bil ustvarjen uporabniški račun z vašim elektronskim naslovom. Če menite, da je bil račun ustvarjen po pomoti, se prosimo obrnite na naš center za pomoč uporabnikom (help@1ka.si).
Vaše nastavitve so naslednje:Ime: SFNAME
Email: SFMAIL
Geslo: SFPASS
",
"forum_thread_author_and" => "Sporočila v tej temi lahko vidi le avtor teme in ",
"forum_if_wanna_change_thread_visibility" => "Če želite spremeniti vidnost teme, uredite njeno prvo sporočilo.",
@@ -3401,7 +3403,7 @@ $lang = array (
"srv_info_questions" => "Vprašanj",
"srv_info_questions1" => "Vprašanj",
"srv_info_variables" => "Spremenljivk",
- "srv_info_pages" => "Strani",
+ "srv_info_pages" => "Strani",
"srv_info_answers" => "Odgovorov",
"srv_info_answers_valid" => "Ustreznih",
"srv_info_type" => "Tip ankete",
diff --git a/lang/2.php b/lang/2.php
index e1401672c..218f27f24 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3282,14 +3282,16 @@ $lang = array (
"lp_activate_error" => "Activation was not successful. Please try again. Hint: You don't have to type password- paste it.",
"lp_activate_activation" => "New password activation",
"has_been_successful" => "has been successful",
- "you_can_change_pass_anytime" => "You can change your password at any time in 'edit profile'.",
- "set_users_email_activate" => "Confirm registration through email",
+ "you_can_change_pass_anytime" => "You can change your password at any time in 'edit profile'.",
+ "set_users_email_activate" => "Confirm registration through email",
"confirm_user_mail_subject" => "Confirm your registration to the SFPAGENAME website",
"confirm_user_mail_subject_virtual" => "Confirm your registration to the SFPAGENAME website (virtual domain SFVIRTUALNAME)",
"confirm_user_mail" => "Dear, SFNAME!
You are just one step away from registration on SFPAGENAME - please SFACTIVATEINconfirm your registration by clicking this linkSFACTIVATEOUT.",
"confirm_user_mail_ignore" => "
If you did not register on the 1KA website with this email address, simply ignore this message.",
"confirm_user_mail_admin" => "Dear admin,
New user SFNAME (SFMAIL) has registered to SFPAGENAME. Please SFACTIVATEINconfirm registration by clicking this linkSFACTIVATEOUT.",
- "add_alternative_email_subject" => "Confirm your additional email address on the site #PAGENAME#",
+ "confirmed_user_mail_subject" => "Registration to SFPAGENAME confirmed",
+ "confirmed_user_mail" => "Dear, SFNAME!
Registration to SFPAGENAME was successfully confirmed. You can login with your email and password.",
+ "add_alternative_email_subject" => "Confirm your additional email address on the site #PAGENAME#",
"add_alternative_email" => "Dear, #NAME#!
You added on the site #PAGENAME# in addition to the primary email address #PRIMARNIEMAIL#, adding an additional email address #ALTERNATIVNIEMAIL#. The login password is the same as for the primary email address.
You activate this email address by clicking on this #CODESTART# link #CODEEND#.
Sincerely,",
"add_alternative_primary_email_subject" => "Added new additional email address to the site #PAGENAME#",
@@ -3360,10 +3362,10 @@ $lang = array (
"register_add_user_content" => "
You have been successfully added to SFPAGENAME.
Now you have access to internal content and email notifications.
Your selected login parameters are:
Name: SFNAME
Email: SFMAIL
Password: SFPASS
",
"register_add_user_content_edit" => "
This message was sent to SFMAIL
To unregister, SFOUT click hereSFEND
To change your profile or login data, SFCHANGE click here SFEND",
"register_add_user_password" => "Please change your password as soon as possible!",
- "register_user_banned_content" => "Dear, SFNAME!
You have successfully registered to SFPAGENAME.
When SFPAGENAME administrator confirms your registration, you will have access to internal content and email notifications.
Your selected login parameters are:
Name: SFNAME
Email: SFMAIL
Password: SFPASS
Sincerely,
SFPAGENAME
This message was sent to SFMAIL
To unregister, SFOUT click hereSFEND
To change your profile or login data, SFCHANGE click here SFEND",
+ "register_user_banned_content" => "Dear, SFNAME!
Your registration to SFPAGENAME was successfully confirmed by administrator.
Your selected login parameters are:
Name: SFNAME
Email: SFMAIL
Password: SFPASS
Sincerely,
SFPAGENAME
This message was sent to SFMAIL
To unregister, SFOUT click hereSFEND
To change your profile or login data, SFCHANGE click here SFEND",
"add__new_user_content" => "A user account with your email address has been created on SFPAGENAME. If you believe your account was created by mistake, please contact our Helpdesk (help@1ka.si).
Your selected login parameters are:
Name: SFNAME
Email: SFMAIL
Password: SFPASS
",
- "forum_thread_author_and" => "Posts in this thread can only be seen by thread author and ",
- "forum_if_wanna_change_thread_visibility" => "If you would like to change thread visibility, you can do it by editing the first post.",
+ "forum_thread_author_and" => "Posts in this thread can only be seen by thread author and ",
+ "forum_if_wanna_change_thread_visibility" => "If you would like to change thread visibility, you can do it by editing the first post.",
"forum_this_post_moderators_only" => "This post can only be seen by administrators (moderator comment)",
"srv_bottom_posted" => "Notifications",
"srv_bottom_archive" => "Archive",