adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

some code simplification

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@18579 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-10-09 19:47:22 +00:00
parent 05671cf18c
commit 1afee20ed2
2 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/permalinks.php
+1 -1
View File
@@ -117,7 +117,7 @@ include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php');
$query = '
SELECT
id, permalink,
'.pwg_db_concat(array('id', '\' - \'', 'name')).' AS name,
CONCAT(id, " - ", name, IF(permalink IS NULL, "", " √") ) AS name,
uppercats, global_rank
FROM '.CATEGORIES_TABLE;
include/functions_category.inc.php
+6 -26
View File
@@ -128,7 +128,7 @@ WHERE '.$where.'
{
$row['icon_ts'] = get_icon($row['max_date_last'], $child_date_last);
}
array_push($cats, $row);
$cats[] = $row;
if ($row['id']==@$page['category']['id']) //save the number of subcats for later optim
$page['category']['count_categories'] = $row['count_categories'];
}
@@ -195,7 +195,6 @@ SELECT *
}
else
{
$names = array();
$query = '
SELECT id, name, permalink
FROM '.CATEGORIES_TABLE.'
@@ -207,7 +206,7 @@ SELECT *
$cat['upper_names'] = array();
foreach ($upper_ids as $cat_id)
{
array_push( $cat['upper_names'], $names[$cat_id]);
$cat['upper_names'][] = $names[$cat_id];
}
}
return $cat;
@@ -219,13 +218,13 @@ SELECT *
function get_category_preferred_image_orders()
{
global $conf, $page;
return trigger_event('get_category_preferred_image_orders', array(
array(l10n('Default'), '', true),
array(l10n('Photo title, A → Z'), 'name ASC', true),
array(l10n('Photo title, Z → A'), 'name DESC', true),
array(l10n('Date created, new → old'), 'date_creation DESC', true),
array(l10n('Date created, old → new'), 'date_creation ASC', true),
array(l10n('Date created, old → new'), 'date_creation ASC', true),
array(l10n('Date posted, new → old'), 'date_available DESC', true),
array(l10n('Date posted, old → new'), 'date_available ASC', true),
array(l10n('Rating score, high → low'), 'rating_score DESC', $conf['rate']),
@@ -246,10 +245,6 @@ function display_select_categories($categories,
$tpl_cats = array();
foreach ($categories as $category)
{
if (!empty($category['permalink']))
{
$category['name'] .= ' √';
}
if ($fullname)
{
$option = strip_tags(
@@ -283,15 +278,7 @@ function display_select_categories($categories,
function display_select_cat_wrapper($query, $selecteds, $blockname,
$fullname = true)
{
$result = pwg_query($query);
$categories = array();
if (!empty($result))
{
while ($row = pwg_db_fetch_assoc($result))
{
array_push($categories, $row);
}
}
$categories = array_from_query($query);
usort($categories, 'global_rank_compare');
display_select_categories($categories, $selecteds, $blockname, $fullname);
}
@@ -324,14 +311,7 @@ SELECT DISTINCT(id)
}
$query.= '
;';
$result = pwg_query($query);
$subcats = array();
while ($row = pwg_db_fetch_assoc($result))
{
array_push($subcats, $row['id']);
}
return $subcats;
return array_from_query($query, 'id');
}
/** finds a matching category id from a potential list of permalinks