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

Popravek modula volitve - opozorilo pri piskotku

Browse Source
This commit is contained in:
pero1203 2021-04-09 08:43:03 +02:00
parent c1198a6ec6
commit b5bfd73c6d
3 changed files with 109 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
admin/survey/SurveyAdminSettings.php
View File

@ -471,63 +471,76 @@ class SurveyAdminSettings {
/*Piskotek*/ /*Piskotek*/
if ($_GET['a'] == 'piskot') { if ($_GET['a'] == 'piskot') {
echo '<fieldset style="position:relative">'; // Pri volitvah ne moremo popravljati nastavitev piskotka
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
echo '<div id="cookie_alert" class="google_yellow">';
echo '<span class="">'.$lang['srv_cookie_alert_title'].'</span>'; echo '<fieldset style="position:relative">';
echo '<span class="">'.$lang['srv_cookie_alert_1'].'</span>'; echo '<legend>' . $lang['srv_cookie'] . '</legend>';
echo '<span class="">'.$lang['srv_cookie_alert_2'].'</span>'; echo '<span class="red bold">'.$lang['srv_voting_no_cookie'].'</span>';
echo '<span class="">'.$lang['srv_cookie_alert'].'</span>'; echo '</fieldset>';
echo '</div>';
echo '</form>';
echo '<legend>' . $lang['srv_cookie'] . '</legend>';
return;
// Shrani piskotek za X casa }
echo '<span class="nastavitveSpan3 bold" ><label>' . $lang['srv_cookie'] . Help :: display('srv_cookie') .':</label></span>';
echo ' <label for="cookie_-1"><input type="radio" name="cookie" value="-1" id="cookie_-1"' . ($row['cookie'] == -1 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_-1'] . '</label>' . "\n\r"; echo '<fieldset style="position:relative">';
echo ' <label for="cookie_0"><input type="radio" name="cookie" value="0" id="cookie_0"' . ($row['cookie'] == 0 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_0'] . '</label>' . "\n\r";
echo ' <label for="cookie_1"><input type="radio" name="cookie" value="1" id="cookie_1"' . ($row['cookie'] == 1 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_1'] . '</label>' . "\n\r"; echo '<div id="cookie_alert" class="google_yellow">';
echo ' <label for="cookie_2"><input type="radio" name="cookie" value="2" id="cookie_2"' . ($row['cookie'] == 2 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_2'] . '</label>' . "\n\r"; echo '<span class="">'.$lang['srv_cookie_alert_title'].'</span>';
echo '<br/>'; echo '<span class="">'.$lang['srv_cookie_alert_1'].'</span>';
echo '<span class="">'.$lang['srv_cookie_alert_2'].'</span>';
// Ko se uporabnik vrne (zacne od zacetka/nadaljuje kjer je ostal) echo '<span class="">'.$lang['srv_cookie_alert'].'</span>';
echo '<span class="nastavitveSpan3 bold" ><label>' . $lang['srv_cookie_return'] . Help :: display('srv_cookie_return') . ':</label></span>'; echo '</div>';
echo ' <label for="cookie_return_0"><input type="radio" name="cookie_return" value="0" id="cookie_return_0"' . ($row['cookie_return'] == 0 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_return_start'] . '</label>' . "\n\r";
echo ' <div class="no-cookie"><label for="cookie_return_1"><input type="radio" name="cookie_return" value="1" id="cookie_return_1"' . ($row['cookie_return'] == 1 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_return_middle'] . '</label></div>' . "\n\r"; echo '<legend>' . $lang['srv_cookie'] . '</legend>';
echo '<br>';
// Shrani piskotek za X casa
// Ce je zakljucil lahko naknadno ureja svoje odgovore echo '<span class="nastavitveSpan3 bold" ><label>' . $lang['srv_cookie'] . Help :: display('srv_cookie') .':</label></span>';
echo '<div class="no-cookie no-cookie-return"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_return_finished'] . Help :: display('srv_return_finished') . ':</label></span>'; echo ' <label for="cookie_-1"><input type="radio" name="cookie" value="-1" id="cookie_-1"' . ($row['cookie'] == -1 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_-1'] . '</label>' . "\n\r";
echo ' <label for="return_finished_1"><input type="radio" name="return_finished" value="1" id="return_finished_1"' . ($row['return_finished'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_return_finished_yes'] . '</label>' . "\n\r"; echo ' <label for="cookie_0"><input type="radio" name="cookie" value="0" id="cookie_0"' . ($row['cookie'] == 0 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_0'] . '</label>' . "\n\r";
echo ' <label for="return_finished_0"><input type="radio" name="return_finished" value="0" id="return_finished_0"' . ($row['return_finished'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_return_finished_no'] . '</label></div>' . "\n\r"; echo ' <label for="cookie_1"><input type="radio" name="cookie" value="1" id="cookie_1"' . ($row['cookie'] == 1 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_1'] . '</label>' . "\n\r";
echo ' <label for="cookie_2"><input type="radio" name="cookie" value="2" id="cookie_2"' . ($row['cookie'] == 2 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_2'] . '</label>' . "\n\r";
echo '<br/>';
// Ko se uporabnik vrne (zacne od zacetka/nadaljuje kjer je ostal)
echo '<span class="nastavitveSpan3 bold" ><label>' . $lang['srv_cookie_return'] . Help :: display('srv_cookie_return') . ':</label></span>';
echo ' <label for="cookie_return_0"><input type="radio" name="cookie_return" value="0" id="cookie_return_0"' . ($row['cookie_return'] == 0 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_return_start'] . '</label>' . "\n\r";
echo ' <div class="no-cookie"><label for="cookie_return_1"><input type="radio" name="cookie_return" value="1" id="cookie_return_1"' . ($row['cookie_return'] == 1 ? ' checked="checked"' : '') . ' onclick="checkcookie();" />' . $lang['srv_cookie_return_middle'] . '</label></div>' . "\n\r";
echo '<br>';
// Ce je zakljucil lahko naknadno ureja svoje odgovore
echo '<div class="no-cookie no-cookie-return"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_return_finished'] . Help :: display('srv_return_finished') . ':</label></span>';
echo ' <label for="return_finished_1"><input type="radio" name="return_finished" value="1" id="return_finished_1"' . ($row['return_finished'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_return_finished_yes'] . '</label>' . "\n\r";
echo ' <label for="return_finished_0"><input type="radio" name="return_finished" value="0" id="return_finished_0"' . ($row['return_finished'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_return_finished_no'] . '</label></div>' . "\n\r";
echo '<br/>'; echo '<br/>';
// Nikoli ne more popravljati svojih odgovorov (tudi ce se npr. vrne na prejsnjo stran) // Nikoli ne more popravljati svojih odgovorov (tudi ce se npr. vrne na prejsnjo stran)
echo '<div class="no-subsequent-answers"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_subsequent_answers'] . Help :: display('srv_subsequent_answers') . ':</label></span>'; echo '<div class="no-subsequent-answers"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_subsequent_answers'] . Help :: display('srv_subsequent_answers') . ':</label></span>';
echo ' <label for="subsequent_answers_1"><input type="radio" name="subsequent_answers" value="1" id="subsequent_answers_1"' . ($row['subsequent_answers'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_subsequent_answers_yes'] . '</label>' . "\n\r"; echo ' <label for="subsequent_answers_1"><input type="radio" name="subsequent_answers" value="1" id="subsequent_answers_1"' . ($row['subsequent_answers'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_subsequent_answers_yes'] . '</label>' . "\n\r";
echo ' <label for="subsequent_answers_0"><input type="radio" name="subsequent_answers" value="0" id="subsequent_answers_0"' . ($row['subsequent_answers'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_subsequent_answers_no'] . '</label></div>' . "\n\r"; echo ' <label for="subsequent_answers_0"><input type="radio" name="subsequent_answers" value="0" id="subsequent_answers_0"' . ($row['subsequent_answers'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_subsequent_answers_no'] . '</label></div>' . "\n\r";
echo '<br/>'; echo '<br/>';
// Ce ni sprejel piskotka lahko/ne more nadaljevati // Ce ni sprejel piskotka lahko/ne more nadaljevati
echo '<div class="no-cookie"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_cookie_continue'] . Help :: display('srv_cookie_continue') . ':</label></span>'; echo '<div class="no-cookie"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_cookie_continue'] . Help :: display('srv_cookie_continue') . ':</label></span>';
echo ' <label for="cookie_continue_1"><input type="radio" name="cookie_continue" value="1" id="cookie_continue_1"' . ($row['cookie_continue'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_cookie_continue_yes'] . '</label>' . "\n\r"; echo ' <label for="cookie_continue_1"><input type="radio" name="cookie_continue" value="1" id="cookie_continue_1"' . ($row['cookie_continue'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_cookie_continue_yes'] . '</label>' . "\n\r";
echo ' <label for="cookie_continue_0"><input type="radio" name="cookie_continue" value="0" id="cookie_continue_0"' . ($row['cookie_continue'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_cookie_continue_no'] . '</label></div>' . "\n\r"; echo ' <label for="cookie_continue_0"><input type="radio" name="cookie_continue" value="0" id="cookie_continue_0"' . ($row['cookie_continue'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_cookie_continue_no'] . '</label></div>' . "\n\r";
echo '<br/>'; echo '<br/>';
echo '<br/>'; echo '<br/>';
// Prepoznaj respondenta // Prepoznaj respondenta
echo '<span class="nastavitveSpan3 bold" ><label>' . $lang['srv_user'] . Help :: display('srv_user_from_cms') . ':</label></span>'; echo '<span class="nastavitveSpan3 bold" ><label>' . $lang['srv_user'] . Help :: display('srv_user_from_cms') . ':</label></span>';
echo ' <label for="user_1"><input type="radio" name="user_from_cms" value="1" id="user_1"' . ($row['user_from_cms'] == 1 ? ' checked="checked"' : '') . ' onclick="javascript:checkcookie(); $(\'#user_1_email\').removeAttr(\'disabled\')" />' . $lang['srv_respondent'] . '</label>' . "\n\r"; echo ' <label for="user_1"><input type="radio" name="user_from_cms" value="1" id="user_1"' . ($row['user_from_cms'] == 1 ? ' checked="checked"' : '') . ' onclick="javascript:checkcookie(); $(\'#user_1_email\').removeAttr(\'disabled\')" />' . $lang['srv_respondent'] . '</label>' . "\n\r";
echo ' <label for="user_2"><input type="radio" name="user_from_cms" value="2" id="user_2"' . ($row['user_from_cms'] == 2 ? ' checked="checked"' : '') . ' onclick="javascript:checkcookie(); $(\'#user_1_email\').removeAttr(\'disabled\')" />' . $lang['srv_vnasalec'] . '</label>' . "\n\r"; echo ' <label for="user_2"><input type="radio" name="user_from_cms" value="2" id="user_2"' . ($row['user_from_cms'] == 2 ? ' checked="checked"' : '') . ' onclick="javascript:checkcookie(); $(\'#user_1_email\').removeAttr(\'disabled\')" />' . $lang['srv_vnasalec'] . '</label>' . "\n\r";
echo ' <label for="user_0"><input type="radio" name="user_from_cms" value="0" id="user_0"' . ($row['user_from_cms'] == 0 ? ' checked="checked"' : '') . ' onclick="javascript:checkcookie(); $(\'#user_1_email\').attr(\'disabled\', true); _user_from_cms(); " />' . $lang['no1'] . '</label>' . "\n\r"; echo ' <label for="user_0"><input type="radio" name="user_from_cms" value="0" id="user_0"' . ($row['user_from_cms'] == 0 ? ' checked="checked"' : '') . ' onclick="javascript:checkcookie(); $(\'#user_1_email\').attr(\'disabled\', true); _user_from_cms(); " />' . $lang['no1'] . '</label>' . "\n\r";
echo '<br/>'; echo '<br/>';
// Ob izpolnjevanju prikazi email // Ob izpolnjevanju prikazi email
echo '<div id="cms_email">'; echo '<div id="cms_email">';
echo ' <span class="nastavitveSpan3 bold" >&nbsp;</span><label>' . $lang['srv_user_cms_show'] . Help :: display('srv_user_from_cms_email') . ':</label>'; echo ' <span class="nastavitveSpan3 bold" >&nbsp;</span><label>' . $lang['srv_user_cms_show'] . Help :: display('srv_user_from_cms_email') . ':</label>';
echo ' <label for="user_1_email"><input type="checkbox" name="user_from_cms_email" value="1" id="user_1_email"' . ($row['user_from_cms_email'] == 1 ? ' checked="checked"' : '') . ' '.($row['user_from_cms']>0?'':' disabled="true" ').'/>' . $lang['srv_user_cms_email'] . '</label>' . "\n\r"; echo ' <label for="user_1_email"><input type="checkbox" name="user_from_cms_email" value="1" id="user_1_email"' . ($row['user_from_cms_email'] == 1 ? ' checked="checked"' : '') . ' '.($row['user_from_cms']>0?'':' disabled="true" ').'/>' . $lang['srv_user_cms_email'] . '</label>' . "\n\r";
echo '</div>'; echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
@ -545,54 +558,54 @@ class SurveyAdminSettings {
// For modul maza, show all cookie settings // For modul maza, show all cookie settings
$isMaza = (SurveyInfo::checkSurveyModule('maza')) ? 1 : 0; $isMaza = (SurveyInfo::checkSurveyModule('maza')) ? 1 : 0;
?> <script> ?> <script>
function checkcookie () { function checkcookie () {
if ($('input[name=cookie]:checked').val() == '-1' && $('input[name=user_from_cms]:checked').val() == '0' && <?echo $row['user_base'];?> != 1 && <?echo $isMaza;?> != 1) { if ($('input[name=cookie]:checked').val() == '-1' && $('input[name=user_from_cms]:checked').val() == '0' && <?echo $row['user_base'];?> != 1 && <?echo $isMaza;?> != 1) {
$('input[name=cookie_return]').attr('disabled', true); $('input[name=cookie_return]').attr('disabled', true);
$('input[name=return_finished]').attr('disabled', true); $('input[name=return_finished]').attr('disabled', true);
$('.no-cookie').css('visibility', 'hidden'); $('.no-cookie').css('visibility', 'hidden');
} }
else { else {
$('input[name=cookie_return]').attr('disabled', false); $('input[name=cookie_return]').attr('disabled', false);
$('input[name=return_finished]').attr('disabled', false); $('input[name=return_finished]').attr('disabled', false);
$('.no-cookie').css('visibility', 'visible'); $('.no-cookie').css('visibility', 'visible');
} }
if ( $('input[name=cookie_return]:checked').val() == 1 ) { if ( $('input[name=cookie_return]:checked').val() == 1 ) {
$('.no-cookie-return').css('visibility', 'hidden'); $('.no-cookie-return').css('visibility', 'hidden');
} }
else { else {
$('.no-cookie-return').css('visibility', 'visible'); $('.no-cookie-return').css('visibility', 'visible');
} }
if ( $('input[name=user_from_cms]:checked').val() == 0 ) { if ( $('input[name=user_from_cms]:checked').val() == 0 ) {
$('#cms_email').css('visibility', 'hidden'); $('#cms_email').css('visibility', 'hidden');
} }
else { else {
$('#cms_email').css('visibility', 'visible'); $('#cms_email').css('visibility', 'visible');
} }
if ( $('input[name=user_from_cms]:checked').val() == 2 ) { if ( $('input[name=user_from_cms]:checked').val() == 2 ) {
$('#vnos_modul').show(); $('#vnos_modul').show();
} }
else { else {
$('#vnos_modul').hide(); $('#vnos_modul').hide();
} }
} }
checkcookie(); checkcookie();
cookie_alert(); cookie_alert();
</script> <? </script> <?
$stringDostopAvtor = "SELECT count(*) as isAvtor FROM srv_dostop WHERE ank_id = '" . $this->anketa . "' AND (uid='" . $global_user_id . "' OR uid IN (SELECT user FROM srv_dostop_manage WHERE manager='$global_user_id' ))"; $stringDostopAvtor = "SELECT count(*) as isAvtor FROM srv_dostop WHERE ank_id = '" . $this->anketa . "' AND (uid='" . $global_user_id . "' OR uid IN (SELECT user FROM srv_dostop_manage WHERE manager='$global_user_id' ))";
$sqlDostopAvtor = sisplet_query($stringDostopAvtor); $sqlDostopAvtor = sisplet_query($stringDostopAvtor);
$rowDostopAvtor = mysqli_fetch_assoc($sqlDostopAvtor); $rowDostopAvtor = mysqli_fetch_assoc($sqlDostopAvtor);
$avtorRow = SurveyInfo::getInstance()->getSurveyRow(); $avtorRow = SurveyInfo::getInstance()->getSurveyRow();
echo '<br/>'; echo '<br/>';
@ -633,15 +646,15 @@ class SurveyAdminSettings {
echo '</fieldset>'; echo '</fieldset>';
echo '<br/>'; echo '<br/>';
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
global $global_user_id; global $global_user_id;
$userAccess = UserAccess::getInstance($global_user_id); $userAccess = UserAccess::getInstance($global_user_id);
// dodajanje gesel za anketo // dodajanje gesel za anketo
echo '<fieldset><legend>'.$lang['srv_password'].' '.Help::display('srv_dostop_password').'</legend>'; echo '<fieldset><legend>'.$lang['srv_password'].' '.Help::display('srv_dostop_password').'</legend>';
if(!$userAccess->checkUserAccess($what='password')){ if(!$userAccess->checkUserAccess($what='password')){
$userAccess->displayNoAccess($what='password'); $userAccess->displayNoAccess($what='password');

3
lang/1.php
View File

@ -3117,7 +3117,8 @@ $lang = array (
"srv_voting_invitations2" => "vmesniku za pošiljanje vabil", "srv_voting_invitations2" => "vmesniku za pošiljanje vabil",
"srv_voting_warning" => "Vabila so individualizirana zgolj za namen pošiljanja vabil. Nastavitev vabil ni mogoče spreminjati.<br>Ko so vabila poslana, povezovanje med elektronskim naslovom in odgovori respondenta ni mogoče.", "srv_voting_warning" => "Vabila so individualizirana zgolj za namen pošiljanja vabil. Nastavitev vabil ni mogoče spreminjati.<br>Ko so vabila poslana, povezovanje med elektronskim naslovom in odgovori respondenta ni mogoče.",
"srv_voting_warning_paradata" => "Ker ste pošiljali vabila v anketi z vklopljenim modulom Volitve, teh nastavitev ne morete več spreminjati.", "srv_voting_warning_paradata" => "Ker ste pošiljali vabila v anketi z vklopljenim modulom Volitve, teh nastavitev ne morete več spreminjati.",
"srv_voting_no_duplicates" => "Prikazani so samo elektronski naslovi, na katere vabilo še ni bilo poslano.", "srv_voting_no_duplicates" => "Prikazani so samo elektronski naslovi, na katere vabilo še ni bilo poslano. Če večkrat pošiljate na iste elektronske naslove, se vsak vnos istega prejemnika zabeleži kot nov vnos.",
"srv_voting_no_cookie" => "Ker ste pošiljali vabila v anketi z vklopljenim modulom Volitve, teh nastavitev ne morete spreminjati.",
"srv_advanced_paradata" => "Napredni parapodatki", "srv_advanced_paradata" => "Napredni parapodatki",
"srv_advanced_paradata_collect_post_time" => "Beleži \"post time\"", "srv_advanced_paradata_collect_post_time" => "Beleži \"post time\"",
"srv_json_survey_export" => "JSON izvoz ankete", "srv_json_survey_export" => "JSON izvoz ankete",

3
lang/2.php
View File

@ -3089,7 +3089,8 @@ $lang = array (
"srv_voting_invitations2" => "Email invitations interface", "srv_voting_invitations2" => "Email invitations interface",
"srv_voting_warning" => "Invitations are individualized for the purpose of sending invitations only. Invitation settings cannot be changed.<br> Once the invitations are sent, the link between the e-mail address and the respondent's answers is not possible.", "srv_voting_warning" => "Invitations are individualized for the purpose of sending invitations only. Invitation settings cannot be changed.<br> Once the invitations are sent, the link between the e-mail address and the respondent's answers is not possible.",
"srv_voting_warning_paradata" => "Because you sent email invitations with the Voting module turned on, you can no longer change these settings.", "srv_voting_warning_paradata" => "Because you sent email invitations with the Voting module turned on, you can no longer change these settings.",
"srv_voting_no_duplicates" => "Only email addresses to which the invitation has not yet been sent are displayed.", "srv_voting_no_duplicates" => "Only email addresses to which the invitation has not yet been sent are displayed. If you send to the same email address more than once, each entry from the same recipient is recorded as a new entry. ",
"srv_voting_no_cookie" => "Because you sent email invitations with the Voting module turned on, you can't change these settings.",
"srv_advanced_paradata" => "Advanced paradata", "srv_advanced_paradata" => "Advanced paradata",
"srv_advanced_paradata_collect_post_time" => "Collect \"post time\"", "srv_advanced_paradata_collect_post_time" => "Collect \"post time\"",
"srv_json_survey_export" => "JSON survey export", "srv_json_survey_export" => "JSON survey export",