diff options
| author | M.Gergo | 2020-09-02 21:02:17 +0200 |
|---|---|---|
| committer | M.Gergo | 2020-09-02 21:02:17 +0200 |
| commit | cf6a58003f47139501a2907f8a4bc400b23fda66 (patch) | |
| tree | fb7f9e17b609143987ca2f324e27c610886284a9 /mayor-orig/mayor-base/www/include/base | |
| parent | 9bfbb60898b55ba4e1bd50c052c7ec4aaafc1ff8 (diff) | |
| parent | 9044c44af70eff76d875137de553d5904e475f6d (diff) | |
| download | mayor-cf6a58003f47139501a2907f8a4bc400b23fda66.tar.gz mayor-cf6a58003f47139501a2907f8a4bc400b23fda66.zip | |
Merge branch 'MaYor-dev'
Diffstat (limited to 'mayor-orig/mayor-base/www/include/base')
| -rw-r--r-- | mayor-orig/mayor-base/www/include/base/mysql.php | 2 | ||||
| -rw-r--r-- | mayor-orig/mayor-base/www/include/base/rights.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mayor-orig/mayor-base/www/include/base/mysql.php b/mayor-orig/mayor-base/www/include/base/mysql.php index 12aeb771..819fdcd0 100644 --- a/mayor-orig/mayor-base/www/include/base/mysql.php +++ b/mayor-orig/mayor-base/www/include/base/mysql.php @@ -91,9 +91,11 @@ mysqli_set_charset($lr, "utf8"); mysqli_query($lr, "SET NAMES utf8"); mysqli_query($lr, "SET collation_connection='utf8_hungarian_ci'"); + mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))"); } else { mysql_query("SET NAMES utf8", $lr); mysql_query("SET collation_connection='utf8_hungarian_ci'", $lr); + mysql_query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", $lr); } } else { $_SESSION['alert'][] = "message:sql_select_db_failure:db_connect/${SET['fv']}:$modul:".$MYSQL_DATA[$modul]['db']; diff --git a/mayor-orig/mayor-base/www/include/base/rights.php b/mayor-orig/mayor-base/www/include/base/rights.php index dc6b7aa7..c30a927d 100644 --- a/mayor-orig/mayor-base/www/include/base/rights.php +++ b/mayor-orig/mayor-base/www/include/base/rights.php @@ -250,17 +250,20 @@ function validUser($sessionID,$policy,$skin='',$lang='') { } if (count($_POST)>0) { if (!empty($_POST['mayorToken'])) { + if ($page=='naplo'&&$sub=='tanev'&&$f=='targyBontasX') { + //skip check :( TODO!!!! if (hash_equals($_SESSION['mayorToken'], $_POST['mayorToken'])) { // OK, token regenerálás + visszakuldjuk az ETAG-ben $_SESSION['mayorToken'] = pseudoTokenGenerator(); } else { if ($_POST['action']!='') { /* Ha nincs action formváltozó, nincs szükség hibaüzenetre, a form nem módosít, de most... */ - $_SESSION['alert'][] = 'message:not_valid_form:pnu2'; + $_SESSION['alert'][] = 'message:not_valid_form:pnu2'.$page.$sub.$f; $_JSON['result'] = false; } unset($_POST['action']); unset($action); } + } } else { // klasszikus ellenőrzés, fallback echo 'FATAL ERROR 696'; die(); |