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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Robert 2021-07-20 17:49:54 +02:00
commit eae0ccd893
16 changed files with 106 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/SurveyAdminAjax.php
View File

@ -6265,7 +6265,7 @@ class SurveyAdminAjax {
// Dodeljevanje uredniskega dostopa do ankete
private function ajax_add_survey_dostop_popup(){
global $lang, $pass_salt, $global_user_id, $site_path, $admin_type;
global $lang, $pass_salt, $global_user_id, $site_path, $site_url, $admin_type;
$_POST['addusers'] = mysql_real_unescape_string($_POST['addusers']);
$users = explode(NEW_LINE, $_POST['addusers']);
@ -6302,8 +6302,8 @@ class SurveyAdminAjax {
$id = 0;
$sqlu = sisplet_query("SELECT id FROM users WHERE email='$email'");
// Ce user, ki ga dodajamo, se ne obstaja, ga ustvarimo - PO NOVEM SAMO CE SMO ADMIN ALI MANAGER
if (mysqli_num_rows($sqlu) == 0 && ($admin_type == 0 || $admin_type == 1)) {
// 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']);
}
@ -6329,11 +6329,11 @@ class SurveyAdminAjax {
$subject = $lang['srv_dostopmail_1'].' '.$naslov.'.';
$content = $lang['srv_dostopmail_2'].' <span style="color:red;">'.$nameAuthor.'</span> (<a style="color:#1e88e5 !important; text-decoration:none !important;" href="mailto:'.$MailReply.'">'.$MailReply.'</a>) '.$lang['srv_dostopmail_3'].' <a style="color:#1e88e5 !important; text-decoration:none !important;" href="'.$site_url.'admin/survey/index.php?anketa='.$anketa.'"><span style="font-weight:bold;">'.$naslov.'.</span></a><br /><br />
$content = $lang['srv_dostopmail_2'].' <span style="color:red;">'.$nameAuthor.'</span> (<a style="color:#1e88e5 !important; text-decoration:none !important;" href="mailto:'.$MailReply.'">'.$MailReply.'</a>) '.$lang['srv_dostopmail_3'].' <a style="color:#1e88e5 !important; text-decoration:none !important;" href="'.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'"><span style="font-weight:bold;">'.$naslov.'.</span></a><br /><br />
'.$lang['srv_dostopmail_4'].' <a style="color:#1e88e5 !important; text-decoration:none !important;" href="'.$site_url.'">'.$site_url.'</a> '.$lang['srv_dostopmail_5'].' (<a style="color:#1e88e5 !important; text-decoration:none !important;" href="mailto:'.$email.'">'.$email.'</a>).';
// Ce email se ni registriran, dodamo dodatno obvestilo
if(mysqli_num_rows($sqlu) == 0 && ($admin_type == 0 || $admin_type == 1)){
if(mysqli_num_rows($sqlu) == 0 && $admin_type == 0){
$content .= '<br /><br />'.$lang['srv_dostopmail_7'];
$content .= ' <a style="color:#1e88e5 !important; text-decoration:none !important;" href="'.$site_url.'/admin/survey/index.php?a=nastavitve&m=global_user_myProfile">'.$lang['edit_data'].'</a> ';
$content .= $lang['srv_dostopmail_72'];

14
admin/survey/SurveyAdminSettings.php
View File

@ -2315,8 +2315,11 @@ class SurveyAdminSettings {
echo '<div class="publish_url_holder">';
echo '<p style="margin: 2px 0;"><a href="' . $link . '&preview=on'.$preview_options.'" target="_blank" class="srv_icox spaceRight"><span class="faicon preview"></span> ' . $lang['srv_poglejanketo2'] . '</b></a>';
echo '<span class="spaceLeft italic">('.$lang['srv_preview_text'].')</span></p>';
echo '<p style="margin: 2px 0;">' . $lang['url'] . ': ' . $link . '&preview=on'.$preview_options.'</p>';
echo '<span class="spaceLeft italic">('.$lang['srv_preview_text'].')</span>';
echo '<p style="margin: 2px 0;">' . $lang['url'] . ': ' . $link . '&preview=on'.$preview_options.'';
echo '<a href="#" onclick="CopyToClipboard(\''. $link . '&preview=on'.$preview_options.'\');" return false;" title="Kopiraj povezavo" class="srv_ico">'
.'&nbsp;&nbsp'
. '<span class="faicon copy"></span></a></p>';
echo '</div>';
@ -2327,6 +2330,9 @@ class SurveyAdminSettings {
echo '<p style="margin: 2px 0;"><a href="' . $link . '&preview=on&testdata=on'.$preview_options.'" title="" target="_blank" class="srv_ico spaceRight"><span class="faicon test large"></span> ' . $lang['srv_survey_testdata2'] . '</b></a>';
echo '<span class="spaceLeft italic">('.$lang['srv_testdata_text'].')</span></p>';
echo '<p style="margin: 2px 0;">'.$lang['url'] . ': ' . $link . '&preview=on&testdata=on'.$preview_options;
echo '<a href="#" onclick="CopyToClipboard(\''. $link . '&preview=on&testdata=on'.$preview_options.'\');" return false;" title="Kopiraj povezavo" class="srv_ico">'
.'&nbsp;&nbsp'
. '<span class="faicon copy"></span></a>';
echo ' (<a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;">'.$lang['srv_testrianje_how'].'</a>)</p>';
echo '</div>';
@ -2349,6 +2355,10 @@ class SurveyAdminSettings {
$link1 = $site_url.'a/'.Common::encryptAnketaID($this->anketa);
echo '<b><a href="'.$link1.'" target="_blank">'.$link1.'</a>'.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').'</b>';
echo '<a href="#" onclick="CopyToClipboard(\''.$link1.'\');" return false;" title="Kopiraj povezavo" class="srv_ico">'
.'&nbsp;&nbsp'
. '<span class="faicon copy"></span></a>';
// Zlistamo vse lepe url-je
$sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC");
while ($rowl = mysqli_fetch_assoc($sqll)) {

6
admin/survey/classes/class.GDPR.php
View File

@ -59,7 +59,7 @@ class GDPR{
$survey_list = $this->getUserSurveys();
echo '<div style="font-style:italic; margin-top:-10px;">';
echo '<div style="margin-top:-10px;">';
echo '<p>'.$lang['srv_gdpr_survey_list_text'].'</p>';
@ -307,7 +307,7 @@ class GDPR{
global $site_url;
global $lang;
echo '<div style="font-style:italic; margin-top:-10px;">';
echo '<div style="margin-top:-10px;">';
echo '<p>'.$lang['srv_gdpr_requests_desc'].'</p>';
echo '</div>';
@ -1047,7 +1047,7 @@ class GDPR{
global $site_url;
global $lang;
echo '<div style="font-style:italic; margin-top:-10px;">';
echo '<div style="margin-top:-10px;">';
echo '<p>'.$lang['srv_gdpr_requests_desc'].'</p>';
echo '</div>';

4
admin/survey/classes/mobile/class.MobileSurveyAdmin.php
View File

@ -378,11 +378,11 @@ class MobileSurveyAdmin{
),
array(
'title' => $lang['srv_gdpr_survey_list'],
'url' => 'index.php?a=gdpr&m=placila'
'url' => 'index.php?a=gdpr&m=gdpr_survey_list'
),
array(
'title' => $lang['srv_gdpr_dpa'],
'url' => 'index.php?a=gdpr'
'url' => 'index.php?a=gdpr&m=gdpr_dpa'
),
array(
'title' => $lang['srv_gdpr_requests'].' ('.$request_counter.')',

6
admin/survey/script/script.js
View File

@ -5509,3 +5509,9 @@ function removeUploadFromData(usr_id, spr_id, code){
$("#fullscreen").load('ajax.php?t=postprocess&a=edit_data_question_upload_delete', {anketa: srv_meta_anketa_id, usr_id: usr_id, spr_id: spr_id, code: code});
}
// Kopiranje URLja za anketo
function CopyToClipboard(copyText) {
var temp_copy = $('<input>').val(copyText).appendTo('body').select()
document.execCommand('copy')
}

2
lang/1.php
View File

@ -2055,7 +2055,7 @@ $lang = array (
"srv_dostop_adduserstxt_end" => "Uporabniki bodo o novem dostopu avtomatsko obve&#353;&#269;eni na e-mail.",
"srv_dostop_addusers_button" => "Dodaj dostope in pošlji obvestila",
"srv_dostop_addusers_error1" => "Vnešeni email naslov ni veljaven!",
"srv_dostop_addusers_error2" => "Uporabnik s tem email naslovom ne obstaja!",
"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.",

2
lang/13.php
View File

@ -3421,7 +3421,7 @@ Ta&#269;nu lokaciju fajla sa podacima mo&#382;emo potra&#382;iti na slede&#269;i
"srv_temp_profile_author" => "Privremeno - avtor",
"srv_new_profile" => "Novi profil",
"custom_navi" => "Prilago&#273;ena navigacija",
"srv_export_full_meta" => "Izvozi i metapodatke",
"srv_export_full_meta" => "Izvozi podatke i parapodatke",
"srv_export_hidden_system" => "Izvozi samo sistemske podatke",
"srv_printouts_q" => "Ispisi upitnika",
"srv_printouts_q" => "Ispisi upitnika",

4
lang/2.php
View File

@ -2042,7 +2042,7 @@ $lang = array (
"srv_dostop_adduserstxt_end" => "Users will be automatically notified by e-mail.",
"srv_dostop_addusers_button" => "Grant access and send notifications",
"srv_dostop_addusers_error1" => "Email address is not valid!",
"srv_dostop_addusers_error2" => "User with this email address does not exist!",
"srv_dostop_addusers_error2" => "User with this email address does not have an account!",
"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.",
@ -4037,7 +4037,7 @@ $lang = array (
"srv_new_profile" => "New profile",
"custom_navi" => "Custom navigations",
"srv_export_only_data" => "Export only data",
"srv_export_full_meta" => "Export data and metadata",
"srv_export_full_meta" => "Export data and paradata",
"srv_export_hidden_system" => "Export only system data",
"srv_export_meta_dates" => "Dates",
"srv_export_meta_emailCMS" => "Email",

2
lang/41.php
View File

@ -3421,7 +3421,7 @@ Ta&#269;nu lokaciju fajla sa podacima mo&#382;emo potra&#382;iti na slede&#269;i
"srv_temp_profile_author" => "Privremeno - avtor",
"srv_new_profile" => "Novi profil",
"custom_navi" => "Prilago&#273;ena navigacija",
"srv_export_full_meta" => "Izvozi i metapodatke",
"srv_export_full_meta" => "Izvozi podatke i parapodatke",
"srv_export_hidden_system" => "Izvozi samo sistemske podatke",
"srv_printouts_q" => "Ispisi upitnika",
"srv_printouts_q" => "Ispisi upitnika",

29
public/css/admin.css
View File

@ -12564,9 +12564,6 @@ span#sl_language {
#main #moje_ankete_edit.page_pregledovanje, #main #moje_ankete_edit.page_ {
padding: 50px 60px;
}
#main #moje_ankete_edit.subpage_b_new_survey, #main #moje_ankete_edit.subpage_b_video, #main #moje_ankete_edit.subpage_b_features, #main #moje_ankete_edit.page_ustvari_anketo {
padding: 0;
}
#main #moje_ankete_edit fieldset {
max-width: 1200px;
}
@ -28585,6 +28582,10 @@ fieldset textarea {
height: auto !important;
}
select {
-webkit-appearance: none;
}
.desktop_header {
display: none;
}
@ -29622,6 +29623,28 @@ table.analysis_reports > tbody > tr > td {
table.analysis_reports fieldset {
margin-bottom: 0 !important;
}
.noSurvey_sequence {
padding: 0;
}
.noSurvey_sequence .main_holder.main {
flex-direction: column;
}
.noSurvey_sequence .main_holder .left_holder {
width: 90% !important;
margin: auto;
}
.noSurvey_sequence .main_holder .right_holder {
width: 90% !important;
margin: auto;
}
.noSurvey_sequence .buttons_holder {
flex-direction: column;
align-items: center;
}
.noSurvey_sequence .buttons_holder a .button {
margin: 10px 30px;
}
}
/*# sourceMappingURL=admin.css.map */

1
resources/sass/admin/main_page/main_page_base.scss
View File

@ -20,7 +20,6 @@
&.subpage_b_video,
&.subpage_b_features,
&.page_ustvari_anketo{
padding: 0;
}
fieldset{

3
resources/sass/admin/mobile/basic.scss
View File

@ -47,3 +47,6 @@ fieldset {
}
}
select {
-webkit-appearance: none;
}

1
resources/sass/admin/mobile/mobile.scss
View File

@ -26,5 +26,6 @@ $breakpoint-mobile: 600px;
@import "pages/publish";
@import "pages/data";
@import "pages/analysis";
@import "pages/no_survey";
}

31
resources/sass/admin/mobile/pages/no_survey.scss Normal file
View File

@ -0,0 +1,31 @@
.noSurvey_sequence {
padding: 0;
.main_holder{
&.main{
flex-direction: column;
}
.left_holder{
width: 90% !important;
margin: auto;
}
.right_holder{
width: 90% !important;
margin: auto;
}
}
.buttons_holder {
flex-direction: column;
align-items: center;
a .button {
margin: 10px 30px;
}
}
}

1
resources/sass/admin/new_survey_page/no_survey_page.scss
View File

@ -10,6 +10,7 @@ and open the template in the editor.
$subtitle_text: $grey_super_dark;
.noSurvey_sequence {
padding: 70px 50px 70px 50px;

8
sql/update2.sql
View File

@ -9504,3 +9504,11 @@ UPDATE misc SET value='21.05.25' WHERE what="version";
# Drupal verzija je bila posodobljena in vpišemo na 1ka.si in te
UPDATE misc SET value='7.81' WHERE what="drupal version";
UPDATE misc SET value='21.06.10' WHERE what="version";
INSERT INTO srv_help (what, help) VALUES ('srv_export_full_meta', 'Export data and paradata');
UPDATE misc SET value='21.07.19' WHERE what="version";
UPDATE srv_help SET help='Izvozi podatke in parapodatke' WHERE what='srv_export_full_meta' AND lang='1';
INSERT INTO srv_help (what, help, lang) VALUES ('srv_export_full_meta', 'Export data and paradata', '2');
UPDATE misc SET value='21.07.19' WHERE what="version";