archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call to get_plain_structure() replaced by a call to get_user_plain_structure()

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@499 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
gweltas 2004-08-29 13:53:48 +00:00
commit 196f36176e
3 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/functions_category.inc.php
View file

@ -122,7 +122,7 @@ function get_user_plain_structure()
if ( !$user['expand'] )
{
$query.= ' AND (id_uppercat is NULL';
if ( count( $page['tab_expand'] ) > 0 )
if ( isset ($page['tab_expand']) && count( $page['tab_expand'] ) > 0 )
{
$query.= ' OR id_uppercat IN ('.implode(',',$page['tab_expand']).')';
}

53
language/en_UK.iso-8859-1/common.lang.php
View file

@ -86,6 +86,32 @@ $lang['day'][4] = 'Thursday';
$lang['day'][5] = 'Friday';
$lang['day'][6] = 'Saturday';
// search
$lang['search_title'] = 'Search';
$lang['search_wrong_date'] = ' : this date is not valid';
$lang['search_wrong_date_order'] = 'the period end must be after the period start';
$lang['search_incoherent_date_search'] = 'when choosing to match all the clauses, you can\'t search "date is" and "date is after" or "date is before"';
$lang['search_or_clauses'] = 'at least one search clause';
$lang['search_and_clauses'] = 'all search clauses';
$lang['search_subcats_included'] = 'include sub-categories';
$lang['search_date_included'] = 'included';
$lang['search_date_is'] = 'is';
$lang['search_date_is_after'] = 'is after';
$lang['search_date_is_before'] = 'is before';
$lang['search_file'] = 'file';
$lang['search_name'] = 'name';
$lang['search_comment'] = 'comment';
$lang['search_keywords'] = 'keywords';
$lang['search_author'] = 'author';
$lang['search_date_available'] = 'availability date';
$lang['search_date_creation'] = 'creation date';
$lang['search_one_clause_at_least'] = 'search at least on one search clause';
$lang['search_mode_or'] = 'at least one word';
$lang['search_mode_and'] = 'all the words';
$lang['search_comments'] = 'separate different words with spaces';
$lang['invalid_search'] = 'search must be done on 3 caracters or more';
$lang['Search_author_explain'] = 'Use * comme un joker pour des recherches partielles';
$lang['only_members'] = 'Only members can access this page';
$lang['invalid_pwd'] = 'Invalid password!';
$lang['access_forbiden'] = 'You are not authorized to access this page';
@ -172,9 +198,6 @@ $lang['reg_err_login5'] = 'this login is already used';
$lang['reg_err_pass'] = 'please enter your password again';
$lang['reg_confirm'] = 'confirm';
$lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
$lang['search_title'] = 'Search';
$lang['invalid_search'] = 'search must be done on 3 caracters or more';
$lang['search_return_main_page'] = 'Return to thumbnails page';
$lang['upload_forbidden'] = 'You can\'t upload pictures in this category';
$lang['upload_file_exists'] = 'A picture\'s name already used';
$lang['upload_filenotfound'] = 'You must choose a picture fileformat for the image';
@ -237,9 +260,6 @@ $lang['comment_to_validate'] = 'An administrator must authorize your comment bef
$lang['comment_anti-flood'] = 'Anti-flood system : please wait for a moment before trying to post another comment';
$lang['comment_user_exists'] = 'This login is already used by another user';
$lang['invalid_search'] = 'Searched words must be grater than 3 characters and must not contain punctuation mark';
$lang['search_mode_or'] = 'at least one word';
$lang['search_mode_and'] = 'all the words';
$lang['search_comments'] = 'separate different words with spaces';
$lang['upload_name'] = 'Name of the picture';
$lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';
$lang['upload_creation_date'] = 'Creation date (DD/MM/YYYY)';
@ -257,27 +277,6 @@ $lang['menu_login'] = 'login';
$lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
$lang['hello'] = 'Hello';
// search
$lang['search_wrong_date'] = ' : this date is not valid';
$lang['search_wrong_date_order'] = 'the period end must be after the period start';
$lang['search_incoherent_date_search'] = 'when choosing to match all the clauses, you can\'t search "date is" and "date is after" or "date is before"';
$lang['search_or_clauses'] = 'at least one search clause';
$lang['search_and_clauses'] = 'all search clauses';
$lang['search_categories'] = 'categories';
$lang['search_subcats_included'] = 'include sub-categories';
$lang['search_date_included'] = 'included';
$lang['search_date_is'] = 'is';
$lang['search_date_is_after'] = 'is after';
$lang['search_date_is_before'] = 'is before';
$lang['search_file'] = 'file';
$lang['search_name'] = 'name';
$lang['search_comment'] = 'comment';
$lang['search_keywords'] = 'keywords';
$lang['search_author'] = 'author';
$lang['search_date_available'] = 'availability date';
$lang['search_date_creation'] = 'creation date';
$lang['search_one_clause_at_least'] = 'search at least on one search clause';
$lang['picture_show_metadata'] = 'Show file metadata ?';
$lang['picture_hide_metadata'] = 'Hide file metadata';
?>

11
search.php
View file

@ -235,14 +235,14 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->set_filenames( array('search'=>'search.tpl') );
$template->assign_vars(array(
'L_TITLE' => $lang['search_title'],
'L_COMMENTS' => $lang['search_comments'],
'L_RETURN' => $lang['search_return_main_page'],
'L_COMMENTS' => $lang['comments'],
'L_RETURN' => $lang['gallery_index'],
'L_SUBMIT' => $lang['submit'],
'L_SEARCH_OR'=>$lang['search_mode_or'],
'L_SEARCH_AND'=>$lang['search_mode_and'],
'L_SEARCH_OR_CLAUSES'=>$lang['search_or_clauses'],
'L_SEARCH_AND_CLAUSES'=>$lang['search_and_clauses'],
'L_SEARCH_CATEGORIES'=>$lang['search_categories'],
'L_SEARCH_CATEGORIES'=>$lang['categories'],
'L_SEARCH_SUBCATS_INCLUDED'=>$lang['search_subcats_included'],
'L_SEARCH_DATE_INCLUDED'=> $lang['search_date_included'],
'L_SEARCH_DATE_IS'=>$lang['search_date_is'],
@ -365,9 +365,8 @@ function display_search_categories($categories, $indent, $selecteds)
}
}
}
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
$page['plain_structure'] = get_plain_structure(true);
$structure = create_structure('');
$page['plain_structure'] = get_user_plain_structure(true);
$structure = create_user_structure('');
$selecteds = array();
if (isset($_POST['submit']))