Popravek evalvacije strani - bug zaradi uvedbe hasha anket

This commit is contained in:
pero1203 2021-10-20 10:00:10 +02:00
parent 41bc7f1a08
commit 29388cba65
7 changed files with 11 additions and 10 deletions

View File

@ -5406,7 +5406,7 @@ class SurveyAdminAjax {
if (mysqli_num_rows($sql) > 0) $add = false; if (mysqli_num_rows($sql) > 0) $add = false;
if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
$link = 'main/survey/uporabnost.php?anketa=' . $anketa ; $link = 'main/survey/uporabnost.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() ;
else else
$link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash(); $link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash();

View File

@ -3524,7 +3524,7 @@ class ApiSurvey {
$add = false; $add = false;
if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
$link = 'main/survey/uporabnost.php?anketa=' . $anketa . '&skupina=' . $vre_id; $link = 'main/survey/uporabnost.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
else else
$link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id; $link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
@ -3631,7 +3631,7 @@ class ApiSurvey {
$add = false; $add = false;
if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
$link = 'main/survey/uporabnost.php?anketa=' . $anketa . '&skupina=' . $vre_id; $link = 'main/survey/uporabnost.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
else else
$link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id; $link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;

View File

@ -302,7 +302,7 @@ class Library {
// nova anketa kot template iz knjiznice // nova anketa kot template iz knjiznice
echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> <span class="library_item_setting_text">'.$lang['srv_anketacopy'].'</span></a> '; echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> <span class="library_item_setting_text">'.$lang['srv_anketacopy'].'</span></a> ';
if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> '; echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
else else
echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> '; echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
@ -321,7 +321,7 @@ class Library {
} }
else { else {
if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>'; echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
else else
echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>'; echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
@ -493,7 +493,7 @@ class Library {
// Preview // Preview
if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> '; echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
else else
echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> '; echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';

View File

@ -667,7 +667,7 @@ class SurveyInfo
} }
else { else {
if (self::checkSurveyModule('uporabnost') && $uporabnost == true) // na redirectih pa v form action ne sme it na uporabnost (ker se odpira znotraj frama) if (self::checkSurveyModule('uporabnost') && $uporabnost == true) // na redirectih pa v form action ne sme it na uporabnost (ker se odpira znotraj frama)
$link = $site_url.'main/survey/uporabnost.php?anketa=' . $anketa ; $link = $site_url.'main/survey/uporabnost.php?anketa=' . $anketa_string;
else else
$link = $site_url.'a/' . $anketa_string ; $link = $site_url.'a/' . $anketa_string ;
} }

View File

@ -284,7 +284,7 @@ class SurveySkupine {
if (strlen($nice_url) < 3) $add = false; if (strlen($nice_url) < 3) $add = false;
if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
$link = 'main/survey/uporabnost.php?anketa='.$anketa.'&skupina='.$vre_id; $link = 'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
else else
$link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id; $link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;

View File

@ -823,7 +823,7 @@ class EvoliForm {
if (strlen($nice_url) < 3) $add = false; if (strlen($nice_url) < 3) $add = false;
if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost')) if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
$link = 'main/survey/uporabnost.php?anketa='.$anketa.'&skupina='.$vre_id; $link = 'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
else else
$link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id; $link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;

View File

@ -14,7 +14,8 @@ echo ' <title>OneClick Survey</title>'."\n\r";
echo ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n\r"; echo ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n\r";
echo '</head>'; echo '</head>';
$anketa = $_GET['anketa']; $anketa_hash = $_GET['anketa'];
$anketa = getSurveyIdFromHash($anketa_hash);
$sql = sisplet_query("SELECT uporabnost_link FROM srv_anketa WHERE id = '$anketa'"); $sql = sisplet_query("SELECT uporabnost_link FROM srv_anketa WHERE id = '$anketa'");
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);