';
+
+ // Preverimo ce je vklopljen modul za volitve - potem ne pustimo nobenih preklopov
+ $voting_disabled = '';
+ if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
+ $voting_disabled = ' disabled';
+ }
$individual = (int)$this->surveySettings['individual_invitation'];
@@ -7763,8 +7924,8 @@ class SurveyInvitationsNew {
echo ' '.Help::display('srv_user_base_individual_invitaition_note2').' ';
else
echo ' '.Help::display('srv_user_base_individual_invitaition_note').' ';
- echo '
';
- echo '
';
+ echo '
';
+ echo '
';
echo '';
// Ce niso indvidualizirana imamo samo nacin posiljanja
@@ -7773,8 +7934,8 @@ class SurveyInvitationsNew {
// Nacin posiljanja (email, posta, sms...)
echo '
';
echo '';
- echo '';
- echo '';
+ echo '';
+ echo '';
echo '
';
// Nacin dokumentiranja (posta, sms, drugo)
@@ -7782,9 +7943,9 @@ class SurveyInvitationsNew {
$noEmailingType = SurveySession::get('inv_noEmailing_type');
echo '
';
echo '';
- echo '';
- echo '';
- echo '';
+ echo '';
+ echo '';
+ echo '';
echo '
';
}
}
@@ -7794,8 +7955,8 @@ class SurveyInvitationsNew {
// Nacin posiljanja (email, posta, sms...)
echo '
';
echo '';
- echo '';
- echo '';
+ echo '';
+ echo '';
echo '
';
// Nacin dokumentiranja (posta, sms, drugo)
@@ -7803,9 +7964,9 @@ class SurveyInvitationsNew {
$noEmailingType = SurveySession::get('inv_noEmailing_type');
echo '
';
echo '';
- echo '';
- echo '';
- echo '';
+ echo '';
+ echo '';
+ echo '';
echo '
';
}
@@ -7813,8 +7974,8 @@ class SurveyInvitationsNew {
if($noEmailing != 1){
echo '
';
echo '';
- echo '';
- echo '';
+ echo '';
+ echo '';
echo '
';
}
@@ -7834,7 +7995,7 @@ class SurveyInvitationsNew {
echo '
';
echo '';
- echo '';
+ echo '';
echo '
';
if($row['usercode_skip'] > 0){
echo '
';
diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php
index 31bd509fe..fd0b0ea2b 100644
--- a/main/survey/app/Controllers/InitClass.php
+++ b/main/survey/app/Controllers/InitClass.php
@@ -800,23 +800,26 @@ class InitClass extends Controller
if (!$sql2) echo mysqli_error($GLOBALS['connect_db']);
$row2 = mysqli_fetch_array($sql2);
- if (mysqli_num_rows($sql2) > 0) { // pravilna koda
+ // Pravilna koda
+ if (mysqli_num_rows($sql2) > 0) {
- // Dodatno preverimo ce koda se ni potekla
- $sqlC = sisplet_query("SELECT * FROM srv_invitations_recipients WHERE ank_id='".get('anketa')."' AND TRIM(password)='".$usercode."' AND DATE(NOW())>DATE(date_expired) AND date_expired!='0000-00-00 00:00:00'");
- if(mysqli_num_rows($sqlC) > 0){
- Display::getInstance()->displayNapaka(self::$lang['srv_expiredcode']);
- die();
- }
-
- $rand = $row2['cookie'];
+ // Ce imamo vklopljen modul za volitve preskocimo kar nekaj korakov (anonimizacija)
+ if(!SurveyInfo::checkSurveyModule('voting')){
- # nastavimo še da je uporabnik odgovoril na anketo za nov način e-mail vabil
- $sqlString = "UPDATE srv_invitations_recipients SET responded = '1', date_responded = NOW() WHERE ank_id='" . get('anketa') . "' AND TRIM(password) ='$usercode' AND responded = '0'";
- sisplet_query($sqlString);
+ // Dodatno preverimo ce koda se ni potekla
+ $sqlC = sisplet_query("SELECT * FROM srv_invitations_recipients WHERE ank_id='".get('anketa')."' AND TRIM(password)='".$usercode."' AND DATE(NOW())>DATE(date_expired) AND date_expired!='0000-00-00 00:00:00'");
+ if(mysqli_num_rows($sqlC) > 0){
+ Display::getInstance()->displayNapaka(self::$lang['srv_expiredcode']);
+ die();
+ }
- sisplet_query("COMMIT");
+ # nastavimo še da je uporabnik odgovoril na anketo za nov način e-mail vabil
+ sisplet_query("UPDATE srv_invitations_recipients SET responded = '1', date_responded = NOW() WHERE ank_id='" . get('anketa') . "' AND TRIM(password) ='$usercode' AND responded = '0'");
+ sisplet_query("COMMIT");
+ }
+
+ $rand = $row2['cookie'];
$this->set_cookie('survey-' . get('anketa'), $rand, $this->expire);
@@ -1199,12 +1202,16 @@ class InitClass extends Controller
}
# dodamo še tracking arhivov vabil
if (get('user_inv_archive') > 0 && $inv_res_id > 0) {
+
# ignoriramo podvojene kluče
- $updateString = "INSERT IGNORE INTO srv_invitations_tracking (inv_arch_id, time_insert, res_id, status) VALUES ('" . (int)get('user_inv_archive') . "',NOW(),'$inv_res_id','$status')";
-
- $s = sisplet_query($updateString);
+ $s = sisplet_query("INSERT IGNORE INTO srv_invitations_tracking
+ (inv_arch_id, time_insert, res_id, status)
+ VALUES
+ ('" . (int)get('user_inv_archive') . "',NOW(),'$inv_res_id','$status')
+ ");
if (!$s) echo mysqli_error($GLOBALS['connect_db']);
- } else {
+ }
+ else {
}
# potrebno bo osvežit seznam anket