diff --git a/utils/1kaUtils/1ka_ankete_deactive_v2.php b/utils/1kaUtils/1ka_ankete_deactive_v2.php
deleted file mode 100644
index 1c9f1b48f..000000000
--- a/utils/1kaUtils/1ka_ankete_deactive_v2.php
+++ /dev/null
@@ -1,185 +0,0 @@
- '0'
- AND db_table = '1'
- AND edit_time < NOW() - INTERVAL 3 MONTH
- AND expire < NOW() - INTERVAL 3 MONTH
- LIMIT 200
- ");
-if (!$sql) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-echo mysqli_num_rows($sql).'
';
-while ($row = mysqli_fetch_array($sql)) {
-
- $s = sisplet_query("START TRANSACTION");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- echo $row['id'].'
';
-
- // srv_data_grid
- $sql1 = sisplet_query("SELECT grid.*
- FROM srv_data_grid_active grid, srv_spremenljivka s, srv_grupa g
- WHERE grid.spr_id = s.id
- AND s.gru_id = g.id
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
- $values = "";
- $i = 0;
- while ($row1 = mysqli_fetch_assoc($sql1)) {
-
- if ($values != "") $values .= ", ";
- $vals = "";
- foreach ($row1 AS $key => $val) {
- if ($vals != "") $vals .= ", ";
-
- if ($val != null)
- $vals .= "'$val'";
- else
- $vals .= "NULL";
- }
-
- $values .= "($vals)";
-
- $loop_id = $row1['loop_id'] == null ? " IS NULL" : " = '".$row1['loop_id']."'";
-
- $query = "DELETE FROM srv_data_grid_active WHERE spr_id='$row1[spr_id]' AND vre_id='$row1[vre_id]' AND usr_id='$row1[usr_id]' AND loop_id $loop_id";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 111 ('.$query.')
'; die(); }
-
- // force mysql query
- if ($i++ >= 500) {
- if ($values != "") {
- $query = "INSERT INTO srv_data_grid VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 112a ('.$query.')
'; die(); }
- }
- $values = "";
- $i = 0;
- }
-
- }
-
- if ($values != "") {
- $query = "INSERT INTO srv_data_grid VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 112 ('.$query.')
'; die(); }
- }
-
-
-
- // srv_data_vrednost
- $sql1 = sisplet_query("SELECT v.*
- FROM srv_data_vrednost_active v, srv_spremenljivka s, srv_grupa g
- WHERE v.spr_id = s.id
- AND s.gru_id = g.id
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
- $values = "";
- $i = 0;
- while ($row1 = mysqli_fetch_assoc($sql1)) {
-
- if ($values != "") $values .= ", ";
- $vals = "";
- foreach ($row1 AS $key => $val) {
- if ($vals != "") $vals .= ", ";
-
- if ($val != null)
- $vals .= "'$val'";
- else
- $vals .= "NULL";
- }
-
- $values .= "($vals)";
-
- $loop_id = $row1['loop_id'] == null ? " IS NULL" : " = '".$row1['loop_id']."'";
-
- $query = "DELETE FROM srv_data_vrednost_active WHERE spr_id='$row1[spr_id]' AND vre_id='$row1[vre_id]' AND usr_id='$row1[usr_id]' AND loop_id $loop_id";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
- // force mysql query
- if ($i++ >= 500) {
- if ($values != "") {
- $query = "INSERT INTO srv_data_vrednost VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 114a ('.$query.')
'; die(); }
- }
- $values = "";
- $i = 0;
- }
- }
-
- if ($values != "") {
- $query = "INSERT INTO srv_data_vrednost VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 114 ('.$query.')
'; die(); }
- }
-
-
- // srv_user_grupa
-
- $sql1 = sisplet_query("SELECT grupa.*
- FROM srv_user_grupa_active grupa, srv_grupa g
- WHERE grupa.gru_id = g.id
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
- $values = "";
- $i = 0;
- while ($row1 = mysqli_fetch_assoc($sql1)) {
-
- if ($values != "") $values .= ", ";
- $vals = "";
- foreach ($row1 AS $key => $val) {
- if ($vals != "") $vals .= ", ";
- $vals .= "'$val'";
- }
-
- $values .= "($vals)";
-
- $query = "DELETE FROM srv_user_grupa_active WHERE gru_id='$row1[gru_id]' AND usr_id='$row1[usr_id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 115 ('.$query.')
'; die(); }
-
- // force mysql query
- if ($i++ >= 500) {
- if ($values != "") {
- $query = "INSERT INTO srv_user_grupa VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 116a ('.$query.')
'; die(); }
- }
- $values = "";
- $i = 0;
- }
- }
-
- if ($values != "") {
- $query = "INSERT INTO srv_user_grupa VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 116 ('.$query.')
'; die(); }
- }
-
- $s = sisplet_query("UPDATE srv_anketa SET db_table = '0' WHERE id = '$row[id]'");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- //$s = sisplet_query("ROLLBACK");
- $s = sisplet_query("COMMIT");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- flush(); @ob_flush();
-
-}
-
-?>
\ No newline at end of file
diff --git a/utils/1kaUtils/1ka_ankete_deactive_v2_part2.php b/utils/1kaUtils/1ka_ankete_deactive_v2_part2.php
deleted file mode 100644
index 3943ba9c9..000000000
--- a/utils/1kaUtils/1ka_ankete_deactive_v2_part2.php
+++ /dev/null
@@ -1,199 +0,0 @@
- '0'
- AND db_table = '1'
- AND id > '".$first_id."'
- LIMIT 200
- ");
-
-if (!$sql) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-echo mysqli_num_rows($sql).'
';
-while ($row = mysqli_fetch_array($sql)) {
-
- $s = sisplet_query("START TRANSACTION");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- echo $row['id'].'
';
-
-
-
-
- // srv_data_text
- $sql1 = sisplet_query("INSERT INTO srv_data_text_active (spr_id, vre_id, text, text2, usr_id, loop_id)
- SELECT d2.spr_id, d2.vre_id, d2.text, d2.text2, d2.usr_id, d2.loop_id
- FROM srv_data_text d2, srv_spremenljivka s, srv_grupa g
- WHERE d2.spr_id = s.id
- AND s.gru_id = g.id
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- $query = "DELETE d
- FROM srv_data_text d, srv_spremenljivka s, srv_grupa g
- WHERE d.spr_id = s.id
- AND s.gru_id = g.id
- AND g.ank_id = '$row[id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
-
- // Se dodatno kopiranje za komentarje (kjer je spr_id=0)
- $sql1 = sisplet_query("INSERT INTO srv_data_text_active (spr_id, vre_id, text, text2, usr_id, loop_id)
- SELECT d2.spr_id, d2.vre_id, d2.text, d2.text2, d2.usr_id, d2.loop_id
- FROM srv_data_text d2, srv_spremenljivka s, srv_grupa g
- WHERE d2.spr_id = '0'
- AND d2.vre_id = s.id AND d2.vre_id > '0'
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- $query = "DELETE d
- FROM srv_data_text d, srv_spremenljivka s, srv_grupa g
- WHERE d.spr_id = '0'
- AND d.vre_id = s.id AND d.vre_id > '0'
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
-
-
-
-
- // srv_data_textgrid
- $sql1 = sisplet_query("INSERT INTO srv_data_textgrid_active (spr_id, vre_id, usr_id, grd_id, text, loop_id)
- SELECT d2.spr_id, d2.vre_id, d2.usr_id, d2.grd_id, d2.text, d2.loop_id
- FROM srv_data_textgrid d2, srv_spremenljivka s, srv_grupa g
- WHERE d2.spr_id = s.id
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- $query = "DELETE d
- FROM srv_data_textgrid d, srv_spremenljivka s, srv_grupa g
- WHERE d.spr_id = s.id
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
- // Se dodatno za kombinirane tabele
- $sql1 = sisplet_query("INSERT INTO srv_data_textgrid_active (spr_id, vre_id, usr_id, grd_id, text, loop_id)
- SELECT d2.spr_id, d2.vre_id, d2.usr_id, d2.grd_id, d2.text, d2.loop_id
- FROM srv_data_textgrid d2, srv_spremenljivka s, srv_grupa g, srv_grid_multiple m
- WHERE d2.spr_id = m.spr_id AND m.parent=s.id
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- $query = "DELETE d
- FROM srv_data_textgrid d, srv_spremenljivka s, srv_grupa g, srv_grid_multiple m
- WHERE d.spr_id = m.spr_id AND m.parent=s.id
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
-
-
-
-
- // srv_data_checkgrid
- $sql1 = sisplet_query("SELECT grid.*
- FROM srv_data_checkgrid grid, srv_spremenljivka s, srv_grupa g
- WHERE grid.spr_id = s.id
- AND s.gru_id = g.id
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
- $values = "";
- $i = 0;
- while ($row1 = mysqli_fetch_assoc($sql1)) {
-
- if ($values != "") $values .= ", ";
- $vals = "";
- foreach ($row1 AS $key => $val) {
- if ($vals != "") $vals .= ", ";
-
- if ($val != null)
- $vals .= "'$val'";
- else
- $vals .= "NULL";
- }
-
- $values .= "($vals)";
-
- $loop_id = $row1['loop_id'] == null ? " IS NULL" : " = '".$row1['loop_id']."'";
-
- $query = "DELETE FROM srv_data_checkgrid WHERE spr_id='$row1[spr_id]' AND vre_id='$row1[vre_id]' AND usr_id='$row1[usr_id]' AND loop_id $loop_id";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 111 ('.$query.')
'; die(); }
-
- // force mysql query
- if ($i++ >= 500) {
- if ($values != "") {
- $query = "INSERT INTO srv_data_checkgrid_active VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 112a ('.$query.')
'; die(); }
- }
- $values = "";
- $i = 0;
- }
- }
-
- if ($values != "") {
- $query = "INSERT INTO srv_data_checkgrid_active VALUES $values";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 112 ('.$query.')
'; die(); }
- }
-
- // Se dodatno za kombinirane tabele
- $sql1 = sisplet_query("INSERT INTO srv_data_checkgrid_active (spr_id, vre_id, usr_id, grd_id, loop_id)
- SELECT d2.spr_id, d2.vre_id, d2.usr_id, d2.grd_id, d2.loop_id
- FROM srv_data_checkgrid d2, srv_spremenljivka s, srv_grupa g, srv_grid_multiple m
- WHERE d2.spr_id = m.spr_id AND m.parent=s.id
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- $query = "DELETE d
- FROM srv_data_checkgrid d, srv_spremenljivka s, srv_grupa g, srv_grid_multiple m
- WHERE d.spr_id = m.spr_id AND m.parent=s.id
- AND s.gru_id = g.id AND s.gru_id > '0'
- AND g.ank_id = '$row[id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
-
-
- // Ko gremo prvic cez ne popravljamo tega
- /*$s = sisplet_query("UPDATE srv_anketa SET db_table = '0' WHERE id = '$row[id]'");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }*/
-
- //$s = sisplet_query("ROLLBACK");
- $s = sisplet_query("COMMIT");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- flush(); @ob_flush();
-}
-
-?>
\ No newline at end of file
diff --git a/utils/1kaUtils/1ka_ankete_deactive_v2_part3.php b/utils/1kaUtils/1ka_ankete_deactive_v2_part3.php
deleted file mode 100644
index a6760c5da..000000000
--- a/utils/1kaUtils/1ka_ankete_deactive_v2_part3.php
+++ /dev/null
@@ -1,59 +0,0 @@
- '0'
- AND db_table = '1'
- AND id > '".$first_id."'
- LIMIT 200
- ");
-
-if (!$sql) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-echo mysqli_num_rows($sql).'
';
-while ($row = mysqli_fetch_array($sql)) {
-
- $s = sisplet_query("START TRANSACTION");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- echo $row['id'].'
';
-
-
- // srv_tracking
- $sql1 = sisplet_query("INSERT INTO srv_tracking_active (`ank_id`, `datetime`, `ip`, `user`, `get`, `post`, `status`, `time_seconds`)
- SELECT d2.ank_id, d2.datetime, d2.ip, d2.user, d2.get, d2.post, d2.status, d2.time_seconds
- FROM srv_tracking d2
- WHERE d2.ank_id = '$row[id]'
- ");
- if (!$sql1) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- $query = "DELETE FROM srv_tracking WHERE ank_id = '$row[id]'";
- $s = sisplet_query($query);
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']).' 113 ('.$query.')
'; die(); }
-
-
-
- // Ko gremo prvic cez ne popravljamo tega
- /*$s = sisplet_query("UPDATE srv_anketa SET db_table = '0' WHERE id = '$row[id]'");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }*/
-
- //$s = sisplet_query("ROLLBACK");
- $s = sisplet_query("COMMIT");
- if (!$s) { echo mysqli_error($GLOBALS['connect_db']); die(); }
-
- flush(); @ob_flush();
-}
-
-?>
\ No newline at end of file
diff --git a/utils/1kaUtils/1ka_izvoz_hierarhije.php b/utils/1kaUtils/1ka_izvoz_hierarhije.php
deleted file mode 100644
index 359829863..000000000
--- a/utils/1kaUtils/1ka_izvoz_hierarhije.php
+++ /dev/null
@@ -1,11 +0,0 @@
-';
+
+ ob_end_flush();
+
+}
+
+
+/*header('Content-Type: application/excel');
+header('Content-Disposition: attachment; filename="paradata_device_'.$year.'.csv"');
+
+$fp = fopen('php://output', 'w');
+foreach($data as $line) {
+ //fputcsv($fp, $line, ',');
+ fputcsv($fp, $line, ';');
+}
+fclose($fp);*/
+
+
+
+/*foreach($data as $line) {
+ echo implode($line, ';');
+ echo '
';
+}*/
+