mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r11152 from branch 2.2 to trunk

Browse source 
feature 1622 added: pwg.categories.getList is now able to return a tree with
the new "tree_output" option. Only compatible with json/php output formats.



git-svn-id: http://piwigo.org/svn/trunk@11155 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-05-31 20:25:40 +00:00
parent 6ba7f82306
commit 257808402b
3 changed files with 71 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

54
include/ws_functions.inc.php
View file

@ -432,6 +432,22 @@ function ws_categories_getList($params, &$service)
{
global $user,$conf;
if ($params['tree_output'])
{
if (!isset($_GET['format']) or !in_array($_GET['format'], array('php', 'json')))
{
// the algorithm used to build a tree from a flat list of categories
// keeps original array keys, which is not compatible with
// PwgNamedArray.
//
// PwgNamedArray is useful to define which data is an attribute and
// which is an element in the XML output. The "hierarchy" output is
// only compatible with json/php output.
return new PwgError(405, "The tree_output option is only compatible with json/php output formats");
}
}
$where = array('1=1');
$join_type = 'INNER';
$join_user = $user['id'];
@ -471,7 +487,7 @@ function ws_categories_getList($params, &$service)
}
$query = '
SELECT id, name, permalink, uppercats, global_rank,
SELECT id, name, permalink, uppercats, global_rank, id_uppercat,
comment,
nb_images, count_images AS total_nb_images,
date_last, max_date_last, count_categories AS nb_categories
@ -514,21 +530,29 @@ SELECT id, name, permalink, uppercats, global_rank,
array_push($cats, $row);
}
usort($cats, 'global_rank_compare');
return array(
'categories' => new PwgNamedArray(
$cats,
'category',
array(
'id',
'url',
'nb_images',
'total_nb_images',
'nb_categories',
'date_last',
'max_date_last',
if ($params['tree_output'])
{
return categories_flatlist_to_tree($cats);
}
else
{
return array(
'categories' => new PwgNamedArray(
$cats,
'category',
array(
'id',
'url',
'nb_images',
'total_nb_images',
'nb_categories',
'date_last',
'max_date_last',
)
)
)
);
);
}
}
/**