may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravek texta pri dodajanju uredniskega dostopa neobstojecemu mailu

Browse Source
This commit is contained in:
pero1203 2021-09-01 11:13:56 +02:00
parent 71c5103b5b
commit ea60973d45
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/survey/SurveyAdminAjax.php
View File

@ -6275,10 +6275,14 @@ class SurveyAdminAjax {
$id = 0;
$sqlu = sisplet_query("SELECT id FROM users WHERE email='$email'");
$create_new_account = false;
// Ce user, ki ga dodajamo, se ne obstaja, ga ustvarimo - PO NOVEM SAMO CE SMO ADMIN
if (mysqli_num_rows($sqlu) == 0 && $admin_type == 0) {
$s = sisplet_query("INSERT INTO users (name, surname, email, pass, type, when_reg, came_from) VALUES ('$name', '$surnname', '$email', '" .base64_encode((hash(SHA256, '' .$pass_salt))) ."', '3', DATE_FORMAT(NOW(), '%Y-%m-%d'), '1')");
$id = mysqli_insert_id($GLOBALS['connect_db']);
$create_new_account = true;
}
// Drugace pridobimo podatke o userju iz baze
else {
@ -6330,10 +6334,12 @@ class SurveyAdminAjax {
$MA->addRecipients($email);
$resultX = $MA->sendMail(stripslashes($content), $subject);
if($resultX)
echo '<span><span class="email bold">'.$email.' - </span>'.$lang['srv_dostop_addusers_success'].'</span>';
else
if($resultX){
echo '<span><span class="email bold">'.$email.' - </span>'.($create_new_account ? $lang['srv_dostop_addusers_success_create'] : $lang['srv_dostop_addusers_success']).'</span>';
}
else{
echo '<span class="red"><span class="email bold">'.$email.' - </span>'.$lang['srv_dostop_addusers_error3'].'</span>';
}
}
catch (Exception $e){
echo '<span class="red"><span class="email bold">'.$email.' - </span>'.$lang['srv_dostop_addusers_error3'].'</span>';

3
lang/1.php
View File

@ -2060,7 +2060,8 @@ $lang = array (
"srv_dostop_addusers_error2" => "Uporabnik s tem e-poštnim naslovom še ni registriran!",
"srv_dostop_addusers_error3" => "Prišlo je do napake pri pošiljanju obvestila!",
"srv_dostop_addusers_error4" => "Uporabnik že ima dostop do urejanja ankete.",
"srv_dostop_addusers_success" => "Uspešno dodan dostop in poslano sporočilo.",
"srv_dostop_addusers_success" => "Uspešno je bil dodan dostop in poslano sporočilo.",
"srv_dostop_addusers_success_create" => "Uspešno je bil dodan nov uporabnik in poslano sporočilo.",
"srv_dostop_activetxt" => "Aktivni uporabniki lahko normalno urejajo in pregledujejo anketo. Pasivni pa vidijo zgolj zavihka Analiza in Poro&#269;ila",
"srv_dostop_show_all" => "Prikaži vse.",
"srv_dostop_hide_all" => "Skrij neizbrane.",

1
lang/2.php
View File

@ -2048,6 +2048,7 @@ $lang = array (
"srv_dostop_addusers_error3" => "There was an error sending the notification !",
"srv_dostop_addusers_error4" => "The user already has access to the survey.",
"srv_dostop_addusers_success" => "Access added and notification successfully sent.",
"srv_dostop_addusers_success_create" => "Account created and notification successfully sent.",
"srv_dostop_activetxt" => "Active users have normal editing rights. Passive users can only view the survey.",
"srv_dostop_show_all" => "Show all.",
"srv_dostop_hide_all" => "Hide unselected.",