mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-06 09:52:29 +02:00
Issue #1200 : Implementation of auto-order of categories and design fixes
This commit is contained in:
Zacharie
+198
-24
@@ -19,29 +19,95 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
|
||||
check_status(ACCESS_ADMINISTRATOR);
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | functions |
|
||||
// | categories auto order |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
$open_cat = -1;
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | categories movement |
|
||||
// +-----------------------------------------------------------------------+
|
||||
$sort_orders = array(
|
||||
'name ASC',
|
||||
'name DESC',
|
||||
'date_creation DESC',
|
||||
'date_creation ASC',
|
||||
'date_available DESC',
|
||||
'date_available ASC'
|
||||
);
|
||||
|
||||
if (isset($_POST['submit']))
|
||||
if (isset($_POST['simpleAutoOrder']) || isset($_POST['recursiveAutoOrder']) )
|
||||
{
|
||||
if (count($_POST['selection']) > 0)
|
||||
{
|
||||
check_input_parameter('selection', $_POST, true, PATTERN_ID);
|
||||
check_input_parameter('parent', $_POST, false, PATTERN_ID);
|
||||
|
||||
move_categories($_POST['selection'], $_POST['parent']);
|
||||
}
|
||||
else
|
||||
if (!in_array($_POST['order'],$sort_orders))
|
||||
{
|
||||
$page['errors'][] = l10n('Select at least one album');
|
||||
die('Invalid sort order');
|
||||
}
|
||||
|
||||
$query = '
|
||||
SELECT id
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
WHERE id_uppercat '.
|
||||
(($_POST['id'] === '-1') ? 'IS NULL' : '= '.$_POST['id']).'
|
||||
;';
|
||||
$category_ids = array_from_query($query, 'id');
|
||||
|
||||
if (isset($_POST['recursiveAutoOrder']))
|
||||
{
|
||||
$category_ids = get_subcat_ids($category_ids);
|
||||
}
|
||||
|
||||
$categories = array();
|
||||
$sort = array();
|
||||
|
||||
list($order_by_field, $order_by_asc) = explode(' ', $_POST['order']);
|
||||
|
||||
$order_by_date = false;
|
||||
if (strpos($order_by_field, 'date_') === 0)
|
||||
{
|
||||
$order_by_date = true;
|
||||
|
||||
$ref_dates = get_categories_ref_date(
|
||||
$category_ids,
|
||||
$order_by_field,
|
||||
'ASC' == $order_by_asc ? 'min' : 'max'
|
||||
);
|
||||
}
|
||||
|
||||
$query = '
|
||||
SELECT id, name, id_uppercat
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
WHERE id IN ('.implode(',', $category_ids).')
|
||||
;';
|
||||
$result = pwg_query($query);
|
||||
while ($row = pwg_db_fetch_assoc($result))
|
||||
{
|
||||
if ($order_by_date)
|
||||
{
|
||||
$sort[] = $ref_dates[ $row['id'] ];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sort[] = remove_accents($row['name']);
|
||||
}
|
||||
|
||||
$categories[] = array(
|
||||
'id' => $row['id'],
|
||||
'id_uppercat' => $row['id_uppercat'],
|
||||
);
|
||||
}
|
||||
|
||||
array_multisort(
|
||||
$sort,
|
||||
SORT_REGULAR,
|
||||
'ASC' == $order_by_asc ? SORT_ASC : SORT_DESC,
|
||||
$categories
|
||||
);
|
||||
|
||||
save_categories_order($categories);
|
||||
|
||||
$open_cat = $_POST['id'];
|
||||
}
|
||||
|
||||
$template->assign('open_cat', $open_cat);
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | template initialization |
|
||||
// +-----------------------------------------------------------------------+
|
||||
@@ -65,30 +131,138 @@ include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php');
|
||||
// | Album display |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
//Get all albums
|
||||
$query = '
|
||||
SELECT id,name,global_rank,status
|
||||
SELECT id,name,rank,status, uppercats
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
;';
|
||||
|
||||
$allAlbum = query2array($query);
|
||||
$sortedAlbums = array();
|
||||
|
||||
foreach ($allAlbum as $album) {
|
||||
$parents = explode('.',$album['global_rank']);
|
||||
$the_place = &$sortedAlbums[intval($parents[0])];
|
||||
for ($i=1; $i < count($parents); $i++) {
|
||||
$the_place = &$the_place['children'][intval($parents[$i])];
|
||||
//Make an id tree
|
||||
$associatedTree = array();
|
||||
|
||||
foreach ($allAlbum as $album)
|
||||
{
|
||||
$parents = explode(',',$album['uppercats']);
|
||||
$the_place = &$associatedTree[strval($parents[0])];
|
||||
for ($i=1; $i < count($parents); $i++)
|
||||
{
|
||||
$the_place = &$the_place['children'][strval($parents[$i])];
|
||||
}
|
||||
$the_place['name'] = $album['name'];
|
||||
$the_place['status'] = $album['status'];
|
||||
$the_place['id'] = $album['id'];
|
||||
$the_place['cat'] = $album;
|
||||
}
|
||||
|
||||
$template->assign('album_data', $sortedAlbums);
|
||||
//Make an ordered tree
|
||||
function cmpCat($a, $b)
|
||||
{
|
||||
if ($a['rank'] == $b['rank'])
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return ($a['rank'] < $b['rank']) ? -1 : 1;
|
||||
}
|
||||
|
||||
function assocToOrderedTree($assocT)
|
||||
{
|
||||
$orderedTree = array();
|
||||
|
||||
foreach($assocT as $cat)
|
||||
{
|
||||
$orderedCat = array();
|
||||
$orderedCat['rank'] = $cat['cat']['rank'];
|
||||
$orderedCat['name'] = $cat['cat']['name'];
|
||||
$orderedCat['status'] = $cat['cat']['status'];
|
||||
$orderedCat['id'] = $cat['cat']['id'];
|
||||
if (isset($cat['children']))
|
||||
{
|
||||
$orderedCat['children'] = assocToOrderedTree($cat['children']);
|
||||
}
|
||||
array_push($orderedTree, $orderedCat);
|
||||
}
|
||||
usort($orderedTree, 'cmpCat');
|
||||
return $orderedTree;
|
||||
}
|
||||
|
||||
$template->assign('album_data', assocToOrderedTree($associatedTree));
|
||||
$template->assign('PWG_TOKEN', get_pwg_token());
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | sending html code |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
$template->assign_var_from_handle('ADMIN_CONTENT', 'cat_move');
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | functions |
|
||||
// +-----------------------------------------------------------------------+
|
||||
function get_categories_ref_date($ids, $field='date_available', $minmax='max')
|
||||
{
|
||||
// we need to work on the whole tree under each category, even if we don't
|
||||
// want to sort sub categories
|
||||
$category_ids = get_subcat_ids($ids);
|
||||
|
||||
// search for the reference date of each album
|
||||
$query = '
|
||||
SELECT
|
||||
category_id,
|
||||
'.$minmax.'('.$field.') as ref_date
|
||||
FROM '.IMAGE_CATEGORY_TABLE.'
|
||||
JOIN '.IMAGES_TABLE.' ON image_id = id
|
||||
WHERE category_id IN ('.implode(',', $category_ids).')
|
||||
GROUP BY category_id
|
||||
;';
|
||||
$ref_dates = query2array($query, 'category_id', 'ref_date');
|
||||
|
||||
// the iterate on all albums (having a ref_date or not) to find the
|
||||
// reference_date, with a search on sub-albums
|
||||
$query = '
|
||||
SELECT
|
||||
id,
|
||||
uppercats
|
||||
FROM '.CATEGORIES_TABLE.'
|
||||
WHERE id IN ('.implode(',', $category_ids).')
|
||||
;';
|
||||
$uppercats_of = query2array($query, 'id', 'uppercats');
|
||||
|
||||
foreach (array_keys($uppercats_of) as $cat_id)
|
||||
{
|
||||
// find the subcats
|
||||
$subcat_ids = array();
|
||||
|
||||
foreach ($uppercats_of as $id => $uppercats)
|
||||
{
|
||||
if (preg_match('/(^|,)'.$cat_id.'(,|$)/', $uppercats))
|
||||
{
|
||||
$subcat_ids[] = $id;
|
||||
}
|
||||
}
|
||||
|
||||
$to_compare = array();
|
||||
foreach ($subcat_ids as $id)
|
||||
{
|
||||
if (isset($ref_dates[$id]))
|
||||
{
|
||||
$to_compare[] = $ref_dates[$id];
|
||||
}
|
||||
}
|
||||
|
||||
if (count($to_compare) > 0)
|
||||
{
|
||||
$ref_dates[$cat_id] = 'max' == $minmax ? max($to_compare) : min($to_compare);
|
||||
}
|
||||
else
|
||||
{
|
||||
$ref_dates[$cat_id] = null;
|
||||
}
|
||||
}
|
||||
|
||||
// only return the list of $ids, not the sub-categories
|
||||
$return = array();
|
||||
foreach ($ids as $id)
|
||||
{
|
||||
$return[$id] = $ref_dates[$id];
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user