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 408: ability to automatically sort sub-categories. The number of SQL

Browse Source 
queries is constant, no matter the deepth of your tree.

+ refactor to avoid duplicate code (ascending/desceding should be only a
single parameter in a function, not 20 lines of duplicated code)


git-svn-id: http://piwigo.org/svn/trunk@6698 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-07-23 21:33:56 +00:00
parent 361ef07c3c
commit 1448b42df0
5 changed files with 108 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
admin/cat_list.php
View File

@@ -55,11 +55,30 @@ if (!empty($_POST) or isset($_GET['delete']))
*/
function save_categories_order($categories)
{
$current_rank_for_id_uppercat = array();
$current_rank = 0;
$datas = array();
foreach ($categories as $id)
foreach ($categories as $category)
{
array_push($datas, array('id' => $id, 'rank' => ++$current_rank));
if (is_array($category))
{
$id = $category['id'];
$id_uppercat = $category['id_uppercat'];
if (!isset($current_rank_for_id_uppercat[$id_uppercat]))
{
$current_rank_for_id_uppercat[$id_uppercat] = 0;
}
$current_rank = ++$current_rank_for_id_uppercat[$id_uppercat];
}
else
{
$id = $category;
$current_rank++;
}
array_push($datas, array('id' => $id, 'rank' => $current_rank));
}
$fields = array('primary' => array('id'), 'update' => array('rank'));
mass_updates(CATEGORIES_TABLE, $fields, $datas);
@@ -111,59 +130,69 @@ else if (isset($_POST['submitAdd']))
// save manual category ordering
else if (isset($_POST['submitOrder']))
{
asort($_POST['catOrd'], SORT_NUMERIC);
save_categories_order(array_keys($_POST['catOrd']));
if ('manual' == $_POST['order_type'])
{
asort($_POST['catOrd'], SORT_NUMERIC);
save_categories_order(array_keys($_POST['catOrd']));
array_push(
$page['infos'],
l10n('Categories manual order was saved')
);
}
// sort categories alpha-numerically
else if (isset($_POST['submitOrderAlphaNum']))
{
$query = '
SELECT id, name
array_push(
$page['infos'],
l10n('Categories manual order was saved')
);
}
else
{
$query = '
SELECT id
FROM '.CATEGORIES_TABLE.'
WHERE id_uppercat '.
(!isset($_GET['parent_id']) ? 'IS NULL' : '= '.$_GET['parent_id']).'
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
$categories[ $row['id'] ] = strtolower($row['name']);
}
$category_ids = array_from_query($query, 'id');
asort($categories, SORT_REGULAR);
save_categories_order(array_keys($categories));
if (isset($_POST['recursive']))
{
$category_ids = get_subcat_ids($category_ids);
}
array_push(
$page['infos'],
l10n('Categories ordered alphanumerically')
);
}
// sort categories alpha-numerically reverse
else if (isset($_POST['submitOrderAlphaNumReverse']))
{
$query = '
SELECT id, name
$categories = array();
$names = array();
$id_uppercats = array();
$query = '
SELECT id, name, id_uppercat
FROM '.CATEGORIES_TABLE.'
WHERE id_uppercat '.
(!isset($_GET['parent_id']) ? 'IS NULL' : '= '.$_GET['parent_id']).'
WHERE id IN ('.implode(',', $category_ids).')
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
$categories[ $row['id'] ] = strtolower($row['name']);
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
array_push(
$categories,
array(
'id' => $row['id'],
'id_uppercat' => $row['id_uppercat'],
)
);
array_push(
$names,
$row['name']
);
}
array_multisort(
$names,
SORT_REGULAR,
'asc' == $_POST['ascdesc'] ? SORT_ASC : SORT_DESC,
$categories
);
save_categories_order($categories);
array_push(
$page['infos'],
l10n('Categories automatically sorted')
);
}
arsort($categories, SORT_REGULAR);
save_categories_order(array_keys($categories));
array_push(
$page['infos'],
l10n('Categories ordered alphanumerically reverse')
);
}
// +-----------------------------------------------------------------------+