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

Popravek za mysql 8 - po novem je "system" rezervirana beseda

Browse Source
This commit is contained in:
pero1203 2020-11-23 11:00:03 +01:00
parent e755d13e08
commit 5831aad30d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/classes/class.SurveyExportProfiles.php
View File

@ -256,7 +256,7 @@ class SurveyExportProfiles
if ($profileId == 0 ) { // seja - if ($profileId == 0 ) { // seja -
unset($_SESSION['variables_profile'][self::getSurveyId()]); unset($_SESSION['variables_profile'][self::getSurveyId()]);
} else { } else {
$deleteString = "DELETE FROM srv_variable_profiles WHERE id = '" . $profileId . "' AND system != '1'"; $deleteString = "DELETE FROM srv_variable_profiles WHERE id = '" . $profileId . "' AND `system` != '1'";
$sqlDelete = sisplet_query($deleteString); $sqlDelete = sisplet_query($deleteString);
} }

8
admin/survey/classes/class.SurveyMissingProfiles.php
View File

@ -52,7 +52,7 @@ class SurveyMissingProfiles
self :: addSystemProfiles(); self :: addSystemProfiles();
# preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array # preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array
$stringSelect = "SELECT * FROM srv_missing_profiles WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND system = 1) ORDER BY id"; $stringSelect = "SELECT * FROM srv_missing_profiles WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND `system` = 1) ORDER BY id";
$querySelect = sisplet_query($stringSelect); $querySelect = sisplet_query($stringSelect);
if (mysqli_num_rows($querySelect)) { if (mysqli_num_rows($querySelect)) {
@ -392,7 +392,7 @@ class SurveyMissingProfiles
if (isset($pid) && $pid != null) { if (isset($pid) && $pid != null) {
# ce mamo sistemski profil ga ne shranjujemo # ce mamo sistemski profil ga ne shranjujemo
$checkSelect = "SELECT * as cnt FROM srv_missing_profiles WHERE id = '".$pid."' and system = 1"; $checkSelect = "SELECT * as cnt FROM srv_missing_profiles WHERE id = '".$pid."' and `system` = 1";
$checkQry = sisplet_query($checkSelect); $checkQry = sisplet_query($checkSelect);
if (mysqli_num_rows($checkQry) > 0) { if (mysqli_num_rows($checkQry) > 0) {
return $pid; return $pid;
@ -419,7 +419,7 @@ class SurveyMissingProfiles
# imamo podatke, updejtamo profil v bazi (profili z id 1,2,3 so sitemski) # imamo podatke, updejtamo profil v bazi (profili z id 1,2,3 so sitemski)
if ($pid > 3) { if ($pid > 3) {
# shranimo morebitno spremembo nastavitve display_mv_type # shranimo morebitno spremembo nastavitve display_mv_type
$updateString = "UPDATE srv_missing_profiles SET display_mv_type='".$display_mv_type."', show_zerro='".$show_zerro."', merge_missing='".$merge_missing."' WHERE id='".$pid."' AND system = 0"; $updateString = "UPDATE srv_missing_profiles SET display_mv_type='".$display_mv_type."', show_zerro='".$show_zerro."', merge_missing='".$merge_missing."' WHERE id='".$pid."' AND `system` = 0";
$updatequery = sisplet_query($updateString); $updatequery = sisplet_query($updateString);
# najprej pobrišemo stare podatke za ta profil # najprej pobrišemo stare podatke za ta profil
@ -526,7 +526,7 @@ class SurveyMissingProfiles
# izbrišemo lahko samo nesistemske profile # izbrišemo lahko samo nesistemske profile
if (self::$profiles[$pid]['system'] != 1) { if (self::$profiles[$pid]['system'] != 1) {
# zaradi ključev se avtomatsko pobriše tudi: srv_missing_profiles_values # zaradi ključev se avtomatsko pobriše tudi: srv_missing_profiles_values
$sqlDelete = sisplet_query("DELETE FROM srv_missing_profiles WHERE id = '$pid' AND system != '1'"); $sqlDelete = sisplet_query("DELETE FROM srv_missing_profiles WHERE id = '$pid' AND `system` != '1'");
} }
} }

6
admin/survey/classes/class.SurveyStatusCasi.php
View File

@ -28,7 +28,7 @@ class SurveyStatusCasi
static function RefreshData() { static function RefreshData() {
# preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array # preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array
$stringSelect = "SELECT * FROM srv_status_casi WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND system =1) ORDER BY id"; $stringSelect = "SELECT * FROM srv_status_casi WHERE uid = '".self::getGlobalUserId()."' OR (uid = '0' AND `system` =1) ORDER BY id";
$querySelect = sisplet_query($stringSelect); $querySelect = sisplet_query($stringSelect);
while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) { while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) {
@ -330,8 +330,8 @@ class SurveyStatusCasi
static function Delete($pid) { static function Delete($pid) {
if ($pid != 1) { if ($pid != 1) {
$sqlDelete = sisplet_query("DELETE FROM srv_status_casi WHERE id = '$pid' AND system != '1'"); $sqlDelete = sisplet_query("DELETE FROM srv_status_casi WHERE id = '$pid' AND `system` != '1'");
print_r("DELETE FROM srv_status_casi WHERE id = '$pid' AND system != '1'"); print_r("DELETE FROM srv_status_casi WHERE id = '$pid' AND `system` != '1'");
} }
} }

6
admin/survey/classes/class.SurveyStatusProfiles.php
View File

@ -79,7 +79,7 @@ class SurveyStatusProfiles
self::$profiles[$_SESSION['statusProfile']['id']] = $_SESSION['statusProfile']; self::$profiles[$_SESSION['statusProfile']['id']] = $_SESSION['statusProfile'];
} }
# preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array # preberemo podatke vseh porfilov ki so na voljo in jih dodamo v array
$stringSelect = "SELECT * FROM srv_status_profile WHERE uid='".self::getGlobalUserId()."' OR ank_id = '".self::$sid."' OR (uid = '0' AND system =1) ORDER BY id"; $stringSelect = "SELECT * FROM srv_status_profile WHERE uid='".self::getGlobalUserId()."' OR ank_id = '".self::$sid."' OR (uid = '0' AND `system`=1) ORDER BY id";
$querySelect = sisplet_query($stringSelect); $querySelect = sisplet_query($stringSelect);
while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) { while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) {
@ -923,7 +923,7 @@ class SurveyStatusProfiles
} }
# izbrišemo lahko samo nesistemske profile # izbrišemo lahko samo nesistemske profile
if (self::$profiles[$pid]['system'] != 1) { if (self::$profiles[$pid]['system'] != 1) {
$sqlDelete = sisplet_query("DELETE FROM srv_status_profile WHERE id = '$pid' AND system != '1'"); $sqlDelete = sisplet_query("DELETE FROM srv_status_profile WHERE id = '$pid' AND `system` != '1'");
} }
self::setDefaultProfileId(); self::setDefaultProfileId();
@ -945,7 +945,7 @@ class SurveyStatusProfiles
# preimenujemo lahko samo nesistemske profile # preimenujemo lahko samo nesistemske profile
if (self::$profiles[$pid]['system'] != 1) if (self::$profiles[$pid]['system'] != 1)
{ {
$sqlRename = sisplet_query("UPDATE srv_status_profile SET name='$name' WHERE id = '$pid' AND system != '1'"); $sqlRename = sisplet_query("UPDATE srv_status_profile SET name='$name' WHERE id = '$pid' AND `system` != '1'");
} }
} }
} }