Popravki emailov ce mora admin potrditi registracijo.
This commit is contained in:
pero1203
parent
c88ed8452c
commit
483730305b
@ -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);
|
||||
|
||||
@ -1464,8 +1465,48 @@ class Dostop {
|
||||
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 = '<!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.0 Transitional//EN">'.'<html><head> <title>'.$Subject.'</title><meta content="text/html; charset=utf-8" http-equiv=Content-type></head><body>';
|
||||
|
||||
// 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 .= "</body></html>";
|
||||
|
||||
// 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';
|
||||
}
|
||||
}
|
||||
|
||||
@ -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,20 +1451,20 @@ 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 = '<a href="'.$site_url.'admin/survey/index.php?a=nastavitve&m=global_user_myProfile">';
|
||||
$out = '<a href="'.$this->page_urls['page_unregister'].'?email='.$email.'">';
|
||||
|
||||
|
||||
16
lang/1.php
16
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!<br /><br />Do uspešne registracije na spletnem mestu SFPAGENAME vam manjka le še en korak - da SFACTIVATEIN<strong>potrdite svojo registracijo s klikom na to povezavo</strong>SFACTIVATEOUT.",
|
||||
"confirm_user_mail_ignore" => "<br /><br /><i>V kolikor se s tem e-mail naslovom niste prijavili na spletno mesto SFPAGENAME, enostavno ignorirajte to sporočilo.</i>",
|
||||
"confirm_user_mail_admin" => "Spoštovani,<br /><br />Na spletno mesto SFPAGENAME se je registriral nov uporabnik SFNAME (SFMAIL), ki ga je potrebno potrditi. Potrdite ga preko povezave SFACTIVATEIN<strong>potrdite registracijo s klikom na to povezavo</strong>SFACTIVATEOUT.",
|
||||
"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!<br /><br />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#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali poleg primarnega elektronskega naslova #PRIMARNIEMAIL#, dodali še dodatni elektronski naslov <strong>#ALTERNATIVNIEMAIL#</strong>. Geslo za prijavo je enako kot za primarni elektronski naslov.<br/><br/>
|
||||
Omenjeni elektronski naslov aktivirate s klikom na to #CODESTART# povezavo#CODEEND#.<br /><br />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#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
|
||||
"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#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
|
||||
V kolikor tega niste storili, nas o tem obvestite ali izbrišite elektronski naslov iz vašega profila.<br /><br />Lep pozdrav,",
|
||||
"alternative_email_confirm_error" => "Pri aktivaciji dodatnega elektronskega naslova je prišlo do napake.<br />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.<br />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" => "<br /><br />Uspešno ste bili registrirani na SFPAGENAME.<br /><br /><strong>Vaše izbrane nastavitve so naslednje:</strong><blockquote>Ime: SFNAME<br />Email: SFMAIL<br />Geslo: SFPASS</blockquote>",
|
||||
"register_add_user_content_edit" => "<br /><br />Sporočilo smo vam poslali na SFMAIL<br />Za odjavo kliknite SFOUT tukaj SFEND<br />Za spremembo nastavitev kliknite SFCHANGE tukaj SFEND",
|
||||
"register_add_user_password" => "Prosimo, če geslo nemudoma spremenite!",
|
||||
"register_user_banned_content" => "Pozdravljeni, SFNAME!<br /><br />Uspešno ste se prijavili na SFPAGENAME.<br /><strong><span color=\"red\">Ko bo vašo registracijo na SFPAGENAME odobril urednik,</span></strong> boste prejemali obvestila in imeli dostop do internih vsebin.<br /><br /><strong>Vaše izbrane nastavitve so naslednje:</strong><blockquote>Ime: SFNAME<br />Email: SFMAIL<br />Geslo: SFPASS</p></blockquote><br /><br />Lep pozdrav,</p>SFPAGENAME<br /><br /><br />Sporočilo smo vam poslali na SFMAIL<br />Za odjavo kliknite SFOUT tukaj SFEND<br />Za spremembo nastavitev kliknite SFCHANGE tukaj SFEND",
|
||||
"register_user_banned_content" => "Pozdravljeni, SFNAME!<br /><br />Vaša registracija na SFPAGENAME je bila uspešno potrjena s strani urednika.<br /><br /><strong>Vaše izbrane nastavitve so naslednje:</strong><blockquote>Ime: SFNAME<br />Email: SFMAIL<br />Geslo: SFPASS</p></blockquote><br /><br />Lep pozdrav,</p>SFPAGENAME<br /><br /><br />Sporočilo smo vam poslali na SFMAIL<br />Za odjavo kliknite SFOUT tukaj SFEND<br />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 (<a href='mailto:help@1ka.si'>help@1ka.si</a>).<br /><br /><strong>Vaše nastavitve so naslednje:</strong><blockquote>Ime: SFNAME<br />Email: SFMAIL<br />Geslo: SFPASS</blockquote>",
|
||||
"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.",
|
||||
|
||||
10
lang/2.php
10
lang/2.php
@ -3283,13 +3283,15 @@ $lang = array (
|
||||
"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",
|
||||
"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!<br /><br />You are just one step away from registration on SFPAGENAME - please SFACTIVATEIN<strong>confirm your registration by clicking this link</strong>SFACTIVATEOUT.",
|
||||
"confirm_user_mail_ignore" => "<br/><br/><i>If you did not register on the 1KA website with this email address, simply ignore this message.</i>",
|
||||
"confirm_user_mail_admin" => "Dear admin,<br /><br />New user SFNAME (SFMAIL) has registered to SFPAGENAME. Please SFACTIVATEIN<strong>confirm registration by clicking this link</strong>SFACTIVATEOUT.",
|
||||
"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!<br /><br />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#!<br /><br />You added on the site <strong>#PAGENAME#</strong> in addition to the primary email address #PRIMARNIEMAIL#, adding an additional email address <strong>#ALTERNATIVNIEMAIL#</strong>. The login password is the same as for the primary email address.<br/>
|
||||
You activate this email address by clicking on this #CODESTART# link #CODEEND#.<br /><br />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" => "<br /><br />You have been successfully added to SFPAGENAME.<br />Now you have access to internal content and email notifications.<br /><br /><strong>Your selected login parameters are:</strong><br><blockquote>Name: SFNAME<br />Email: SFMAIL<br />Password: SFPASS</blockquote>",
|
||||
"register_add_user_content_edit" => "<br /><br />This message was sent to SFMAIL<br />To unregister, SFOUT click hereSFEND<br />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!<br /><br />You have successfully registered to SFPAGENAME.<br /><strong><span color=\"red\">When SFPAGENAME administrator confirms your registration,</span></strong> you will have access to internal content and email notifications.<br /><br /><strong>Your selected login parameters are:</strong><br><blockquote>Name: SFNAME<br />Email: SFMAIL<br />Password: SFPASS</blockquote><br /><br />Sincerely,<br />SFPAGENAME<br /><br /><br />This message was sent to SFMAIL<br />To unregister, SFOUT click hereSFEND<br />To change your profile or login data, SFCHANGE click here SFEND",
|
||||
"register_user_banned_content" => "Dear, SFNAME!<br /><br />Your registration to SFPAGENAME was successfully confirmed by administrator.<br /><br /><strong>Your selected login parameters are:</strong><br><blockquote>Name: SFNAME<br />Email: SFMAIL<br />Password: SFPASS</blockquote><br /><br />Sincerely,<br />SFPAGENAME<br /><br /><br />This message was sent to SFMAIL<br />To unregister, SFOUT click hereSFEND<br />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 (<a href='mailto:help@1ka.si'>help@1ka.si</a>). <br /><br /><strong>Your selected login parameters are:</strong><br><blockquote>Name: SFNAME<br />Email: SFMAIL<br />Password: SFPASS</blockquote>",
|
||||
"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_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 <strong>post</strong> can only be seen by administrators (moderator comment)",
|
||||
"srv_bottom_posted" => "Notifications",
|
||||
"srv_bottom_archive" => "Archive",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user