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

Compare commits

base: may:29c3fb448255ebf0df92279f8fcd6f8e3cd609b5
Branches Tags
may:2KA_dev
...
compare: may:747a6834c994a09ae5aa141f8104187e93a34a23
Branches Tags
may:2KA_dev

3 Commits
29c3fb4482 ... 747a6834c9

Author SHA1 Message Date
MAY
747a6834c9 Merge, dopolnjen opis 2023-02-14 10:10:13 +01:00
MAY
85a896fecb Merge branch '2KA_dev' of https://gitlab1.akson.si/mayd/2ka into 2KA_dev 
Združene spremembe.
 2023-02-14 10:09:00 +01:00
MAY
0ff2e2f614 Popravki: 
- checkcontroller: popravljen IF za prikaz elementov
- radiocheckboxselectcontroller: izgled kode
- MultiGridcontroller: popravljen bug, ko je bilo ob nevsebinskem
  odgovoru (ne vem, ne želim povedati) disablano odgovarjanje na ostale
	opcije (ni se dalo enablati)
 2023-02-14 10:06:23 +01:00
4 changed files with 28 additions and 14 deletions
Show Stats Expand all files Collapse all files

4
Spremembe.md
View File

@ -1,5 +1,9 @@
# SPREMEMBE, DOPOLNITVE
## Bugi
- odprabljen bug, ko je odgovor na "missing" blokiral spremembo nazaj na vsebinski odgovor
## Nujne security zadeve
- vklopil TLS v vseh CURLih
- vklopil TLS pri pošiljanju emailov

12
main/survey/app/Controllers/CheckController.php
View File

@ -197,13 +197,21 @@ class CheckController extends Controller
$sql4b = sisplet_query("SELECT * FROM srv_data_vrednost" . get('db_table') . " WHERE spr_id='$row[spr_id]' AND usr_id='" . get('usr_id') . "'");
if ($row['operator'] == 0 && mysqli_num_rows($sql3) == 0 && mysqli_num_rows($sql3b) == 0)
{
return false;
}
elseif ($row['operator'] == 0 && mysqli_num_rows($sql3) == 0 && mysqli_num_rows($sql3b) > 0 && mysqli_num_rows($sql4b) > 0)
{
return false;
}
elseif ($row['operator'] == 1 && mysqli_num_rows($sql3) > 0)
{
return false;
}
elseif ($row['operator'] == 1 && mysqli_num_rows($sql3b) > 0 && mysqli_num_rows($sql4b) == 0)
{
return false;
}
// multigrid
} elseif ($row2['tip'] == 6 || $row2['tip'] == 16) {
@ -683,9 +691,11 @@ class CheckController extends Controller
*/
public function check_captcha()
{
// s tem preverimo, ali gre za F2F terminal
global $data_export_ajax_access;
// Ce urejamo podatke v admin vmesniku ne preverjamo nicesar
if(isset($_GET['t']) && $_GET['t'] == 'postprocess' || get('grupa') == '0' || get('grupa') == ''){
if(isset($_GET['t']) && $_GET['t'] == 'postprocess' || get('grupa') == '0' || get('grupa') == '' || count($data_export_ajax_access) == 0){
return;
}

2
main/survey/app/Controllers/Vprasanja/MultigridController.php
View File

@ -351,7 +351,7 @@ class MultigridController extends Controller
echo '<td class="category '.$tabelaSmeski. $_checked.' ' . $cssAlign . '">';
# ni missing vrednost
echo '<label for="vrednost_' . $row1['id'] . '_grid_' . $value . '">';
echo '<input type="radio" ' . (!$hideName ? ' name="vrednost_' . $row1['id'] . '"' : '') . ' id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . $_checked . ($is_missing ? ' disabled' : '') . ' data-calculation="' . $srv_grids[$i]['variable'] . '" vre_id = '.$row1['id'].' onclick="checkChecked(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . '); customRadioTableSelect(' . $row1['id'] . ', ' . $value. ');">';
echo '<input type="radio" ' . (!$hideName ? ' name="vrednost_' . $row1['id'] . '"' : '') . ' id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . $_checked . ' data-calculation="' . $srv_grids[$i]['variable'] . '" vre_id = '.$row1['id'].' onclick="checkChecked(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . '); customRadioTableSelect(' . $row1['id'] . ', ' . $value. ');">';
if($row['enota'] == 11){
echo '<span class="enka-vizualna-skala siv-'.$row['grids'].$value.'"></span>';