adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 17:53:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #996 escape word "groups" in SQL queries, new reserved word with MySQL 8

Browse Source
This commit is contained in:
plegall
2019-06-28 18:07:53 +02:00
parent 0ef2193471
commit c1eecab364
12 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions/pwg.groups.php
+8 -8
View File
@@ -30,7 +30,7 @@ function ws_groups_getList($params, &$service)
$query = '
SELECT
g.*, COUNT(user_id) AS nb_users
FROM '. GROUPS_TABLE .' AS g
FROM `'. GROUPS_TABLE .'` AS g
LEFT JOIN '. USER_GROUP_TABLE .' AS ug
ON ug.group_id = g.id
WHERE '. implode(' AND ', $where_clauses) .'
@@ -66,7 +66,7 @@ function ws_groups_add($params, &$service)
// is the name not already used ?
$query = '
SELECT COUNT(*)
FROM '.GROUPS_TABLE.'
FROM `'.GROUPS_TABLE.'`
WHERE name = \''.$params['name'].'\'
;';
list($count) = pwg_db_fetch_row(pwg_query($query));
@@ -124,7 +124,7 @@ DELETE
$query = '
SELECT id, name
FROM '. GROUPS_TABLE .'
FROM `'. GROUPS_TABLE .'`
WHERE id IN('. $group_id_string .')
;';
@@ -135,7 +135,7 @@ SELECT id, name
// destruction of the group
$query = '
DELETE
FROM '. GROUPS_TABLE .'
FROM `'. GROUPS_TABLE .'`
WHERE id IN('. $group_id_string .')
;';
pwg_query($query);
@@ -169,7 +169,7 @@ function ws_groups_setInfo($params, &$service)
// does the group exist ?
$query = '
SELECT COUNT(*)
FROM '. GROUPS_TABLE .'
FROM `'. GROUPS_TABLE .'`
WHERE id = '. $params['group_id'] .'
;';
list($count) = pwg_db_fetch_row(pwg_query($query));
@@ -185,7 +185,7 @@ SELECT COUNT(*)
// is the name not already used ?
$query = '
SELECT COUNT(*)
FROM '. GROUPS_TABLE .'
FROM `'. GROUPS_TABLE .'`
WHERE name = \''. $params['name'] .'\'
;';
list($count) = pwg_db_fetch_row(pwg_query($query));
@@ -230,7 +230,7 @@ function ws_groups_addUser($params, &$service)
// does the group exist ?
$query = '
SELECT COUNT(*)
FROM '. GROUPS_TABLE .'
FROM `'. GROUPS_TABLE .'`
WHERE id = '. $params['group_id'] .'
;';
list($count) = pwg_db_fetch_row(pwg_query($query));
@@ -281,7 +281,7 @@ function ws_groups_deleteUser($params, &$service)
// does the group exist ?
$query = '
SELECT COUNT(*)
FROM '. GROUPS_TABLE .'
FROM `'. GROUPS_TABLE .'`
WHERE id = '. $params['group_id'] .'
;';
list($count) = pwg_db_fetch_row(pwg_query($query));