diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 3a8e46320..e2eb09f0a 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -138,7 +138,7 @@ class SurveyAdminSettings { echo '
'; echo ''; - echo ''; echo ''; while($rowF = mysqli_fetch_array($sqlF)){ echo ''; @@ -208,28 +208,31 @@ class SurveyAdminSettings { echo '
'; // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete" - echo '
'; - echo '

'.$lang['srv_language_link2'].':'; // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); if($userAccess->checkUserAccess($what='prevajanje')){ - echo ' '.$lang['srv_language_link'].'

'; - } - else{ - echo ' '.$lang['srv_language_link'].'

'; - } - echo '

'.$lang['srv_language_mySurveys'].'.

'; + $lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;'; + $color = 'blue'; + } + else{ + $lang_link = 'popupUserAccess(\'prevajanje\'); return false;'; + $color = 'yellow user_access_locked'; + } + + echo '
'; + echo ''; echo '
'; + echo ''; - // Gumb shrani - vmes + /*/ Gumb shrani - vmes echo '
'; echo ''; echo ''; - echo '
'; + echo '
';*/ /* INTERAKTIVNI ELEMENTI */ @@ -251,33 +254,67 @@ class SurveyAdminSettings { // Indikator napredka echo '
'; - echo ''.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').':'; - - echo '
'; - echo ''; - echo ' '; - echo '
'; - echo '
'; - echo ''; - echo ' '; - echo '
'; - + echo ''; + echo ''; + echo ' '; echo '
'; // Naslov ankete za uporabnike echo '
'; - echo ''.$lang['srv_show_title'].':'; - - echo '
'; - echo ''; - echo ' '; - echo '
'; - echo '
'; - echo ''; - echo ' '; + echo ''; + echo ''; + echo ' '; echo '
'; + // Nadaljuj kasneje + if($this->survey_type > 1){ + echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + } + + // Gumb nazaj + echo '
'; + echo ''; + echo ''; + echo ' '; echo '
'; + + // Namig + echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + + /* KNJIZNICA */ + $sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'"); + $moje = mysqli_num_rows($sqlk); + $sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'"); + $javne = mysqli_num_rows($sqlk); + + if ($admin_type == 0 || $admin_type == 1) { + + echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + } + + echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + + ?> + + '; @@ -298,52 +335,6 @@ class SurveyAdminSettings { echo '
'; - // Nadaljuj kasneje - if($this->survey_type > 1){ - echo '
'; - echo ''. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':'; - - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ''; - echo ''; - echo '
'; - - echo '
'; - } - - // Gumb nazaj - echo '
'; - echo ''.$lang['srv_slideshow_sett_back_button_lbl'].':'; - - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ''; - echo ''; - echo '
'; - - echo '
'; - - // Namig - echo '
'; - echo ''.$lang['srv_hint'].' '.Help::display('srv_namig_setting').':'; - - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ''; - echo ''; - echo '
'; - - echo '
'; // Oozorilo na vprašanja echo '
'; @@ -360,7 +351,7 @@ class SurveyAdminSettings { echo '
'; - // Napredni parapodatki + /*/ Napredni parapodatki if (($admin_type == 0 || $admin_type == 1) && $this->survey_type > 0) { echo '
'; echo ''.$lang['srv_parapodatki'].':'; @@ -410,7 +401,7 @@ class SurveyAdminSettings { echo '
'; echo ''; - } + }*/ echo ''; @@ -501,81 +492,21 @@ class SurveyAdminSettings { echo ''; } - /* KNJIZNICA */ - $sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'"); - $moje = mysqli_num_rows($sqlk); - $sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'"); - $javne = mysqli_num_rows($sqlk); - - echo '
'; - echo ''.$lang['srv_library'].''; - if ($admin_type == 0 || $admin_type == 1) { - echo ''.$lang['srv_javne_ankete'].':'; - - echo '
'; - - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ''; - echo ''; - echo '
'; - - echo '
'; - } - - echo '
'; - echo ''.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').':'; - - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ''; - echo ''; - echo '
'; - - echo '
'; - - // zamakni - /*echo '
'; - - echo ''.$lang['a_show'].''; - echo '
'; - if ($row['flat'] == 0) - echo ''.$lang['srv_flat_0_short'].' '; - else - echo ''.$lang['srv_flat_0_short'].' '; - echo Help::display('srv_branching_flat'); - echo '
'; - - // odpri - echo '
'; - if ($row['popup'] == 1) - echo ''.$lang['srv_popup_1_short'].' '; - else - echo ''.$lang['srv_popup_1_short'].' '; - echo Help::display('srv_branching_popup'); - echo '
'; - - echo '
';*/ - - - echo '
'; - - ?> - - '; echo '' . $lang['srv_nastavitveStevilcenje'] . ''; + // Izklop prestevilcevanja + $enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1; + + echo '
'; + echo ''; + echo ''; + echo ' '; + echo '
'; + + //način številčenja + echo '
'; echo ''; @@ -598,33 +529,14 @@ class SurveyAdminSettings { echo '
'; - // Izklop prestevilcevanja - $enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1; - - echo '
'; - echo ''; - - - echo '
'; - echo ''; - echo ' '; - echo '
'; - echo '
'; - echo ''; - echo ' '; - echo '
'; - - echo '
'; - echo ''; /* JS TRACKING */ if ($admin_type == 0 || $admin_type == 1) { echo '
'.$lang['srv_js_tracking'].''; echo '
'; - echo ''; - echo '

'.$lang['js_tracking_note'].'

'; - + echo ''.$lang['js_tracking_note'].''; + echo ''; echo '
'; echo '
'; @@ -1889,16 +1801,10 @@ class SurveyAdminSettings { $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly'); echo '
'; - - echo ''.$lang['srv_settings_mobile_friendly'].':'; - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ''; - echo ' '; - echo '
'; + + echo ''; + echo ''; + echo ' '; echo '
'; @@ -1910,19 +1816,12 @@ class SurveyAdminSettings { $hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img'); echo '
'; - echo ''.$lang['srv_settings_mobile_img'].':'; - echo '
'; - echo ''; - echo ' '; - echo '
'; - echo '
'; - echo ''; - echo ' '; - echo '
'; + echo ''; + echo ''; + echo ' '; echo '
'; - // Prilagoditev tabel pri mobilnikih $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables'); echo '
'; @@ -7016,22 +6915,6 @@ class SurveyAdminSettings { $rowa = SurveyInfo::getInstance()->getSurveyRow(); - echo '
'; - - echo $lang['srv_komentarji_imate'].' '; - if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo ''; - echo $this->string_format((int)($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']), 'srv_cnt_komentarji'); - if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo ''; - - echo ' '.$lang['srv_komentarji_odskupno'].' '; - echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od'); - echo '
'; - - - echo '
'; - echo ' '.$lang['srv_survey_testdata'].''; - echo '
'; - # VV: privzeto naj bodo samo nerešeni komentarji if (!isset($_GET['only_unresolved'])) { @@ -7081,9 +6964,28 @@ class SurveyAdminSettings { echo '
'; // Splosni komentarji urednikov - levo - echo '
'; - echo '
'.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')'; + echo '
'; + echo '
'; + + echo $lang['srv_admin_comment'].':'; + echo ''; //manjka funkcija za sort in toggle za spremembo ikone + echo ''; + + echo '
'; + + // Dodajanje novega komentarja + + echo '
'; + echo $lang['srv_add_comment_toggle']; + echo '
'; + + echo '
'; + echo '
'; + $ba = new BranchingAjax($this->anketa); + $ba->add_comment_field(0, '1', '4', false); + echo '
'; + echo '
'; $sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." "); $rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1; @@ -7094,52 +6996,71 @@ class SurveyAdminSettings { if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) { - echo '
'; + echo '
'; echo '
'; - echo $lang['srv_comments_user'].''.$f->user($row['uid']).''.$lang['srv_comments_user2']; - echo '
'; $datetime = strtotime($row['time']); $datetime = date("d.m.Y G:i", $datetime); - echo '
'; - echo $datetime; - echo '
'; + + echo '

'.$lang['srv_comments_user'].''.$f->user($row['uid']).' ('.$datetime.')

'; + + + if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { + + echo '
'; + + echo '
'; + if ($row['ocena']==0) { + echo '

'; + echo $lang['srv_comments_archive'].'

'; + } + else { + echo '

'; + echo $lang['srv_comments_unarchive'].'

'; + } + echo '
'; + + echo ''; + + echo '
'; + + echo '
'; + echo ''.$lang['srv_comment_comment']; // pri splošnih ni odgovorov? + echo '
'; + + echo '
'; + echo ''; //manjka funkcija za izbris + echo $lang['srv_comment_delete']; + echo '
'; + + echo '
'; + + //Klik izven razprith nastavitev - zapremo okno + echo ''; + + + + echo '
'; //options + + } + + echo '
'; //by + echo '
'; echo $row['vsebina']; echo '
'; - - if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { - - echo '
'; - - if ($commentmarks == 1) { - echo ' '; - } - else { - - if ($row['ocena']==0) { - echo '

'; - echo $lang['srv_comments_archive'].'

'; - } - else { - echo '

'.$lang['srv_comments_archived'].'

'; - echo '

'; - echo $lang['srv_comments_unarchive'].'

'; - } - } - - echo '
'; - } - echo '
'; } @@ -7157,42 +7078,33 @@ class SurveyAdminSettings { } } - // Dodajanje novega komentarja - echo '
'; - echo ''; - echo $lang['srv_add_comment_toggle']; - echo '
'; - - echo '
'; - echo '
'; - $ba = new BranchingAjax($this->anketa); - $ba->add_comment_field(0, '1', '4', false); - echo '
'; - echo '
'; - - echo '
'; echo '
'; // Splosni komentarji respondentov - desno - echo '
'; - echo '
'.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')'; + echo '
'; + + echo '
'; + echo $lang['srv_repondent_comment'].':'; + echo ''; //manjka funkcija za sort in toggle za spremembo ikone + echo ''; + echo '
'; $sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby"); if (mysqli_num_rows($sql) > 0) { while ($row = mysqli_fetch_array($sql)) { - echo '
'; + echo '
'; $datetime = strtotime($row['comment_time']); $datetime = date("d.m.Y G:i", $datetime); - + + echo '
'; + if($row['usr_id'] == 0){ - echo '
'; - echo 'Respondent '.$lang['srv_comments_user2']; - echo '
'; + echo '

Respondent ('.$datetime.')

'; } else{ $sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'"); @@ -7200,48 +7112,65 @@ class SurveyAdminSettings { $user = $rowU['name']; - echo '
'; - echo $lang['srv_comments_user'].''.$user.''.$lang['srv_comments_user2']; - echo '
'; + echo '

'.$lang['srv_comments_user'].''.$user.' ('.$datetime.')

'; + } - echo '
'; - echo $datetime; - echo '
'; + if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { + + echo '
'; + + echo '
'; + if ($row['ocena']==0) { + echo '

'; + echo $lang['srv_comments_archive'].'

'; + } + else { + echo '

'; + echo $lang['srv_comments_unarchive'].'

'; + } + echo '
'; + + echo ''; + + echo '
'; + + echo '
'; + echo ''.$lang['srv_comment_comment']; // pri splošnih ni odgovorov? + echo '
'; + + echo '
'; + echo ''; //manjka funkcija za izbris + echo $lang['srv_comment_delete']; + echo '
'; + + echo '
'; + + //Klik izven razprith nastavitev - zapremo okno + echo ''; + + + + echo '
'; //options + + } + + echo '
'; //by + echo '
'; echo $row['comment']; echo '
'; - if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { - - echo '
'; - - if ($commentmarks == 1) { - echo ' '; - } - else { - - if ($row['ocena']==0) { - echo '

'; - echo $lang['srv_comments_archive'].'

'; - } - else { - echo '

'.$lang['srv_comments_archived'].'

'; - echo '

'; - echo $lang['srv_comments_unarchive'].'

'; - } - } - - echo '
'; - } - echo '
'; } @@ -7256,9 +7185,8 @@ class SurveyAdminSettings { echo '

'.$lang['srv_no_comments'].'

'; } } - // Dodajanje novega komentarja + /* Dodajanje novega komentarja echo '
'; - echo ''; echo $lang['srv_add_comment_toggle']; echo '
'; @@ -7268,9 +7196,8 @@ class SurveyAdminSettings { $ba->add_comment_field(0, '4', '5', false); echo '
'; - echo '
'; + echo '
';*/ - echo ''; echo '
'; echo '
'; // div.komentarji_anketa_holder @@ -7536,32 +7463,6 @@ class SurveyAdminSettings { $comment_count = $this->testiranje_komentarji_count(); - echo '
'; - - echo $lang['srv_komentarji_imate'].' '; - if($comment_count['question']['unresolved'] > 0) echo ''; - echo $this->string_format((int)$comment_count['question']['unresolved'], 'srv_cnt_komentarji'); - if($comment_count['question']['unresolved'] > 0) echo ''; - - echo ' '.$lang['srv_komentarji_odskupno'].' '; - echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od'); - - echo '
'; - - - /* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho ' '; - echo ''; - echo '' . $lang['srv_survey_testdata2'] . ': '.$lang['srv_testdata_text'].''; - echo '

'.$lang['srv_preview_testdata_longtext'].'

'; - echo ''; - echo '
'; // expanded-tooltip bottom - echo '
'; // tooltip */ - - echo '
'; - echo ''.$lang['srv_survey_testdata'].''; - echo '
'; - - # VV: privzeto naj bodo samo nerešeni komentarji if (!isset($_GET['only_unresolved'])) { $_GET['only_unresolved'] = 1; @@ -7698,6 +7599,9 @@ class SurveyAdminSettings { echo '
'; echo $lang['srv_admin_comment'].':'; + + echo ''; //manjka funkcija za sort in toggle za spremembo ikone + echo ''; echo '
'; @@ -7769,7 +7673,6 @@ class SurveyAdminSettings { echo '
'; - echo ''; echo $lang['srv_add_comment_toggle']; echo '
'; @@ -7864,81 +7767,9 @@ class SurveyAdminSettings { echo '
'; - // komentarji urednikov - if ($row1['thread'] > 0) { - - if (mysqli_num_rows($sqlt) > 0) { - - echo '
'; - - echo $lang['srv_admin_comment'].':'; - - echo '
'; - - $i = 0; - while ($rowt = mysqli_fetch_array($sqlt)) { - - echo '
'; - - echo '
'; - echo $lang['srv_comments_user'].''.$f->user($rowt['uid']).''.$lang['srv_comments_user2']; - echo '
'; - - $datetime = strtotime($rowt['time']); - $datetime = date("d.m.Y G:i", $datetime); - - echo '
'; - echo $datetime; - echo '
'; - - echo '
'; - echo $rowt['vsebina']; - echo '
'; - - if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { - - echo '
'; - if ($commentmarks == 1) { - echo ' '; - } else { - - if ($rowt['ocena']==0) { - echo '

'; - echo $lang['srv_comments_archive'].'

'; - - echo '
'; - echo ''.$lang['srv_comment_comment'].''; - echo '
'; - } - else { - echo '

'.$lang['srv_comments_archived'].'

'; - echo '

'; - echo $lang['srv_comments_unarchive'].'

'; - } - } - - echo '
'; - } - - echo '
'; - - echo '
'; - echo '
'; - } - - } - - } - if ($addfieldposition == '' || $addfieldposition == 0) { - echo '
'; - echo ''; + echo '
'; echo $lang['srv_add_comment_toggle']; echo '
'; @@ -7951,6 +7782,98 @@ class SurveyAdminSettings { echo '
'; } + // komentarji urednikov + if ($row1['thread'] > 0) { + + if (mysqli_num_rows($sqlt) > 0) { + + echo '
'; + + echo $lang['srv_admin_comment'].':'; + + echo ''; //manjka funkcija za sort in toggle za spremembo ikone + echo ''; + + echo '
'; + + $i = 0; + while ($rowt = mysqli_fetch_array($sqlt)) { + + + echo '
'; + + echo '
'; + + $datetime = strtotime($rowt['time']); + $datetime = date("d.m.Y G:i", $datetime); + + echo '

'.$lang['srv_comments_user'].''.$f->user($rowt['uid']).' ('.$datetime.')

'; + + + if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { + + echo '
'; + + echo '
'; + if ($rowt['ocena']==0) { + echo '

'; + echo $lang['srv_comments_archive'].'

'; + } + else { + echo '

'; + echo $lang['srv_comments_unarchive'].'

'; + } + echo '
'; + + echo ''; + + echo '
'; + + echo '
'; + echo ''.$lang['srv_comment_comment'].''; + echo '
'; + + echo '
'; + echo ''; //manjka funkcija za izbris + echo $lang['srv_comment_delete']; + echo '
'; + + echo '
'; + + //Klik izven razprith nastavitev - zapremo okno + echo ''; + + + + echo '
'; //options + + } + + echo '
'; //by + + echo '
'; + echo $rowt['vsebina']; + echo '
'; + + + echo '
'; //comment_box + + echo '
'; + echo '
'; + } + + } + + } + echo '
'; @@ -7963,6 +7886,8 @@ class SurveyAdminSettings { echo '
'; echo $lang['srv_repondent_comment'].':'; + echo ''; //manjka funkcija za sort in toggle za spremembo ikone + echo ''; echo '
'; if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " "; @@ -7971,7 +7896,7 @@ class SurveyAdminSettings { if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']); while ($rowt = mysqli_fetch_array($sqlt)) { - echo '
'; + echo '
'; // Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja $sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'"); @@ -7979,69 +7904,78 @@ class SurveyAdminSettings { $rowTime = mysqli_fetch_array($sqlTime); + echo '
'; - echo 'Respondent '.$lang['srv_comments_user2']; - echo '
'; - + if ( strpos($rowt['text'], '__DATE__') !== false ) { $rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']); - echo '
'; - echo nl2br($rowt['text']); - echo '
'; + $datetime = '-'; + } else { $datetime = strtotime($rowTime['time_edit']); $datetime = date("d.m.Y G:i", $datetime); - - echo '
'; - echo $datetime; - echo '
'; - - echo '
'; - echo nl2br($rowt['text']); - echo '
'; } + + echo '

Respondent ('.$datetime.')

'; + + + if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { + + echo '
'; + + echo '
'; + if ($rowt['text2']==0) { + echo '

'; + echo $lang['srv_comments_archive'].'

'; + } + else { + echo '

'; + echo $lang['srv_comments_unarchive'].'

'; + } + echo '
'; + + echo ''; + + echo '
'; + + echo '
'; + echo ''; //manjka funkcija za izbris + echo $lang['srv_comment_delete']; + echo '
'; + + echo '
'; + + //Klik izven razprith nastavitev - zapremo okno + echo ''; + + + + echo '
'; //options + + } + + echo '
'; //by + } else{ if ( strpos($rowt['text'], '__DATE__') !== false ) { $rowt['text'] = str_replace('__DATE__', '', $rowt['text']); - echo '
'; - echo nl2br($rowt['text']); - echo '
'; } - else { - echo '
'; - echo nl2br($rowt['text']); - echo '
'; - } } - if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { - - echo '
'; - - if ($commentmarks == 1) { - echo ' '; - } else { - - if ($rowt['text2']==0) { - echo '

'; - echo $lang['srv_comments_archive'].'

'; - } - else { - echo '

'.$lang['srv_comments_archived'].'

'; - echo '

'; - echo $lang['srv_comments_unarchive'].'

'; - } - } - echo '
'; - } + echo '
'; + echo nl2br($rowt['text']); + echo '
'; echo '
'; } diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 6ccbac630..bf5f99a2e 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -5656,4 +5656,8 @@ function show_gdpr_messeage(id_sporocila){ $("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id}); console.log(id_sporocila); +} + +function toggleCommentOptions(id) { + $("#options_"+id).toggleClass("displayNone"); } \ No newline at end of file diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js index 0f9c89c5c..957172bad 100644 --- a/admin/survey/script/vprasanje.js +++ b/admin/survey/script/vprasanje.js @@ -759,6 +759,7 @@ function comment_on_comment (id, user, date, spr_id) { ''+ '' ); + $(".options_dropdown").addClass("displayNone"); } diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php index c9ff9b5fc..318419784 100644 --- a/frontend/api/class.ApiLogin.php +++ b/frontend/api/class.ApiLogin.php @@ -1187,7 +1187,7 @@ class ApiLogin // Preverimo ReCaptcha if (AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) { $recaptchaResponse = $this->data['g-recaptcha-response']; - $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $secret_captcha . '&response=' . $recaptchaResponse); + $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse); if (!strstr($requestReCaptcha, 'true')) { $error['invalid_recaptcha'] = '1'; diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module index d2c3cc9de..b751434cb 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module @@ -106,6 +106,8 @@ function prijava_1ka_theme() 'prijava_z_racuni_modal_block' => [ 'variables' => [ 'lang' => $lang, + 'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false), + 'url_google' => $url_google ] ] ]; diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig index 1f61d76c6..8914e5aea 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig @@ -1,5 +1,5 @@ {#{% if(prijavljen) %}#} -