- improvement: long localized messages are in HTML files instead of $lang

array. This is the case of admin/help and about pages.

- deletion: of unused functions (ts_to_mysqldt, is_image, TN_exists,
  check_date_format, date_convert, get_category_directories,
  get_used_metadata_list, array_remove, pwg_write_debug,
  get_group_restrictions, get_all_group_restrictions, is_group_allowed,
  style_select, deprecated_getAttribute).

- new: many new contextual help pages to replace descriptions previously
  included in pages.

- modification: reorganisation of language files. Deletion of unused
  language keys, alphabetical sort. No faq.lang.php anymore (replaced by
  help.html). Only done for en_UK.iso-8859-1.


git-svn-id: http://piwigo.org/svn/trunk@862 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2005-09-14 21:57:05 +00:00
parent eac1724ee5
commit 3371c75742
42 changed files with 1155 additions and 1247 deletions
+1 -80
View File
@@ -25,85 +25,6 @@
// | USA. |
// +-----------------------------------------------------------------------+
// get_group_restrictions returns an array containing all unaccessible
// category ids.
function get_group_restrictions( $group_id )
{
// 1. retrieving ids of private categories
$query = 'SELECT id FROM '.CATEGORIES_TABLE;
$query.= " WHERE status = 'private'";
$query.= ';';
$result = pwg_query( $query );
$privates = array();
while ( $row = mysql_fetch_array( $result ) )
{
array_push( $privates, $row['id'] );
}
// 2. retrieving all authorized categories for the group
$authorized = array();
$query = 'SELECT cat_id FROM '.GROUP_ACCESS_TABLE;
$query.= ' WHERE group_id = '.$group_id;
$query.= ';';
$result = pwg_query( $query );
while ( $row = mysql_fetch_array( $result ) )
{
array_push( $authorized, $row['cat_id'] );
}
// with 1.5 preparation, no group dedicated function is used.
$forbidden = array();
foreach ( $privates as $private ) {
if ( !in_array( $private, $authorized ) )
{
array_push( $forbidden, $private );
}
}
return $forbidden;
}
// get_all_group_restrictions returns an array with ALL unaccessible
// category ids, including sub-categories
function get_all_group_restrictions( $group_id )
{
$restricted_cats = get_group_restrictions( $group_id );
foreach ( $restricted_cats as $restricted_cat ) {
$sub_restricted_cats = get_subcats_id( $restricted_cat );
foreach ( $sub_restricted_cats as $sub_restricted_cat ) {
array_push( $restricted_cats, $sub_restricted_cat );
}
}
return $restricted_cats;
}
// The function is_group_allowed returns :
// - 0 : if the category is allowed with this $restrictions array
// - 1 : if this category is not allowed
// - 2 : if an uppercat category is not allowed
function is_group_allowed( $category_id, $restrictions )
{
$lowest_category_id = $category_id;
$is_root = false;
while ( !$is_root and !in_array( $category_id, $restrictions ) )
{
$query = 'SELECT id_uppercat FROM '.CATEGORIES_TABLE;
$query.= ' WHERE id = '.$category_id;
$query.= ';';
$row = mysql_fetch_array( pwg_query( $query ) );
if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = '';
if ( $row['id_uppercat'] == '' ) $is_root = true;
$category_id = $row['id_uppercat'];
}
if ( in_array( $lowest_category_id, $restrictions ) )
{
return 1;
}
if ( in_array( $category_id, $restrictions ) )
{
return 2;
}
// this group is allowed to go in this category
return 0;
}
?>