iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Feature 1255 : limit params in sql queries were in wrong order (LIMIT count OFFSET offset)

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@4334 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2009-11-21 19:52:50 +00:00
parent daa877aa8a
commit ce3fe0d460
14 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/cat_perm.php
View File

@@ -59,7 +59,7 @@ if (!isset($page['cat']))
SELECT id
FROM '.CATEGORIES_TABLE.'
WHERE status = \'private\'
LIMIT 0 OFFSET 1
LIMIT 1
;';
list($page['cat']) = pwg_db_fetch_row(pwg_query($query));

4
admin/element_set_global.php
View File

@@ -474,13 +474,11 @@ SELECT id,path,tn_ext,file,filesize,level
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $page['cat_elements_id']).')
'.$conf['order_by'].'
LIMIT '.$page['start'].' OFFSET '.$page['nb_images'].'
LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'
;';
//echo '<pre>'.$query.'</pre>';
$result = pwg_query($query);
// template thumbnail initialization
while ($row = pwg_db_fetch_assoc($result))
{
$src = get_thumbnail_url($row);

2
admin/element_set_unit.php
View File

@@ -196,7 +196,7 @@ SELECT id,path,tn_ext,name,date_creation,comment,author,file
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $page['cat_elements_id']).')
'.$conf['order_by'].'
LIMIT '.$page['start'].' OFFSET '.$page['nb_images'].'
LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'
;';
$result = pwg_query($query);

2
admin/include/functions.php
View File

@@ -597,7 +597,7 @@ SELECT image_id
FROM '.IMAGE_CATEGORY_TABLE.'
WHERE category_id = '.$category_id.'
ORDER BY '.DB_RANDOM_FUNCTION.'()
LIMIT 0 OFFSET 1
LIMIT 1
;';
list($representative) = pwg_db_fetch_row(pwg_query($query));

2
admin/include/functions_history.inc.php
View File

@@ -161,7 +161,7 @@ SELECT
WHERE '.$where_separator.'
;';
// LIMIT '.$page['start'].' OFFSET '.$conf['nb_logs_page'].'
// LIMIT '.$conf['nb_logs_page'].' OFFSET '.$page['start'].'
$result = pwg_query($query);

2
admin/rating.php
View File

@@ -176,7 +176,7 @@ SELECT i.id,
WHERE 1 = 1 ' . $page['user_filter'] . '
GROUP BY r.element_id
ORDER BY ' . $available_order_by[$order_by_index][1] .'
LIMIT '.$start.' OFFSET '.$elements_per_page.'
LIMIT '.$elements_per_page.' OFFSET '.$start.'
;';
$images = array();

2
comments.php
View File

@@ -326,7 +326,7 @@ SELECT com.id AS comment_id
if ('all' != $page['items_number'])
{
$query.= '
LIMIT '.$start.' OFFSET '.$page['items_number'];
LIMIT '.$page['items_number'].' OFFSET '.$start;
}
$query.= '
;';

2
include/calendar_monthly.class.php
View File

@@ -348,7 +348,7 @@ SELECT id, file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 a
$query.= $this->get_date_where();
$query.= '
ORDER BY RAND()
LIMIT 0 OFFSET 1';
LIMIT 1';
unset ( $page['chronology_date'][CDAY] );
$row = pwg_db_fetch_assoc(pwg_query($query));

4
include/category_cats.inc.php
View File

@@ -105,7 +105,7 @@ SELECT image_id
"\n AND"
).'
ORDER BY RAND()
LIMIT 0,1
LIMIT 1
;';
$subresult = pwg_query($query);
if (pwg_db_num_rows($subresult) > 0)
@@ -133,7 +133,7 @@ SELECT image_id
"\n AND"
).'
ORDER BY RAND()
LIMIT 0,1
LIMIT 1
;';
$subresult = pwg_query($query);
if (pwg_db_num_rows($subresult) > 0)

6
include/functions_notification.inc.php
View File

@@ -444,7 +444,7 @@ SELECT date_available,
'.$where_sql.'
GROUP BY date_available
ORDER BY date_available DESC
LIMIT 0 OFFSET '.$max_dates.'
LIMIT '.$max_dates.'
;';
$result = pwg_query($query);
$dates = array();
@@ -464,7 +464,7 @@ SELECT DISTINCT id, path, name, tn_ext, file
AND date_available="'.$dates[$i]['date_available'].'"
AND tn_ext IS NOT NULL
ORDER BY RAND(NOW())
LIMIT 0 OFFSET '.$max_elements.'
LIMIT '.$max_elements.'
;';
$dates[$i]['elements'] = array();
$result = pwg_query($query);
@@ -484,7 +484,7 @@ SELECT DISTINCT c.uppercats, COUNT(DISTINCT i.id) img_count
AND date_available="'.$dates[$i]['date_available'].'"
GROUP BY category_id
ORDER BY img_count DESC
LIMIT 0 OFFSET '.$max_cats.'
LIMIT '.$max_cats.'
;';
$dates[$i]['categories'] = array();
$result = pwg_query($query);

2
include/functions_tag.inc.php
View File

@@ -239,7 +239,7 @@ SELECT t.*, count(*) counter
{
$query .= '
ORDER BY counter DESC
LIMIT 0,'.$max_tags;
LIMIT '.$max_tags;
}
else
{

4
include/section_init.inc.php
View File

@@ -490,7 +490,7 @@ SELECT DISTINCT(id)
WHERE hit > 0
'.$forbidden.'
'.$conf['order_by'].'
LIMIT 0, '.$conf['top_number'].'
LIMIT '.$conf['top_number'].'
;';
$page = array_merge(
@@ -517,7 +517,7 @@ SELECT DISTINCT(id)
WHERE average_rate IS NOT NULL
'.$forbidden.'
'.$conf['order_by'].'
LIMIT 0, '.$conf['top_number'].'
LIMIT '.$conf['top_number'].'
;';
$page = array_merge(
$page,

8
include/ws_functions.inc.php
View File

@@ -292,7 +292,7 @@ SELECT i.*, GROUP_CONCAT(category_id) cat_ids
AND ', $where_clauses).'
GROUP BY i.id
'.$order_by.'
LIMIT '.(int)($params['per_page']*$params['page']).' OFFSET '.(int)$params['per_page'];
LIMIT '.(int)$params['per_page'].' OFFSET '.(int)($params['per_page']*$params['page']);
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
@@ -682,8 +682,8 @@ SELECT id, date, author, content
FROM '.COMMENTS_TABLE.'
WHERE '.$where_comments.'
ORDER BY date
LIMIT '.(int)($params['comments_per_page']*$params['comments_page']).
' OFFSET '.(int)$params['comments_per_page'];
LIMIT '.(int)$params['comments_per_page'].
' OFFSET '.(int)($params['comments_per_page']*$params['comments_page']);
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
@@ -1398,7 +1398,7 @@ SELECT DISTINCT i.* FROM '.IMAGES_TABLE.' i
WHERE '. implode('
AND ', $where_clauses).'
'.$order_by.'
LIMIT '.(int)($params['per_page']*$params['page']).' OFFSET '.(int)$params['per_page'];
LIMIT '.(int)$params['per_page'].' OFFSET '.(int)($params['per_page']*$params['page']);
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))

2
random.php
View File

@@ -52,7 +52,7 @@ SELECT DISTINCT(id)
'WHERE'
).'
ORDER BY RAND(NOW())
LIMIT 0, '.min(50, $conf['top_number'],$user['nb_image_page']).'
LIMIT '.min(50, $conf['top_number'],$user['nb_image_page']).'
;';
// +-----------------------------------------------------------------------+