309: Allow dynamic user filtering of catalog and gallery display - Composr CMS feature tracker

ID	Project	Category	View Status	Date Submitted	Last Update

309	Composr	catalogues	public	2011-11-10 02:58	2012-05-08 21:51

Reporter	Guest	Assigned To	Chris Graham
Priority	normal	Severity	feature
Status	resolved	Resolution	fixed

Summary	309: Allow dynamic user filtering of catalog and gallery display
Description	The goal of this feature request is to allow the user/member to drill down from the general to a specific collection of items to display similar to the way filters work on various shopping sites. Allow administrator to set up filters to operate against the various catalogs and galleries. Allow a user to select a catalog or gallery and display all contents of this root selection and its child categories. Then allow the user to further refine his search/display by using the associated pre-defined filters created by the administrator.
Tags	No tags attached.
Attach Tags	(Separate by ",")
Attached Files	Filtercode.patch (132,251 bytes) diff --git a/lang/EN/blocks.ini b/lang/EN/blocks.ini index 63a2a09..7cc9f9d 100644 --- a/lang/EN/blocks.ini +++ b/lang/EN/blocks.ini @@ -78,14 +78,15 @@ BLOCK_main_multi_content_USE=To bring content into Comcode pages. BLOCK_main_multi_content_PARAM_param=The content type to use (hook-type: 'systems/awards'). Default: 'download'. BLOCK_main_multi_content_PARAM_mode=The mode of content choosing. Must be either 'recent' or 'top' or 'random' or 'views' or 'all'. BLOCK_main_multi_content_PARAM_id=The item ID of the item to display (item ID format is determined by the selected content type). Default: randomisation. -BLOCK_main_multi_content_PARAM_efficient=Whether to skip category access checks, i.e. not consider permissions. Default: '1'. -BLOCK_main_multi_content_PARAM_filter=The categories (category ID format is determined by the selected content type) which may be chosen (from) during randomisation, in ocFilter notation (e.g. 1,2,3,6-10). Default: any. -BLOCK_main_multi_content_PARAM_filter_b=As for 'filter', except this applies to the secondary category for the items (if there is a secondary category for the content type). Default: any. +BLOCK_main_multi_content_PARAM_efficient=Advanced feature. Whether to skip category access checks, i.e. not consider permissions. Default: '1'. +BLOCK_main_multi_content_PARAM_ocselect=Advanced feature. ocSelect syntax for filtering results based on field comparisons. Default: no ocSelect filter. +BLOCK_main_multi_content_PARAM_filter=Advanced feature. The categories (category ID format is determined by the selected content type) which may be chosen (from) during randomisation, in ocFilter notation (e.g. 1,2,3,6-10). Default: any. +BLOCK_main_multi_content_PARAM_filter_b=Advanced feature. As for 'filter', except this applies to the secondary category for the items (if there is a secondary category for the content type). Default: any. BLOCK_main_multi_content_PARAM_title=The title to give the selected content. Default: ''. BLOCK_main_multi_content_PARAM_max=The maximum number to return. Default: '10'. BLOCK_main_multi_content_PARAM_days=Limit results to content added in the past this many days, or blank for no limitation. Default: ''. -BLOCK_main_multi_content_PARAM_lifetime=The maximum number of days an entry will display for before it is considered to have had it's run, or blank no limitation. Default: ''. -BLOCK_main_multi_content_PARAM_pinned=A comma-separated list of award IDs; the awarded content for these awards will be pinned. Default: ''. +BLOCK_main_multi_content_PARAM_lifetime=Advanced feature. The maximum number of days an entry will display for before it is considered to have had it's run, or blank no limitation. Default: ''. +BLOCK_main_multi_content_PARAM_pinned=Advanced feature. A comma-separated list of award IDs; the awarded content for these awards will be pinned. Default: ''. BLOCK_main_multi_content_PARAM_zone=Advanced feature. The zone to look for the module associated to this content type, when providing links to it. Default: search. BLOCK_main_multi_content_PARAM_no_links=Whether to skip putting out add/archive links. Default: '0'. BLOCK_main_custom_gfx_DESCRIPTION=This generates and displays custom graphics (graphics customised with the text of your choice). This block is for power-users. Different renderers accept different parameters: when you're done here see our "Favicons, Web fonts, Media file compatibility" tutorial and manually add in additional parameters as required. diff --git a/lang/EN/catalogues.ini b/lang/EN/catalogues.ini index a72a786..f278bda 100644 --- a/lang/EN/catalogues.ini +++ b/lang/EN/catalogues.ini @@ -7,9 +7,9 @@ BLOCK_main_cc_embed_PARAM_template_set=Advanced feature. The template set to ren BLOCK_main_cc_embed_PARAM_display_type=The display type to render the category with (must be either ''="default for catalogue", 'FIELDMAPS'="boxes", 'TITLELIST'="list", 'TABULAR'="tabular" or 'GRID'="grid"). Default: ''. BLOCK_main_cc_embed_PARAM_select=Advanced feature. An ocFilter format list of IDs determining which entries to show on the list. If you set this parameter then the given category is not the only possible source for entries. Default: show all. BLOCK_main_cc_embed_PARAM_sort=Sort order (must be either 'add_date ASC', 'add_date DESC', 'rating ASC', 'rating DESC', <fieldid> ASC, <fieldid> DESC, or '' for catalogue's inbuilt sort order). Default: ''. -BLOCK_main_cc_embed_PARAM_search=Only include results with this text somewhere in at least one of the fields. This is a primitive search, and if results get filtered due to it less than the maximum requested results will be returned. Default: ''. BLOCK_main_cc_embed_PARAM_max=The maximum number of results to include. Default: '30'. BLOCK_main_cc_embed_PARAM_root=Advanced: The default root category to use for links. Default: ''. +BLOCK_main_cc_embed_PARAM_ocselect=Advanced feature. ocSelect syntax for filtering results based on field comparisons. Default: no ocSelect filter. BLOCK_main_recent_cc_entries_DESCRIPTION=Show the most recent entries in a catalogue. Note that it does not check permissions. BLOCK_main_recent_cc_entries_USE=Make it so users know the entries which have been most recently added to the site. BLOCK_main_recent_cc_entries_PARAM_param=The number of entries to show. Default: '10'. @@ -244,3 +244,5 @@ CATALOGUES_IMPORT_MISSING_KEY_FIELD=The given key field is not present in the ca CATALOGUES_IMPORT_MISSING_META_KEYWORDS_FIELD=The given meta keywords field is not present in the catalogue. CATALOGUES_IMPORT_MISSING_META_DESCRIPTION_FIELD=The given meta description field is not present in the catalogue. CATALOGUES_IMPORT_MISSING_NOTES_FIELD=The given notes field is not present in the catalogue. +CATALOGUES_SUBCAT_NARROWIN=Narrow-in when browsing +CONFIG_OPTION_catalogues_subcat_narrowin=If set, all catalogues will initially be shown when browsing catalogues, then entering categories will progressively filter the selection (i.e. navigation by filtering). If unset, catalogues will be seen only when you enter their specific category (i.e. navigation by category). diff --git a/lang/EN/downloads.ini b/lang/EN/downloads.ini index 964dee5..cab6cee 100644 --- a/lang/EN/downloads.ini +++ b/lang/EN/downloads.ini @@ -114,3 +114,5 @@ NOTIFICATION_TYPE_download=New download added DOWNLOAD_NOTIFICATION_MAIL_SUBJECT=New download, {2} DOWNLOAD_NOTIFICATION_MAIL=A new download, {2}, has been added to {1}. You can view it from the following URL:\n{3} ACTIVITY_ADD_DOWNLOAD=Added a download, '{1}' +DOWNLOADS_SUBCAT_NARROWIN=Narrow-in when browsing +CONFIG_OPTION_downloads_subcat_narrowin=If set, all downloads will initially be shown when browsing downloads, then entering categories will progressively filter the selection (i.e. navigation by filtering). If unset, downloads will be seen only when you enter their specific category (i.e. navigation by category). diff --git a/lang/EN/galleries.ini b/lang/EN/galleries.ini index a94c130..7d8ebf4 100644 --- a/lang/EN/galleries.ini +++ b/lang/EN/galleries.ini @@ -33,6 +33,7 @@ BLOCK_main_gallery_embed_PARAM_sort=The sorting. Value must be either 'add_date BLOCK_main_gallery_embed_PARAM_title=Title for the block's box. Note that the default templates do not use a box so this parameter is usually ignored. Default: whatever the templates hard-code. BLOCK_main_gallery_embed_PARAM_zone=The zone to look for the galleries module in. Default: search. BLOCK_main_gallery_embed_PARAM_render_if_empty=Whether to render using the main template even if there is nothing to show with it. Default: '0'. +BLOCK_main_gallery_embed_PARAM_ocselect=Advanced feature. ocSelect syntax for filtering results based on field comparisons. Default: no ocSelect filter. BLOCK_main_recent_galleries_DESCRIPTION=Show the most recent galleries. Note that it does not check permissions. BLOCK_main_recent_galleries_USE=Make it so users know the galleries which have been most recently added to the site (especially useful for a personal gallery-orientated site). BLOCK_main_recent_galleries_PARAM_param=The number of galleries to show. Default: '10'. @@ -189,6 +190,8 @@ ACTIVITY_ADD_IMAGE=Uploaded an image, '{1}' ACTIVITY_ADD_VIDEO=Uploaded a video, '{1}' _VIEW_IMAGE=Viewing image: {1} _VIEW_VIDEO=Viewing video: {1} +GALLERIES_SUBCAT_NARROWIN=Narrow-in when browsing +CONFIG_OPTION_galleries_subcat_narrowin=If set, all galleries will initially be shown when browsing galleries, then entering categories will progressively filter the selection (i.e. navigation by filtering). If unset, galleries will be seen only when you enter their specific category (i.e. navigation by category). This option does not affect flow-mode galleries. TRANSCODING=Video Transcodng CONFIG_GROUP_DESCRIP_TRANSCODING=Transcoding is the process of converting from one video format to another. The software has built-in support for all common browser plugins on all platforms. However, only h.264 files reliably play across all platforms. FLV files also play across most platforms. If you set up one of the three methods of transcoding below, the software will ask the transcoding service to convert all non-websafe files (everything except <kbd>mp3</kbd>, <kbd>mp4</kbd> [assumed to be properly encoded h.264 video with mp3 sound track, in an mp4 container], <kbd>webm</kbd>, and <kbd>flv</kbd>). You don't <em>need</em> to set up transcoding, it can be hard, or have a cost, and won't work on all servers – an alternative is to simply educate your users to only upload properly encoded MP4/h.264-video/mp3-audio files, although understand exactly what this entails and explaining it is a problem in itself. diff --git a/lang/EN/global.ini b/lang/EN/global.ini index ce21407..ab5eb36 100644 --- a/lang/EN/global.ini +++ b/lang/EN/global.ini @@ -932,3 +932,5 @@ QUOTED_REPLY_MESSAGE=Click to type your reply to {1}'s message, which was:\n\n{2 READ_MORE=Read more DO_NOT_FILL_ME_SPAMMER_BLACKHOLE=<span>D</span>on't <span>f</span>ill this field, it is here to <span>c</span>atch <span>s</span>pam-<span>b</span>ots that fill in forms <span>a</span>utomatically POST_IN=Post in topic: {1} +SUBMITTED_WITHIN=Submitted within the previous +SUBMIT_AGE_DAYS={1} {1\|day\|days} diff --git a/lang/EN/ocselect.ini b/lang/EN/ocselect.ini new file mode 100644 index 0000000..7377687 --- /dev/null +++ b/lang/EN/ocselect.ini @@ -0,0 +1,18 @@ +[strings] +OCSELECT_OP_LT=Less than +OCSELECT_OP_GT=Greater than +OCSELECT_OP_LTE=Less than or equal to +OCSELECT_OP_GTE=Greater than or equal to +OCSELECT_OP_EQ=Equal to (but blank means skip) +OCSELECT_OP_EQE=Equal to (strict blank matching) +OCSELECT_OP_CO=Literally contains +OCSELECT_OP_FT=Natural language contains +OPERATOR_FOR=Operator for {1} +OCSELECT_UNKNOWN_FIELD=Unknown field <kbd>{1}</kbd>. Skipping filter for this field. +BLOCK_main_content_filtering_DESCRIPTION=Show a content filtering block. Will work in certain modules. Will work with certain blocks, if you pass the same ocSelect filter string to that block. +BLOCK_main_content_filtering_USE=Allow users to filter displayed content. +BLOCK_main_content_filtering_PARAM_param=An ocSelect filter string. If blank, it will automatically create one for the content type, with configurable filters for common field types. Default: ''. You can also enter the name of a catalogue, to get a default filter constructed for that catalogue (the content type must be <kbd>catalogue_entry</kbd> for that too). +BLOCK_main_content_filtering_PARAM_content_type=The content type to use (hook-type: 'systems/content_meta_aware'). If blank, cannot automatically create a filter. Default: ''. +BLOCK_main_content_filtering_PARAM_labels=A comma-separated list of mappings between field names and field labels for them. E.g. "title=Title,add_date=Add Date". If not passed for a particular field will be automatically worked out for the field names. +BLOCK_main_content_filtering_PARAM_types=A comma-separated list of mappings between field names and field types. E.g. "title=line,add_date=date". If not passed for a particular field, will be automatically worked out from the content type. Valid types: time, date, days, tick, rating, list, multilist, linklist, float, integer, email, author, username, codename, line. +BLOCK_main_content_filtering_PARAM_links=A pipe-separated (<kbd>\|</kbd>) list of mappings between labels and ocSelect filters. E.g. "$100 - $500=field_3>=100,field_3<500". This is useful for mapping out precise filters people can iteratively click. The given filter will be merged with the current filter. diff --git a/site/pages/modules/catalogues.php b/site/pages/modules/catalogues.php index 6e214cf..102dd51 100644 --- a/site/pages/modules/catalogues.php +++ b/site/pages/modules/catalogues.php @@ -36,7 +36,7 @@ class Module_catalogues $info['organisation']='ocProducts'; $info['hacked_by']=NULL; $info['hack_version']=NULL; - $info['version']=6; + $info['version']=7; $info['update_require_upgrade']=1; $info['locked']=false; return $info; @@ -68,6 +68,8 @@ class Module_catalogues deldir_contents(get_custom_file_base().'/uploads/catalogues',true); + delete_config_option('catalogues_subcat_narrowin'); + delete_specific_permission('high_catalogue_entry_timeout'); delete_menu_item_simple('_SEARCH:catalogues:type=misc'); @@ -520,6 +522,11 @@ class Module_catalogues } } } + + if ((is_null($upgrade_from)) \|\| ($upgrade_from<7)) + { + add_config_option('CATALOGUES_SUBCAT_NARROWIN','catalogues_subcat_narrowin','tick','return \'1\';','FEATURE','SECTION_CATALOGUES'); + } } /** @@ -824,7 +831,7 @@ class Module_catalogues $max=get_param_integer('max',30); $start=get_param_integer('start',0); - list($entry_buildup,$sorting,$entries,$max_rows)=get_catalogue_category_entry_buildup($id,$catalogue_name,$catalogue,'CATEGORY',$tpl_set,$max,$start,NULL,$root); + list($entry_buildup,$sorting,$entries,$max_rows)=get_catalogue_category_entry_buildup($id,$catalogue_name,$catalogue,'CATEGORY',$tpl_set,$max,$start,NULL,$root,NULL,true,NULL,either_param('active_filter','')); // Build up subcategories $rows_subcategories=$GLOBALS['SITE_DB']->query_select('catalogue_categories',array(''),array('cc_parent_id'=>$id),'',600); @@ -860,6 +867,7 @@ class Module_catalogues $num_entries=$child_counts['num_entries_children']; $map=array('page'=>'_SELF','id'=>$sc['id'],'type'=>'category'); if (!is_null($root)) $map['root']=$root; + if (get_page_name()=='catalogues') $map+=propagate_ocselect(); $url=build_url($map,'_SELF'); if ($uses_rep_image \|\| $is_ecommerce) { diff --git a/site/pages/modules/downloads.php b/site/pages/modules/downloads.php index 02560b9..ff61a9d 100644 --- a/site/pages/modules/downloads.php +++ b/site/pages/modules/downloads.php @@ -36,7 +36,7 @@ class Module_downloads $info['organisation']='ocProducts'; $info['hacked_by']=NULL; $info['hack_version']=NULL; - $info['version']=6; + $info['version']=7; $info['update_require_upgrade']=1; $info['locked']=false; return $info; @@ -62,6 +62,7 @@ class Module_downloads delete_config_option('downloads_show_stats_count_bandwidth'); delete_config_option('immediate_downloads'); delete_config_option('download_gallery_root'); + delete_config_option('downloads_subcat_narrowin'); $GLOBALS['SITE_DB']->query_delete('group_category_access',array('module_the_name'=>'downloads')); @@ -203,6 +204,11 @@ class Module_downloads { add_config_option('DOWNLOAD_GALLERY_ROOT','download_gallery_root','line','return is_null($old=get_value(\'download_gallery_root\'))?(addon_installed(\'galleries\')?\'root\':NULL):$old;','FEATURE','SECTION_DOWNLOADS'); } + + if ((is_null($upgrade_from)) \|\| ($upgrade_from<7)) + { + add_config_option('DOWNLOADS_SUBCAT_NARROWIN','downloads_subcat_narrowin','tick','return \'1\';','FEATURE','SECTION_DOWNLOADS'); + } } /* @@ -379,27 +385,6 @@ class Module_downloads $subcategories=get_download_sub_categories($id,$root,get_zone_name(),$cat_order); $downloads=get_category_downloads($id,$root,$order); - $subdownloads=new ocp_tempcode(); - require_code('ocfiltering'); - $filter_where=ocfilter_to_sqlfragment(strval($id).'','id','download_categories','parent_id','category_id','id'); - $all_rows=$GLOBALS['SITE_DB']->query('SELECT d.,text_original FROM '.get_table_prefix().'download_downloads d LEFT JOIN '.get_table_prefix().'translate t ON '.db_string_equal_to('language',user_lang()).' AND d.name=t.id WHERE '.$filter_where,20); - shuffle($all_rows); - require_code('images'); - foreach ($all_rows as $d_row) - { - if ($GLOBALS['RECORD_LANG_STRINGS_CONTENT'] \|\| is_null($d_row['text_original'])) $d_row['text_original']=get_translated_text($d_row['description']); - $d_url=build_url(array('page'=>'_SELF','type'=>'entry','id'=>$d_row['id']),'_SELF'); - if (addon_installed('galleries')) - { - $i_rows=$GLOBALS['SITE_DB']->query_select('images',array('url','thumb_url','id'),array('cat'=>'download_'.strval($d_row['id'])),'',1,$d_row['default_pic']-1); - if (array_key_exists(0,$i_rows)) - { - $thumb_url=ensure_thumbnail($i_rows[0]['url'],$i_rows[0]['thumb_url'],'galleries','images',$i_rows[0]['id']); - $subdownloads->attach(hyperlink($d_url,do_image_thumb($thumb_url,get_download_html($d_row,false)))); - } - } - } - $title_to_use=get_translated_text($category['category']); if (addon_installed('awards')) @@ -474,7 +459,7 @@ class Module_downloads } breadcrumb_add_segment($tree); - return do_template('DOWNLOAD_CATEGORY_SCREEN',array('_GUID'=>'ebb3c8708695f6a30dbd4a03f8632047','ID'=>strval($id),'SUBDOWNLOADS'=>$subdownloads,'TAGS'=>get_loaded_tags('download_categories'),'TITLE'=>$title,'SUBMIT_URL'=>$submit_url,'ADD_CAT_URL'=>$add_cat_url,'EDIT_CAT_URL'=>$edit_cat_url,'DESCRIPTION'=>$description,'SUBCATEGORIES'=>$subcategories,'DOWNLOADS'=>$downloads,'SORTING'=>$sorting)); + return do_template('DOWNLOAD_CATEGORY_SCREEN',array('_GUID'=>'ebb3c8708695f6a30dbd4a03f8632047','ID'=>strval($id),'TAGS'=>get_loaded_tags('download_categories'),'TITLE'=>$title,'SUBMIT_URL'=>$submit_url,'ADD_CAT_URL'=>$add_cat_url,'EDIT_CAT_URL'=>$edit_cat_url,'DESCRIPTION'=>$description,'SUBCATEGORIES'=>$subcategories,'DOWNLOADS'=>$downloads,'SORTING'=>$sorting)); } diff --git a/site/pages/modules/galleries.php b/site/pages/modules/galleries.php index 8663400..0275c88 100644 --- a/site/pages/modules/galleries.php +++ b/site/pages/modules/galleries.php @@ -36,7 +36,7 @@ $info['organisation']='ocProducts'; $info['hacked_by']=NULL; $info['hack_version']=NULL; - $info['version']=7; + $info['version']=8; $info['update_require_upgrade']=1; $info['locked']=false; return $info; @@ -77,6 +77,7 @@ delete_config_option('transcoding_zencoder_ftp_path'); delete_config_option('video_width_setting'); delete_config_option('video_height_setting'); + delete_config_option('galleries_subcat_narrowin'); delete_specific_permission('may_download_gallery'); delete_specific_permission('high_personal_gallery_limit'); @@ -292,6 +293,11 @@ $GLOBALS['SITE_DB']->add_table_field('galleries','gallery_views','INTEGER'); $GLOBALS['SITE_DB']->add_table_field('galleries','g_owner','?USER'); } + + if ((is_null($upgrade_from)) \|\| ($upgrade_from<8)) + { + add_config_option('GALLERIES_SUBCAT_NARROWIN','galleries_subcat_narrowin','tick','return \'1\';','FEATURE','SECTION_GALLERIES'); + } } /** @@ -988,24 +994,56 @@ if ($max<1) $max=1; $page_num=($max==0)?0:(intval(floor(floatval($start)/floatval($max)))+1); + // WHERE clause + if (get_option('galleries_subcat_narrowin')=='1') + { + require_code('ocfiltering'); + $where=ocfilter_to_sqlfragment($cat.'','id','galleries','parent_id','cat','name',true,false); + } else + { + $where=db_string_equal_to('cat',$cat); + } + if (!has_specific_permission(get_member(),'see_unvalidated')) $where.=' AND validated=1'; + if (get_param('days','')!='') $where.=' AND add_date>'.strval(time()-get_param_integer('days')606024); + + // ocSelect + $ocselect=either_param('active_filter',''); + if ($ocselect!='') + { + require_code('ocselect'); + + $content_type='image'; + list($ocselect_extra_select_images,$ocselect_extra_join_images,$ocselect_extra_where_images)=ocselect_to_sql($GLOBALS['SITE_DB'],parse_ocselect($ocselect),$content_type,''); + $extra_select_sql_images=implode('',$ocselect_extra_select_images); + $extra_join_sql_images=implode('',$ocselect_extra_join_images); + + $content_type='video'; + list($ocselect_extra_select_videos,$ocselect_extra_join_videos,$ocselect_extra_where_videos)=ocselect_to_sql($GLOBALS['SITE_DB'],parse_ocselect($ocselect),$content_type,''); + $extra_select_sql_videos=implode('',$ocselect_extra_select_videos); + $extra_join_sql_videos=implode('',$ocselect_extra_join_videos); + } else + { + $extra_select_sql_images=''; + $extra_join_sql_images=''; + $ocselect_extra_where_images=''; + $extra_select_sql_videos=''; + $extra_join_sql_videos=''; + $ocselect_extra_where_videos=''; + } + // Work out totals - $num_images=$GLOBALS['SITE_DB']->query_value('images','COUNT()',array('cat'=>$cat)); - $num_videos=$GLOBALS['SITE_DB']->query_value('videos','COUNT()',array('cat'=>$cat)); + $num_images=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'images r'.$extra_join_sql_images.' WHERE '.$where.$ocselect_extra_where_images); + $num_videos=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'videos r'.$extra_join_sql_videos.' WHERE '.$where.$ocselect_extra_where_videos); $total_rows=$num_images+$num_videos; $total_pages=($max==0)?1:intval(ceil(floatval($total_rows)/floatval($max))); if ($total_pages==0) $total_pages=1; list($sort,$sort_backwards,$sql_suffix_images,$sql_suffix_videos)=$this->get_sort_order(); - $where=db_string_equal_to('cat',$cat); - if (!has_specific_permission(get_member(),'see_unvalidated')) $where.=' AND validated=1'; - if (get_param('days','')!='') $where.=' AND add_date>'.strval(time()-get_param_integer('days')606024); - $rows=$GLOBALS['SITE_DB']->query('SELECT '.$sql_suffix_videos.' FROM '.get_table_prefix().'videos e WHERE '.$where.' ORDER BY '.$sort,$max,$start); + $rows=$GLOBALS['SITE_DB']->query('SELECT r.'.$sql_suffix_videos.$extra_select_sql_videos.' FROM '.get_table_prefix().'videos r'.$extra_join_sql_videos.' WHERE '.$where.$ocselect_extra_where_videos.' ORDER BY '.$sort,$max,$start); if (count($rows)<$max) { - $where=db_string_equal_to('cat',$cat); - if (!has_specific_permission(get_member(),'see_unvalidated')) $where.=' AND validated=1'; - $rows2=$GLOBALS['SITE_DB']->query('SELECT '.$sql_suffix_images.' FROM '.get_table_prefix().'images e WHERE '.$where.' ORDER BY '.$sort,$max-count($rows),max(0,$start-$num_videos)); + $rows2=$GLOBALS['SITE_DB']->query('SELECT r.'.$sql_suffix_images.$extra_select_sql_images.' FROM '.get_table_prefix().'images r'.$extra_join_sql_images.' WHERE '.$where.$ocselect_extra_where_images.' ORDER BY '.$sort,$max-count($rows),max(0,$start-$num_videos)); } else $rows2=array(); $entries=new ocp_tempcode(); @@ -1016,7 +1054,7 @@ // Display videos foreach ($rows as $row_video) { - $view_url=build_url(array('page'=>'_SELF','type'=>'video','root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$row_video['id'],'start'=>($start==0)?NULL:$start,'max'=>($start==get_default_gallery_max())?NULL:$max,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF'); + $view_url=build_url(array('page'=>'_SELF','type'=>'video','root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$row_video['id'],'start'=>($start==0)?NULL:$start,'max'=>($start==get_default_gallery_max())?NULL:$max,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF'); $thumb_url=ensure_thumbnail($row_video['url'],$row_video['thumb_url'],'galleries','videos',$row_video['id']); if ($thumb_url=='') $thumb_url=find_theme_image('na'); $thumb=do_image_thumb($thumb_url,'',true); @@ -1033,7 +1071,7 @@ // Display images foreach ($rows2 as $row_image) { - $view_url=build_url(array('page'=>'_SELF','type'=>'image','root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$row_image['id'],'start'=>($start==0)?NULL:$start,'max'=>($max==get_default_gallery_max())?NULL:$max,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF'); + $view_url=build_url(array('page'=>'_SELF','type'=>'image','root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$row_image['id'],'start'=>($start==0)?NULL:$start,'max'=>($max==get_default_gallery_max())?NULL:$max,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF'); $thumb_url=ensure_thumbnail($row_image['url'],$row_image['thumb_url'],'galleries','images',$row_image['id']); $thumb=do_image_thumb($thumb_url,'',true); $this_full_url=$row_image['url']; @@ -1479,8 +1517,8 @@ { if (!is_null($back_id)) { - $slideshow_previous_url=build_url(array('page'=>'_SELF','type'=>$back_type,'root'=>($root=='root')?NULL:$root,'wide_high'=>1,'id'=>$back_id,'slideshow'=>1,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF',NULL,true); // Continues, but as slideshow - $back_url=build_url(array('page'=>'_SELF','type'=>$back_type,'root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$back_id,'slideshow'=>($slideshow==0)?NULL:$slideshow,'wide_high'=>($wide_high==0)?NULL:$wide_high,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF',NULL,true); + $slideshow_previous_url=build_url(array('page'=>'_SELF','type'=>$back_type,'root'=>($root=='root')?NULL:$root,'wide_high'=>1,'id'=>$back_id,'slideshow'=>1,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF',NULL,true); // Continues, but as slideshow + $back_url=build_url(array('page'=>'_SELF','type'=>$back_type,'root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$back_id,'slideshow'=>($slideshow==0)?NULL:$slideshow,'wide_high'=>($wide_high==0)?NULL:$wide_high,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF',NULL,true); } else { $slideshow_previous_url=new ocp_tempcode(); @@ -1488,8 +1526,8 @@ } if (!is_null($next_id)) { - $slideshow_next_url=build_url(array('page'=>'_SELF','type'=>$next_type,'root'=>($root=='root')?NULL:$root,'wide_high'=>1,'id'=>$next_id,'slideshow'=>1,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF',NULL,true); // Continues, but as slideshow - $next_url=build_url(array('page'=>'_SELF','type'=>$next_type,'root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$next_id,'slideshow'=>($slideshow==0)?NULL:$slideshow,'wide_high'=>($wide_high==0)?NULL:$wide_high,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF',NULL,true); + $slideshow_next_url=build_url(array('page'=>'_SELF','type'=>$next_type,'root'=>($root=='root')?NULL:$root,'wide_high'=>1,'id'=>$next_id,'slideshow'=>1,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF',NULL,true); // Continues, but as slideshow + $next_url=build_url(array('page'=>'_SELF','type'=>$next_type,'root'=>($root=='root')?NULL:$root,'wide'=>1,'id'=>$next_id,'slideshow'=>($slideshow==0)?NULL:$slideshow,'wide_high'=>($wide_high==0)?NULL:$wide_high,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF',NULL,true); } else { $slideshow_next_url=new ocp_tempcode(); @@ -1497,8 +1535,8 @@ } // Link to show more. Preserve info about where we were - $slideshow_url=build_url(array('page'=>'_SELF','type'=>$first_type,'root'=>($root=='root')?NULL:$root,'wide_high'=>1,'id'=>$first_id,'slideshow'=>1,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF',NULL,true); - $more_url=is_null($cat)?NULL:build_url(array('page'=>'_SELF','type'=>'misc','id'=>$cat,'root'=>($root=='root')?NULL:$root,'start'=>($start==0)?NULL:$start,'max'=>($max==get_default_gallery_max())?NULL:$max,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select),'_SELF'); + $slideshow_url=build_url(array('page'=>'_SELF','type'=>$first_type,'root'=>($root=='root')?NULL:$root,'wide_high'=>1,'id'=>$first_id,'slideshow'=>1,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF',NULL,true); + $more_url=is_null($cat)?NULL:build_url(array('page'=>'_SELF','type'=>'misc','id'=>$cat,'root'=>($root=='root')?NULL:$root,'start'=>($start==0)?NULL:$start,'max'=>($max==get_default_gallery_max())?NULL:$max,'days'=>(get_param('days','')=='')?NULL:get_param('days'),'sort'=>($sort=='add_date DESC')?NULL:$sort,'select'=>($image_select=='')?NULL:$image_select,'video_select'=>($video_select=='')?NULL:$video_select)+propagate_ocselect(),'_SELF'); // Only one entry? if ($n==1) diff --git a/site/pages/modules/members.php b/site/pages/modules/members.php index 7fcc7ec..a2807fb 100644 --- a/site/pages/modules/members.php +++ b/site/pages/modules/members.php @@ -169,8 +169,25 @@ class Module_members $usergroups[$group_id]=array('USERGROUP'=>$group,'NUM'=>strval($num)); } - $query='FROM '.$GLOBALS['FORUM_DB']->get_table_prefix().'f_members WHERE id<>'.strval(db_get_first_id()); + // ocSelect + $ocselect=either_param('active_filter',''); + if ($ocselect!='') + { + require_code('ocselect'); + $content_type='member'; + list($ocselect_extra_select,$ocselect_extra_join,$ocselect_extra_where)=ocselect_to_sql($GLOBALS['SITE_DB'],parse_ocselect($ocselect),$content_type,''); + $extra_select_sql=implode('',$ocselect_extra_select); + $extra_join_sql=implode('',$ocselect_extra_join); + } else + { + $extra_select_sql=''; + $extra_join_sql=''; + $ocselect_extra_where=''; + } + + $query='FROM '.$GLOBALS['FORUM_DB']->get_table_prefix().'f_members r'.$extra_join_sql.' WHERE id<>'.strval(db_get_first_id()).$ocselect_extra_where; if (!has_specific_permission(get_member(),'see_unvalidated')) $query.=' AND m_validated=1'; + if ($group_filter!='') { if (is_numeric($group_filter)) @@ -191,7 +208,7 @@ class Module_members } $max_rows=$GLOBALS['FORUM_DB']->query_value_null_ok_full('SELECT COUNT() '.$query); - $rows=$GLOBALS['FORUM_DB']->query('SELECT * '.$query,$max,$start); + $rows=$GLOBALS['FORUM_DB']->query('SELECT r.'.$extra_select_sql.' '.$query,$max,$start); if (count($rows)==0) { return inform_screen($title,do_lang_tempcode('NO_RESULTS')); @@ -246,7 +263,7 @@ class Module_members / function profile() { - breadcrumb_set_parents(array(array('_SELF:_SELF:misc',do_lang_tempcode('MEMBERS')))); + breadcrumb_set_parents(array(array('_SELF:_SELF:misc'.propagate_ocselect_pagelink(),do_lang_tempcode('MEMBERS')))); $username=get_param('id',strval(get_member())); if ($username=='') $username=strval(get_member()); diff --git a/site/pages/modules/news.php b/site/pages/modules/news.php index 9c4d6da..8f06593 100644 --- a/site/pages/modules/news.php +++ b/site/pages/modules/news.php @@ -406,7 +406,7 @@ class Module_news $url_map=array('page'=>'_SELF','type'=>'misc','id'=>$category['id']); if (!is_null($blogs)) $url_map['blog']=$blogs; - $url=build_url($url_map,'_SELF'); + $url=build_url($url_map+propagate_ocselect(),'_SELF'); $name=$category['text_original']; $description=do_lang_tempcode('CATEGORY_SUBORDINATE_2',integer_format($count)); $img=find_theme_image($category['nc_img']); @@ -452,7 +452,7 @@ class Module_news require_code('ocfiltering'); $filter=get_param('id',get_param('filter','')); - $filters_1=ocfilter_to_sqlfragment($filter,'p.news_category','news_categories',NULL,'p.news_category','id'); // Note that the parameters are fiddled here so that category-set and record-set are the same, yet SQL is returned to deal in an entirely different record-set (entries' record-set) + $filters_1=ocfilter_to_sqlfragment($filter,'r.news_category','news_categories',NULL,'r.news_category','id'); // Note that the parameters are fiddled here so that category-set and record-set are the same, yet SQL is returned to deal in an entirely different record-set (entries' record-set) $filters_2=ocfilter_to_sqlfragment($filter,'d.news_entry_category','news_categories',NULL,'d.news_category','id'); // Note that the parameters are fiddled here so that category-set and record-set are the same, yet SQL is returned to deal in an entirely different record-set (entries' record-set) $q_filter='('.$filters_1.' OR '.$filters_2.')'; @@ -479,26 +479,41 @@ class Module_news } $filter_and=get_param('filter_and',''); - $filters_and_1=ocfilter_to_sqlfragment($filter_and,'p.news_category','news_categories',NULL,'p.news_category','id'); // Note that the parameters are fiddled here so that category-set and record-set are the same, yet SQL is returned to deal in an entirely different record-set (entries' record-set) + $filters_and_1=ocfilter_to_sqlfragment($filter_and,'r.news_category','news_categories',NULL,'r.news_category','id'); // Note that the parameters are fiddled here so that category-set and record-set are the same, yet SQL is returned to deal in an entirely different record-set (entries' record-set) $filters_and_2=ocfilter_to_sqlfragment($filter_and,'d.news_entry_category','news_categories',NULL,'d.news_category','id'); // Note that the parameters are fiddled here so that category-set and record-set are the same, yet SQL is returned to deal in an entirely different record-set (entries' record-set) $q_filter.=' AND ('.$filters_and_1.' OR '.$filters_and_2.')'; - $join=($q_filter=='')?'':(' LEFT JOIN '.get_table_prefix().'news_category_entries d ON d.news_entry=p.id'); + $join=($q_filter=='')?'':(' LEFT JOIN '.get_table_prefix().'news_category_entries d ON d.news_entry=r.id'); if ($blog===1) { $q_filter.=' AND c.nc_owner IS NOT NULL'; - $join.=' LEFT JOIN '.get_table_prefix().'news_categories c ON c.id=p.news_category'; + $join.=' LEFT JOIN '.get_table_prefix().'news_categories c ON c.id=r.news_category'; } elseif ($blog===0) { $q_filter.=' AND c.nc_owner IS NULL AND c.id IS NOT NULL'; - $join.=' LEFT JOIN '.get_table_prefix().'news_categories c ON c.id=p.news_category'; + $join.=' LEFT JOIN '.get_table_prefix().'news_categories c ON c.id=r.news_category'; + } + + // ocSelect + $ocselect=either_param('active_filter',''); + if ($ocselect!='') + { + require_code('ocselect'); + $content_type='news'; + list($ocselect_extra_select,$ocselect_extra_join,$ocselect_extra_where)=ocselect_to_sql($GLOBALS['SITE_DB'],parse_ocselect($ocselect),$content_type,''); + $extra_select_sql=implode('',$ocselect_extra_select); + $join.=implode('',$ocselect_extra_join); + $q_filter.=$ocselect_extra_where; + } else + { + $extra_select_sql=''; } - $query='SELECT ,p.id AS p_id FROM '.get_table_prefix().'news p'.$join.' WHERE '.$q_filter.((!has_specific_permission(get_member(),'see_unvalidated'))?' AND validated=1':'').(can_arbitrary_groupby()?' GROUP BY p.id':'').' ORDER BY date_and_time DESC'; + $query='SELECT ,r.id AS p_id'.$extra_select_sql.' FROM '.get_table_prefix().'news r'.$join.' WHERE '.$q_filter.((!has_specific_permission(get_member(),'see_unvalidated'))?' AND validated=1':'').(can_arbitrary_groupby()?' GROUP BY r.id':'').' ORDER BY date_and_time DESC'; $rows=$GLOBALS['SITE_DB']->query($query,$max,$start); $rows=remove_duplicate_rows($rows,'p_id'); @@ -529,10 +544,11 @@ class Module_news if ($filter!='') $map['filter']=$filter; if (($filter_and!='') && ($filter_and!='')) $map['filter_and']=$filter_and; if (!is_null($blog)) $map['blog']=$blog; + $map+=propagate_ocselect(); $url=build_url($map,'_SELF'); $_title=get_translated_tempcode($myrow['title']); $_title_plain=get_translated_text($myrow['title']); - $author_url=((addon_installed('authors')) && (!$member_based))?build_url(array('page'=>'authors','type'=>'misc','id'=>$myrow['author']),get_module_zone('authors')):new ocp_tempcode(); + $author_url=((addon_installed('authors')) && (!$member_based))?build_url(array('page'=>'authors','type'=>'misc','id'=>$myrow['author'])+propagate_ocselect(),get_module_zone('authors')):new ocp_tempcode(); $author=$myrow['author']; if (!array_key_exists($myrow['news_category'],$NEWS_CATS)) { @@ -568,11 +584,12 @@ class Module_news } } + if ($max==0) $max=1; $page_num=intval(floor(floatval($start)/floatval($max)))+1; $num_pages=intval(ceil(floatval($max_rows)/floatval($max))); - $previous_url=($start==0)?new ocp_tempcode():build_url(array('page'=>'_SELF','type'=>'misc','blog'=>$blog,'start'=>($start-$max==0)?NULL:$start-$max)+(($filter=='')?array():array('filter'=>$filter))+((($filter_and=='')?array():array('filter_and'=>$filter_and))+(($max==20)?array():array('max'=>$max))),'_SELF'); - $next_url=($rcount!=$max)?new ocp_tempcode():build_url(array('page'=>'_SELF','type'=>'misc','blog'=>$blog,'start'=>$start+$max)+(($filter=='')?array():array('filter'=>$filter))+((($filter_and=='')?array():array('filter_and'=>$filter_and))+(($max==20)?array():array('max'=>$max))),'_SELF'); + $previous_url=($start==0)?new ocp_tempcode():build_url(array('page'=>'_SELF','type'=>'misc','blog'=>$blog,'start'=>($start-$max==0)?NULL:$start-$max)+propagate_ocselect()+(($filter=='')?array():array('filter'=>$filter))+((($filter_and=='')?array():array('filter_and'=>$filter_and))+(($max==20)?array():array('max'=>$max))),'_SELF'); + $next_url=($rcount!=$max)?new ocp_tempcode():build_url(array('page'=>'_SELF','type'=>'misc','blog'=>$blog,'start'=>$start+$max)+propagate_ocselect()+(($filter=='')?array():array('filter'=>$filter))+((($filter_and=='')?array():array('filter_and'=>$filter_and))+(($max==20)?array():array('max'=>$max))),'_SELF'); $browse=do_template('NEXT_BROWSER_BROWSE_NEXT',array('_GUID'=>'264a8412dfd0b5bb80cd767702bdd600','NEXT_LINK'=>$next_url,'PREVIOUS_LINK'=>$previous_url,'PAGE_NUM'=>integer_format($page_num),'NUM_PAGES'=>integer_format($num_pages))); if ($blog===1) @@ -644,7 +661,7 @@ class Module_news $parent_title=do_lang_tempcode('NEWS_ARCHIVE'); } } - breadcrumb_set_parents(array($first_bc,array('_SELF:_SELF:misc'.(($blog===1)?':blog=1':(($blog===0)?':blog=0':'')).(($filter=='')?'':(is_numeric($filter)?(':id='.$filter):(':filter='.$filter))).(($filter_and=='')?'':(':filter_and='.$filter_and)),$parent_title))); + breadcrumb_set_parents(array($first_bc,array('_SELF:_SELF:misc'.(($blog===1)?':blog=1':(($blog===0)?':blog=0':'')).(($filter=='')?'':(is_numeric($filter)?(':id='.$filter):(':filter='.$filter))).(($filter_and=='')?'':(':filter_and='.$filter_and)).propagate_ocselect_pagelink(),$parent_title))); $rows=$GLOBALS['SITE_DB']->query_select('news',array(''),array('id'=>$id),'',1); if (!array_key_exists(0,$rows)) @@ -705,7 +722,7 @@ class Module_news if ($filter!='') $tmp[is_numeric($filter)?'id':'filter']=$filter; if (($filter_and!='') && ($filter_and!='')) $tmp['filter_and']=$filter_and; if (!is_null($blog)) $tmp['blog']=$blog; - $archive_url=build_url($tmp,'_SELF'); + $archive_url=build_url($tmp+propagate_ocselect(),'_SELF'); // Validation if ($myrow['validated']==0) diff --git a/sources/blocks/main_cc_embed.php b/sources/blocks/main_cc_embed.php index a015cbf..498e7b0 100644 --- a/sources/blocks/main_cc_embed.php +++ b/sources/blocks/main_cc_embed.php @@ -35,7 +35,7 @@ class Block_main_cc_embed $info['hack_version']=NULL; $info['version']=2; $info['locked']=false; - $info['parameters']=array('root','sort','search','filter','max','param','select','template_set','display_type'); + $info['parameters']=array('ocselect','root','sort','max','param','select','template_set','display_type'); return $info; } @@ -47,7 +47,7 @@ class Block_main_cc_embed function cacheing_environment() { $info=array(); - $info['cache_on']='array(((array_key_exists(\'root\',$map)) && ($map[\'root\']!=\'\'))?intval($map[\'root\']):get_param_integer(\'root\',NULL),array_key_exists(\'search\',$map)?$map[\'search\']:\'\',array_key_exists(\'sort\',$map)?$map[\'sort\']:\'\',array_key_exists(\'display_type\',$map)?$map[\'display_type\']:NULL,array_key_exists(\'template_set\',$map)?$map[\'template_set\']:\'\',array_key_exists(\'select\',$map)?$map[\'select\']:\'\',array_key_exists(\'param\',$map)?$map[\'param\']:db_get_first_id(),get_param_integer(\'max\',array_key_exists(\'max\',$map)?intval($map[\'max\']):30),get_param_integer(\'start\',0))'; + $info['cache_on']='array(array_key_exists(\'ocselect\',$map)?$map[\'ocselect\']:\'\',((array_key_exists(\'root\',$map)) && ($map[\'root\']!=\'\'))?intval($map[\'root\']):get_param_integer(\'root\',NULL),array_key_exists(\'sort\',$map)?$map[\'sort\']:\'\',array_key_exists(\'display_type\',$map)?$map[\'display_type\']:NULL,array_key_exists(\'template_set\',$map)?$map[\'template_set\']:\'\',array_key_exists(\'select\',$map)?$map[\'select\']:\'\',array_key_exists(\'param\',$map)?$map[\'param\']:db_get_first_id(),get_param_integer(\'max\',array_key_exists(\'max\',$map)?intval($map[\'max\']):30),get_param_integer(\'start\',0))'; $info['ttl']=602; return $info; } @@ -65,8 +65,9 @@ class Block_main_cc_embed $start=get_param_integer('start',0); $root=((array_key_exists('root',$map)) && ($map['root']!=''))?intval($map['root']):get_param_integer('root',NULL); + $ocselect=array_key_exists('ocselect',$map)?$map['ocselect']:''; + $sort=array_key_exists('sort',$map)?$map['sort']:''; - $search=array_key_exists('search',$map)?$map['search']:''; require_lang('catalogues'); require_code('catalogues'); @@ -119,7 +120,7 @@ class Block_main_cc_embed } } - list($entry_buildup,,,)=get_catalogue_category_entry_buildup(is_null($select)?$category_id:NULL,$catalogue_name,$catalogue,'CATEGORY',$tpl_set,$max,$start,$select,$root,$display_type,true,NULL,$search,$sort); + list($entry_buildup,,,)=get_catalogue_category_entry_buildup(is_null($select)?$category_id:NULL,$catalogue_name,$catalogue,'CATEGORY',$tpl_set,$max,$start,$select,$root,$display_type,true,NULL,$ocselect,$sort); return do_template('CATALOGUE_'.$tpl_set.'_CATEGORY_EMBED',array('ROOT'=>strval($root),'CATALOGUE'=>$catalogue_name,'ENTRIES'=>$entry_buildup),NULL,false,'CATALOGUE_DEFAULT_CATEGORY_EMBED'); } diff --git a/sources/blocks/main_content_filtering.php b/sources/blocks/main_content_filtering.php new file mode 100644 index 0000000..0fa4d4e --- /dev/null +++ b/sources/blocks/main_content_filtering.php @@ -0,0 +1,112 @@ +<?php /* + + ocPortal + Copyright (c) ocProducts, 2004-2012 + + See text/EN/licence.txt for full licencing information. + + + NOTE TO PROGRAMMERS: + Do not edit this file. If you need to make changes, save your changed file to the appropriate _custom folder + * If you ignore this advice, then your website upgrades (e.g. for bug fixes) will likely kill your changes ** + +/ + +/* + * @license http://opensource.org/licenses/cpal_1.0 Common Public Attribution License + * @copyright ocProducts Ltd + * @package core + / + +class Block_main_content_filtering +{ + + /* + * Standard modular info function. + * + * @return ?array Map of module info (NULL: module is disabled). + / + function info() + { + $info=array(); + $info['author']='Chris Graham'; + $info['organisation']='ocProducts'; + $info['hacked_by']=NULL; + $info['hack_version']=NULL; + $info['version']=2; + $info['locked']=false; + $info['parameters']=array('param','content_type','labels','types','links',); + return $info; + } + + /* + * Standard modular run function. + * + * @param array A map of parameters. + * @return tempcode The result of execution. + / + function run($map) + { + $links=array_key_exists('links',$map)?$map['links']:''; + $labels=$this->interpret_pairs_from_string(array_key_exists('labels',$map)?$map['labels']:''); + $types=$this->interpret_pairs_from_string(array_key_exists('types',$map)?$map['types']:''); + + if ((strpos($types,'linklist')!==false) \|\| ($links!='')) // Needs to be able to take overrides from environment if we have merge links + { + $filter=either_param('active_filter',array_key_exists('param',$map)?$map['param']:''); + } else + { + $filter=array_key_exists('param',$map)?$map['param']:''; + } + + $content_type=mixed(); + if ((array_key_exists('content_type',$map)) && ($map['content_type']!='')) + { + $content_type=$map['content_type']; + + if ((!file_exists(get_file_base().'/sources/hooks/systems/content_meta_aware/'.filter_naughty_harsh($content_type).'.php')) && (!file_exists(get_file_base().'/sources_custom/hooks/systems/content_meta_aware/'.filter_naughty_harsh($content_type).'.php'))) + return paragraph(do_lang_tempcode('NO_SUCH_CONTENT_TYPE',$content_type)); + } + + require_code('ocselect'); + + list($fields,$filter,$_links)=form_for_ocselect($filter,$labels,$content_type,$types); + + // Filter links (different from form fields, works by overlaying) + $_links2=$this->interpret_pairs_from_string($links,'\|'); + $_links=array_merge($_links,$_links2); + $links=array(); + foreach ($_links as $link_title=>$_link_filter) + { + $links[]=prepare_ocselect_merger_link($_link_filter,$link_title)+array('TITLE'=>$link_title); + } + + return do_template('BLOCK_MAIN_CONTENT_FILTERING',array( + 'FIELDS'=>$fields, + 'ACTIVE_FILTER'=>$filter, + 'LINKS'=>$links, + )); + } + + /* + * Standard modular run function. + * + * @param string Comma separated, equals separated, bits. + * @param string Separarator between pairs. + * @return array Mapping. + / + function interpret_pairs_from_string($str,$separator=',') + { + $pairs=array(); + $matches=array(); + $num_matches=preg_match_all('#([^=]+)=(?U)(.+)(?-U)'.preg_quote($separator,'#').'#',$str.$separator,$matches); + for ($i=0;$i<$num_matches;$i++) + { + $pairs[$matches[1][$i]]=$matches[2][$i]; + } + return $pairs; + } + +} + + diff --git a/sources/blocks/main_gallery_embed.php b/sources/blocks/main_gallery_embed.php index 01c9351..9918367 100644 --- a/sources/blocks/main_gallery_embed.php +++ b/sources/blocks/main_gallery_embed.php @@ -35,7 +35,7 @@ class Block_main_gallery_embed $info['hack_version']=NULL; $info['version']=2; $info['locked']=false; - $info['parameters']=array('param','select','video_select','zone','max','title','sort','days','render_if_empty'); + $info['parameters']=array('ocselect','param','select','video_select','zone','max','title','sort','days','render_if_empty'); return $info; } @@ -47,7 +47,7 @@ class Block_main_gallery_embed function cacheing_environment() { $info=array(); - $info['cache_on']='array(array_key_exists(\'render_if_empty\',$map)?$map[\'render_if_empty\']:\'0\',array_key_exists(\'days\',$map)?$map[\'days\']:\'\',array_key_exists(\'sort\',$map)?$map[\'sort\']:\'add_date DESC\',get_param_integer(\'mge_start\',0),$GLOBALS[\'FORUM_DRIVER\']->get_members_groups(get_member(),false,true),array_key_exists(\'param\',$map)?$map[\'param\']:db_get_first_id(),array_key_exists(\'zone\',$map)?$map[\'zone\']:\'\',((is_null($map)) \|\| (!array_key_exists(\'select\',$map)))?\'\':$map[\'select\'],((is_null($map)) \|\| (!array_key_exists(\'video_select\',$map)))?\'\':$map[\'video_select\'],get_param_integer(\'mge_max\',array_key_exists(\'max\',$map)?intval($map[\'max\']):30),array_key_exists(\'title\',$map)?$map[\'title\']:\'\')'; + $info['cache_on']='array(array_key_exists(\'ocselect\',$map)?$map[\'ocselect\']:\'\',array_key_exists(\'render_if_empty\',$map)?$map[\'render_if_empty\']:\'0\',array_key_exists(\'days\',$map)?$map[\'days\']:\'\',array_key_exists(\'sort\',$map)?$map[\'sort\']:\'add_date DESC\',get_param_integer(\'mge_start\',0),$GLOBALS[\'FORUM_DRIVER\']->get_members_groups(get_member(),false,true),array_key_exists(\'param\',$map)?$map[\'param\']:db_get_first_id(),array_key_exists(\'zone\',$map)?$map[\'zone\']:\'\',((is_null($map)) \|\| (!array_key_exists(\'select\',$map)))?\'\':$map[\'select\'],((is_null($map)) \|\| (!array_key_exists(\'video_select\',$map)))?\'\':$map[\'video_select\'],get_param_integer(\'mge_max\',array_key_exists(\'max\',$map)?intval($map[\'max\']):30),array_key_exists(\'title\',$map)?$map[\'title\']:\'\')'; $info['ttl']=602; return $info; } @@ -70,6 +70,8 @@ class Block_main_gallery_embed $cat=array_key_exists('param',$map)?$map['param']:'root'; $cat_select=ocfilter_to_sqlfragment($cat,'cat','galleries','parent_id','cat','name',false,false); + $ocselect=array_key_exists('ocselect',$map)?$map['ocselect']:''; + $title=array_key_exists('title',$map)?$map['title']:''; /if ((file_exists(get_custom_file_base().'/themes/default/templates_custom/JAVASCRIPT_GALLERIES.tpl')) \|\| (file_exists(get_file_base().'/themes/default/templates/JAVASCRIPT_GALLERIES.tpl'))) @@ -96,8 +98,27 @@ class Block_main_gallery_embed if (($sort!='random ASC') && ($sort!='fixed_random ASC') && ($sort!='compound_rating DESC') && ($sort!='compound_rating ASC') && ($sort!='add_date DESC') && ($sort!='add_date ASC') && ($sort!='url DESC') && ($sort!='url ASC')) $sort='add_date DESC'; list($_sort,$_dir)=explode(' ',$sort,2); - $total_images=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'images WHERE ('.$cat_select.') AND ('.$image_select.')'.$where_sup); - $total_videos=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'videos WHERE ('.$cat_select.') AND ('.$video_select.')'.$where_sup); + // ocSelect support + if ($ocselect!='') + { + // Convert the filters to SQL + require_code('ocselect'); + $content_type='image'; + if ($map['video_select']=='') $content_type='image'; + elseif ($map['select']=='') $content_type='video'; + + list($extra_select,$extra_join,$extra_where)=ocselect_to_sql($GLOBALS['SITE_DB'],parse_ocselect($ocselect),$content_type,''); + $extra_select_sql=implode('',$extra_select); + $extra_join_sql=implode('',$extra_join); + $where_sup.=$extra_where; + } else + { + $extra_select_sql=''; + $extra_join_sql=''; + } + + $total_images=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT()'.$extra_select_sql.' FROM '.get_table_prefix().'images r'.$extra_join_sql.' WHERE ('.$cat_select.') AND ('.$image_select.')'.$where_sup); + $total_videos=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT()'.$extra_select_sql.' FROM '.get_table_prefix().'videos r'.$extra_join_sql.' WHERE ('.$cat_select.') AND ('.$video_select.')'.$where_sup); if ($_sort=='random') { @@ -111,13 +132,13 @@ class Block_main_gallery_embed { if ((mt_rand(0,1)==0) \|\| ($total_videos-count($rows_videos)==0)) { - $rows=$GLOBALS['SITE_DB']->query('SELECT FROM '.get_table_prefix().'images e WHERE ('.$cat_select.') AND ('.$image_select.')'.$where_sup.' AND '.$done_images,1,mt_rand(0,$total_images-count($rows_images)-1)); + $rows=$GLOBALS['SITE_DB']->query('SELECT .'.$extra_select_sql.' FROM '.get_table_prefix().'images r'.$extra_join_sql.' WHERE ('.$cat_select.') AND ('.$image_select.')'.$where_sup.' AND '.$done_images,1,mt_rand(0,$total_images-count($rows_images)-1)); $rows_images[]=$rows[0]; $done_images.=' AND '; $done_images.='id<>'.strval($rows[0]['id']); } else { - $rows=$GLOBALS['SITE_DB']->query('SELECT FROM '.get_table_prefix().'videos e WHERE ('.$cat_select.') AND ('.$video_select.')'.$where_sup.' AND '.$done_videos,1,mt_rand(0,$total_videos-count($rows_videos)-1)); + $rows=$GLOBALS['SITE_DB']->query('SELECT .'.$extra_select_sql.' FROM '.get_table_prefix().'videos r'.$extra_join_sql.' WHERE ('.$cat_select.') AND ('.$video_select.')'.$where_sup.' AND '.$done_videos,1,mt_rand(0,$total_videos-count($rows_videos)-1)); $rows_videos[]=$rows[0]; $done_videos.=' AND '; $done_videos.='id<>'.strval($rows[0]['id']); @@ -127,7 +148,7 @@ class Block_main_gallery_embed { if ($_sort=='compound_rating') { - $rating_sort=',(SELECT AVG(rating) FROM '.get_table_prefix().'rating WHERE '.db_string_equal_to('rating_for_type','images').' AND rating_for_id=e.id) AS compound_rating'; + $rating_sort=',(SELECT AVG(rating) FROM '.get_table_prefix().'rating WHERE '.db_string_equal_to('rating_for_type','images').' AND rating_for_id=r.id) AS compound_rating'; } elseif ($_sort=='fixed_random') { $rating_sort=',(MOD(id,3.142)) AS fixed_random'; @@ -135,10 +156,10 @@ class Block_main_gallery_embed { $rating_sort=''; } - $rows_images=$GLOBALS['SITE_DB']->query('SELECT '.$rating_sort.' FROM '.get_table_prefix().'images e WHERE ('.$cat_select.') AND ('.$image_select.')'.$where_sup.' ORDER BY '.$sort,$max+$start); + $rows_images=$GLOBALS['SITE_DB']->query('SELECT '.$rating_sort.$extra_select_sql.' FROM '.get_table_prefix().'images r'.$extra_join_sql.' WHERE ('.$cat_select.') AND ('.$image_select.')'.$where_sup.' ORDER BY '.$sort,$max+$start); if ($_sort=='compound_rating') { - $rating_sort=',(SELECT AVG(rating) FROM '.get_table_prefix().'rating WHERE '.db_string_equal_to('rating_for_type','videos').' AND rating_for_id=e.id) AS compound_rating'; + $rating_sort=',(SELECT AVG(rating) FROM '.get_table_prefix().'rating WHERE '.db_string_equal_to('rating_for_type','videos').' AND rating_for_id=r.id) AS compound_rating'; } elseif ($_sort=='fixed_random') { $rating_sort=',(MOD(id,3.142)) AS fixed_random'; @@ -146,7 +167,7 @@ class Block_main_gallery_embed { $rating_sort=''; } - $rows_videos=$GLOBALS['SITE_DB']->query('SELECT '.$rating_sort.' FROM '.get_table_prefix().'videos e WHERE ('.$cat_select.') AND ('.$video_select.')'.$where_sup.' ORDER BY '.$sort,$max+$start); + $rows_videos=$GLOBALS['SITE_DB']->query('SELECT '.$rating_sort.$extra_select_sql.' FROM '.get_table_prefix().'videos r'.$extra_join_sql.' WHERE ('.$cat_select.') AND ('.$video_select.')'.$where_sup.' ORDER BY '.$sort,$max+$start); } // Sort diff --git a/sources/blocks/main_multi_content.php b/sources/blocks/main_multi_content.php index 409bb79..4a67889 100755 --- a/sources/blocks/main_multi_content.php +++ b/sources/blocks/main_multi_content.php @@ -35,7 +35,7 @@ class Block_main_multi_content $info['hack_version']=NULL; $info['version']=2; $info['locked']=false; - $info['parameters']=array('param','efficient','filter','filter_b','title','zone','mode','max','days','lifetime','pinned','no_links'); + $info['parameters']=array('ocselect','param','efficient','filter','filter_b','title','zone','mode','max','days','lifetime','pinned','no_links'); return $info; } @@ -47,7 +47,7 @@ class Block_main_multi_content function cacheing_environment() { $info=array(); - $info['cache_on']='array(array_key_exists(\'no_links\',$map)?$map[\'no_links\']:0,((array_key_exists(\'days\',$map)) && ($map[\'days\']!=\'\'))?intval($map[\'days\']):NULL,((array_key_exists(\'lifetime\',$map)) && ($map[\'lifetime\']!=\'\'))?intval($map[\'lifetime\']):NULL,((array_key_exists(\'pinned\',$map)) && ($map[\'pinned\']!=\'\'))?explode(\',\',$map[\'pinned\']):array(),array_key_exists(\'max\',$map)?intval($map[\'max\']):10,array_key_exists(\'title\',$map)?$map[\'title\']:\'\',$GLOBALS[\'FORUM_DRIVER\']->get_members_groups(get_member(),false,true),array_key_exists(\'param\',$map)?$map[\'param\']:\'download\',array_key_exists(\'efficient\',$map)?$map[\'efficient\']:\'_SEARCH\',array_key_exists(\'filter\',$map)?$map[\'filter\']:\'\',array_key_exists(\'filter_b\',$map)?$map[\'filter_b\']:\'\',array_key_exists(\'zone\',$map)?$map[\'zone\']:\'_SEARCH\',array_key_exists(\'mode\',$map)?$map[\'mode\']:\'recent\')'; + $info['cache_on']='array(array_key_exists(\'ocselect\',$map)?$map[\'ocselect\']:\'\',array_key_exists(\'no_links\',$map)?$map[\'no_links\']:0,((array_key_exists(\'days\',$map)) && ($map[\'days\']!=\'\'))?intval($map[\'days\']):NULL,((array_key_exists(\'lifetime\',$map)) && ($map[\'lifetime\']!=\'\'))?intval($map[\'lifetime\']):NULL,((array_key_exists(\'pinned\',$map)) && ($map[\'pinned\']!=\'\'))?explode(\',\',$map[\'pinned\']):array(),array_key_exists(\'max\',$map)?intval($map[\'max\']):10,array_key_exists(\'title\',$map)?$map[\'title\']:\'\',$GLOBALS[\'FORUM_DRIVER\']->get_members_groups(get_member(),false,true),array_key_exists(\'param\',$map)?$map[\'param\']:\'download\',array_key_exists(\'efficient\',$map)?$map[\'efficient\']:\'_SEARCH\',array_key_exists(\'filter\',$map)?$map[\'filter\']:\'\',array_key_exists(\'filter_b\',$map)?$map[\'filter_b\']:\'\',array_key_exists(\'zone\',$map)?$map[\'zone\']:\'_SEARCH\',array_key_exists(\'mode\',$map)?$map[\'mode\']:\'recent\')'; $info['ttl']=30; return $info; } @@ -105,6 +105,7 @@ class Block_main_multi_content $mode=array_key_exists('mode',$map)?$map['mode']:'recent'; // recent\|top\|random\|all $filter=array_key_exists('filter',$map)?$map['filter']:''; $filter_b=array_key_exists('filter_b',$map)?$map['filter_b']:''; + $ocselect=array_key_exists('ocselect',$map)?$map['ocselect']:''; $zone=array_key_exists('zone',$map)?$map['zone']:'_SEARCH'; $efficient=(array_key_exists('efficient',$map)?$map['efficient']:'1')=='1'; $title=array_key_exists('title',$map)?$map['title']:''; @@ -245,7 +246,21 @@ class Block_main_multi_content if ($where!='') $where.=' AND '; $where.=$info['extra_where_sql']; } - + + // ocSelect support + if ($ocselect!='') + { + require_code('content'); + $cma_hook=convert_ocportal_type_codes('award_hook',$type_id,'cma_hook'); + + // Convert the filters to SQL + require_code('ocselect'); + list($extra_select,$extra_join,$extra_where)=ocselect_to_sql($info['connection'],parse_ocselect($ocselect),$cma_hook,''); + $extra_select_sql.=implode('',$extra_select); + $query.=implode('',$extra_join); + $where.=$extra_where; + } + if ($mode=='all') { if ((array_key_exists('title_field',$info)) && (strpos($info['title_field'],':')===false)) diff --git a/sources/catalogues.php b/sources/catalogues.php index 9ace02a..0df6b2f 100644 --- a/sources/catalogues.php +++ b/sources/catalogues.php @@ -116,69 +116,38 @@ @param ?SHORT_INTEGER The display type to use (NULL: lookup from $catalogue) * @param boolean Whether to perform sorting * @param ?array A list of entry rows (NULL: select them normally) - * @param string Search filter (blank: no filter) + * @param string ocSelect to apply (blank: none). * @param ?ID_TEXT Orderer (NULL: read from environment) * @return array An array containing our built up entries (renderable tempcode), our sorting interface, and our entries (entry records from database, with an additional 'map' field), and the max rows / -function get_catalogue_category_entry_buildup($category_id,$catalogue_name,$catalogue,$view_type,$tpl_set,$max,$start,$select,$root,$display_type=NULL,$do_sorting=true,$entries=NULL,$search='',$_order_by=NULL) +function get_catalogue_category_entry_buildup($category_id,$catalogue_name,$catalogue,$view_type,$tpl_set,$max,$start,$select,$root,$display_type=NULL,$do_sorting=true,$entries=NULL,$_filters='',$_order_by=NULL) { - if (addon_installed('ecommerce')) - { - require_code('ecommerce'); - } - - $is_ecomm=is_ecommerce_catalogue($catalogue_name); - - if (is_null($catalogue)) - { - $_catalogues=$GLOBALS['SITE_DB']->query_select('catalogues',array(''),array('c_name'=>$catalogue_name),'',1); - $catalogue=$_catalogues[0]; - } - - if ((is_null($category_id)) && (is_null($entries))) - { - if (!is_null($select)) - { - if (((is_array($select)) && (count($select)==0)) \|\| ((is_string($select)) && ($select==''))) - { - $entries=array(); - } else + if ($_filters!='') { - if (!is_array($select)) - { - $or_list=$select; + require_code('ocselect'); + $filters=parse_ocselect($_filters); } else { - $or_list=''; - foreach ($select as $s) - { - if ($or_list!='') $or_list.=' OR '; - $or_list.='id='.strval($s); - } - } - $entries=$GLOBALS['SITE_DB']->query('SELECT * FROM '.get_table_prefix().'catalogue_entries WHERE '.db_string_equal_to('c_name',$catalogue_name).' AND ce_validated=1 AND ('.$or_list.') ORDER BY ce_add_date DESC'); - } - } else - { - fatal_exit(do_lang_tempcode('INTERNAL_ERROR')); - } + $filters=mixed(); } + // How to display if (is_null($display_type)) { $display_type=get_param_integer('keep_cat_display_type',$catalogue['c_display_type']); } - // Find order field - global $CAT_FIELDS_CACHE; - if (isset($CAT_FIELDS_CACHE[$catalogue_name])) - { - $fields=$CAT_FIELDS_CACHE[$catalogue_name]; - } else + // Find catalogue data + $is_ecomm=is_ecommerce_catalogue($catalogue_name); + if (is_null($catalogue)) { - $fields=$GLOBALS['SITE_DB']->query_select('catalogue_fields',array(''),array('c_name'=>$catalogue_name),'ORDER BY cf_order'); + $_catalogues=$GLOBALS['SITE_DB']->query_select('catalogues',array(''),array('c_name'=>$catalogue_name),'',1); + $catalogue=$_catalogues[0]; } - $CAT_FIELDS_CACHE[$catalogue_name]=$fields; + require_code('fields'); + $fields=get_catalogue_fields($catalogue_name); + + // Find order field from environment (assuming $_order_by not passed in), and decode to $order_by/$direction which are semantically quite different if ($do_sorting) { if (is_null($_order_by)) @@ -200,7 +169,7 @@ } else { list($order_by,$direction)=explode(' ',$_order_by); - if (($order_by!='rating') && ($order_by!='add_date')) + if (($order_by!='rating') && ($order_by!='add_date') && ($order_by!='distance')) { $found=false; foreach ($fields as $i=>$field) @@ -223,89 +192,30 @@ // Get entries in this category if ($select==='1=1') $select=NULL; - $map=array('cc_id'=>$category_id); - if (!has_specific_permission(get_member(),'see_unvalidated')) $map['ce_validated']=1; - $in_db_sorting=!is_null($order_by) && $do_sorting && is_null($select); require_code('fields'); if (is_null($entries)) { - if ($in_db_sorting) - { - $num_entries=$GLOBALS['SITE_DB']->query_value('catalogue_entries','COUNT()',$map); - if ($order_by=='add_date') - { - $entries=($max==0)?array():$GLOBALS['SITE_DB']->query_select('catalogue_entries e',array('e.'),$map,'ORDER BY ce_add_date '.$direction,$max,$start); - } - elseif ($order_by=='rating') - { - $select_rating='(SELECT AVG(rating) FROM '.get_table_prefix().'rating WHERE '.db_string_equal_to('rating_for_type','catalogues').' AND rating_for_id=id) AS compound_rating'; - $entries=($max==0)?array():$GLOBALS['SITE_DB']->query_select('catalogue_entries e',array('e.',$select_rating),$map,'ORDER BY compound_rating '.$direction,$max,$start); - } else - { - $ob=get_fields_hook($fields[intval($order_by)]['cf_type']); - list(,,$table)=$ob->get_field_value_row_bits($fields[$order_by]); - - if (strpos($table,'_trans')!==false) - { - $join='catalogue_entries e LEFT JOIN '.get_table_prefix().'catalogue_efv_'.$table.' f ON f.ce_id=e.id AND f.cf_id='.strval($fields[$order_by]['id']).' LEFT JOIN '.get_table_prefix().'translate t ON f.cv_value=t.id'; - $entries=($max==0)?array():$GLOBALS['SITE_DB']->query_select($join,array('e.'),$map,($num_entries>300)?'':'ORDER BY t.text_original '.$direction /* For large data sets too slow as after two MySQL joins it can't then use index for ordering /,$max,$start); - } else - { - $join='catalogue_entries e LEFT JOIN '.get_table_prefix().'catalogue_efv_'.$table.' f ON f.ce_id=e.id AND f.cf_id='.strval($fields[$order_by]['id']); - $entries=($max==0)?array():$GLOBALS['SITE_DB']->query_select($join,array('e.'),$map,'ORDER BY f.cv_value '.$direction,$max,$start); - } - } - $start=0; // To stop it skipping itself - } else - { - if ((is_null($order_by) \|\| !$do_sorting) && (!is_null($max))) - { - $entries=($max==0)?array():$GLOBALS['SITE_DB']->query_select('catalogue_entries',array(''),$map,'',$max,$start); - $num_entries=$GLOBALS['SITE_DB']->query_value('catalogue_entries','COUNT()',$map); - $start=0; // To stop it skipping itself - } else - { - $entries=($max==0)?array():$GLOBALS['SITE_DB']->query_select('catalogue_entries',array(''),$map); - $num_entries=count($entries); - } - } - } else + list($in_db_sorting,$num_entries,$entries)=get_catalogue_entries($catalogue_name,$category_id,$max,$start,$select,$do_sorting,$filters,$order_by,$direction); + } else // Oh, we already have $entries { $num_entries=count($entries); + $in_db_sorting=false; } - if (($num_entries>300) && (!$in_db_sorting)) $in_db_sorting=true; // Needed to stop huge slow down - foreach ($entries as $i=>$entry) - { - $entries[$i]['map']=get_catalogue_entry_map($entry,$catalogue,$view_type,$tpl_set,$root,$fields,(($display_type==1) && (!$is_ecomm) && (!is_null($order_by)))?array(0,intval($order_by)):NULL,false,false,intval($order_by)); - } + disable_php_memory_limit(); - // Implement search filter - if ($search!='') - { - $new_entries=array(); - for ($i=0;$i<$num_entries;$i++) + // Work out the actual rendering, but only for those results in our selection scope (for performance) + foreach ($entries as $i=>$entry) { - $two_d_list=$entries[$i]['map']['FIELDS_2D']; - $all_output=''; - foreach ($two_d_list as $index=>$l) + if (($in_db_sorting) \|\| (((is_null($start)) \|\| ($i>=$start) && ($i<$start+$max)) && ((!is_array($select)) \|\| ((is_array($select)) && (in_array($entry['id'],$select)))))) { - $all_output.=(is_object($l['VALUE'])?$l['VALUE']->evaluate():$l['VALUE']).' '; + $entries[$i]['map']=get_catalogue_entry_map($entry,$catalogue,$view_type,$tpl_set,$root,$fields,(($display_type==1) && (!$is_ecomm) && (!is_null($order_by)))?array(0,intval($order_by)):NULL,false,true,intval($order_by)); } - - if (strpos(strtolower($all_output),strtolower($search))!==false) - { - $new_entries[]=$entries[$i]; } - } - $entries=$new_entries; - } - - disable_php_memory_limit(); if ($do_sorting) { - // Sort entries + // Render sort change dropdown $selectors=new ocp_tempcode(); foreach ($fields as $i=>$field) { @@ -335,62 +245,9 @@ } $sort_url=get_self_url(false,false,array('order'=>NULL),false,true); $sorting=do_template('RESULTS_BROWSER_SORT',array('_GUID'=>'9fgjfdklgjdfgkjlfdjgd90','SORT'=>'order','RAND'=>uniqid(''),'URL'=>$sort_url,'SELECTORS'=>$selectors)); - if (!$in_db_sorting) - { - for ($i=0;$i<$num_entries;$i++) - { - if (!array_key_exists($i,$entries)) continue; - - for ($j=$i+1;$j<$num_entries;$j++) - { - if (!array_key_exists($j,$entries)) continue; - - $a=@$entries[$j]['map']['FIELD_'.$order_by]; - if (array_key_exists('FIELD_'.$order_by.'_PLAIN',@$entries[$j]['map'])) - { - $a=@$entries[$j]['map']['FIELD_'.$order_by.'_PLAIN']; - } - $b=@$entries[$i]['map']['FIELD_'.$order_by]; - if (array_key_exists('FIELD_'.$order_by.'_PLAIN',@$entries[$i]['map'])) - { - $b=@$entries[$i]['map']['FIELD_'.$order_by.'_PLAIN']; - } - if (is_object($a)) $a=$a->evaluate(); - if (is_object($b)) $b=$b->evaluate(); - if ($fields[$order_by]['cf_type']=='date') - { - $bits=explode(' ',$a,2); - $date_bits=explode((strpos($bits[0],'-')!==false)?'-':'/',$bits[0],3); - if (!array_key_exists(1,$date_bits)) $date_bits[1]=date('m'); - if (!array_key_exists(2,$date_bits)) $date_bits[2]=date('Y'); - $time_bits=explode(':',$bits[1],3); - if (!array_key_exists(1,$time_bits)) $time_bits[1]='00'; - if (!array_key_exists(2,$time_bits)) $time_bits[2]='00'; - $time_a=mktime(intval($time_bits[0]),intval($time_bits[1]),intval($time_bits[2]),intval($date_bits[1]),intval($date_bits[2]),intval($date_bits[0])); - $bits=explode(' ',$b,2); - $date_bits=explode((strpos($bits[0],'-')!==false)?'-':'/',$bits[0],3); - if (!array_key_exists(1,$date_bits)) $date_bits[1]=date('m'); - if (!array_key_exists(2,$date_bits)) $date_bits[2]=date('Y'); - $time_bits=explode(':',$bits[1],3); - if (!array_key_exists(1,$time_bits)) $time_bits[1]='00'; - if (!array_key_exists(2,$time_bits)) $time_bits[2]='00'; - $time_b=mktime(intval($time_bits[0]),intval($time_bits[1]),intval($time_bits[2]),intval($date_bits[1]),intval($date_bits[2]),intval($date_bits[0])); - - $r=($time_a<$time_b)?-1:(($time_a==$time_b)?0:1); - } else - { - $r=strnatcmp(strtolower($a),strtolower($b)); - } - if ((($r<0) && ($direction=='ASC')) \|\| (($r>0) && ($direction=='DESC'))) - { - $temp=$entries[$i]; - $entries[$i]=$entries[$j]; - $entries[$j]=$temp; - } - } - } - } + // Sort entries manually + if (!$in_db_sorting) catalogue_entries_manual_sort($fields,$entries,$order_by,$direction); } else $sorting=new ocp_tempcode(); // Build up entries @@ -422,7 +279,9 @@ $tab_entry_map=$entry['map']+(array_key_exists($i,$extra_map)?$extra_map[$i]:array()); if ((get_option('is_on_comments')=='1') && ($entry['allow_comments']>=1) \|\| (get_option('is_on_rating')=='1') && ($entry['allow_rating']==1) \|\| (get_option('is_on_trackbacks')=='1') && ($entry['allow_trackbacks']==1)) { - $tab_entry_map['VIEW_URL']=build_url(array('page'=>'catalogues','type'=>'entry','id'=>$entry['id'],'root'=>($root==-1)?NULL:$root),get_module_zone('catalogues')); + $url_map=array('page'=>'catalogues','type'=>'entry','id'=>$entry['id'],'root'=>($root==-1)?NULL:$root); + if (get_page_name()=='catalogues') $url_map+=propagate_ocselect(); + $tab_entry_map['VIEW_URL']=build_url($url_map,get_module_zone('catalogues')); } else { $tab_entry_map['VIEW_URL']=''; @@ -491,6 +350,255 @@ } /* + * Make sure we are doing necessary join to be able to access the given field + * + * @param object Database connection + * @param array Content type info + * @param ?ID_TEXT Name of the catalogue (NULL: unknown; reduces performance) + * @param array List of joins (passed as reference) + * @param array List of selects (passed as reference) + * @param ID_TEXT The field to get + * @param string The field value for this + * @param array Database field data + * @return ?array A triple: Proper database field name to access with, The fields API table type (blank: no special table), The new filter value (NULL: error) + / +function _catalogues_ocselect($db,$info,$catalogue_name,&$extra_join,&$extra_select,$filter_key,$filter_val,$db_fields) +{ + $matches=array(); + if (preg_match('#^field\_(\d+)#',$filter_key,$matches)!=0) + { + $ret=_fields_api_ocselect($db,$info,$catalogue_name,$extra_join,$extra_select,$filter_key,$filter_val,$db_fields); + return $ret; + } + + // Named + require_code('fields'); + $fields=get_catalogue_fields($catalogue_name); + foreach ($fields as $field) + { + if (get_translated_text($field['cf_name'])==$filter_key) + { + $ret=_fields_api_ocselect($db,$info,$catalogue_name,$extra_join,$extra_select,'field_'.strval($field['id']),$filter_val,$db_fields); + return $ret; + } + } + + return _default_conv_func($db,$info,$catalogue_name,$extra_join,$extra_select,$filter_key,$filter_val,$db_fields); +} + +/* + * Fetch entries from database, with sorting if possible. + * + * @param ID_TEXT Name of the catalogue + * @param ?AUTO_LINK The ID of the category for which the entries are being collected (NULL: entries are [and must be] passed instead) + * @param ?integer The maximum number of entries to show on a single page of this this category (ignored if $select is not NULL) (NULL: all) + * @param ?integer The entry number to start at (ignored if $select is not NULL) (NULL: all) + * @param ?mixed The entries to show, may be from other categories. Can either be SQL fragment, or array (NULL: use $start and $max) + * @param boolean Whether to perform sorting + * @param ?array List of filters to apply (NULL: none). Each filter is a triple: ORd comparison key(s) [separated by pipe symbols], comparison type (one of '<', '>', '<=', '>=', '=', '~=', or '~'), comparison value + * @param ID_TEXT Orderer + * @param ID_TEXT Order direction + * @param string Additional WHERE SQL to add on to query + * @return array A tuple: whether sorting was done, number of entries returned, list of entries + / +function get_catalogue_entries($catalogue_name,$category_id,$max,$start,$select,$do_sorting,$filters,$order_by,$direction,$extra_where='') +{ + $where_clause=is_null($catalogue_name)?'1=1':db_string_equal_to('c_name',$catalogue_name).$extra_where; + if (!is_null($category_id)) + { + // WHERE clause + $where_clause.=' AND '; + if (get_option('catalogues_subcat_narrowin')=='1') + { + require_code('ocfiltering'); + $where_clause=ocfilter_to_sqlfragment(strval($category_id).'','id','catalogue_categories','cc_parent_id','cc_id','id'); + } else + { + $where_clause='cc_id='.strval($category_id); + } + } + if (!has_specific_permission(get_member(),'see_unvalidated')) $where_clause.=' AND ce_validated=1'; + + // Convert the filters to SQL + require_code('ocselect'); + list($extra_select,$extra_join,$extra_where)=ocselect_to_sql($GLOBALS['SITE_DB'],$filters,'catalogue_entry',$catalogue_name); + $where_clause.=$extra_where; + + // If we're listing what IDs to look at, work out SQL for this + if ((is_null($category_id)) && (!is_null($select))) + { + if (((is_array($select)) && (count($select)==0)) \|\| ((is_string($select)) && ($select==''))) + { + $entries=array(); // This is saying we are selecting nothing, so just say that - it'll save us a query + } else // Put together some SQL for defining what to select + { + if (!is_array($select)) + { + $or_list=$select; + } else + { + $or_list=''; + foreach ($select as $s) + { + if ($or_list!='') $or_list.=' OR '; + $or_list.='id='.strval($s); + } + } + $where_clause.=' AND ('.$or_list.')'; + } + } + require_code('fields'); + $fields=get_catalogue_fields($catalogue_name); + + $num_entries=mixed(); + + $cf_type=is_numeric($order_by)?$fields[intval($order_by)]['cf_type']:''; + $can_do_db_sorting=($order_by!='distance') && ($cf_type!='date') && ($cf_type!='just_date') && ($cf_type!='just_time'); + + if (($do_sorting) && ($can_do_db_sorting)) + { + $virtual_order_by=$order_by; + + if ($order_by=='add_date') + { + $virtual_order_by='r.ce_add_date'; + } + elseif ($order_by=='rating') + { + $bits=_catalogues_ocselect($GLOBALS['SITE_DB'],array(),$catalogue_name,$extra_join,$extra_select,'compound_rating','',array()); + if (!is_null($bits)) list($virtual_order_by,)=$bits; + } elseif (is_numeric($order_by)) // Ah, so it's saying the nth field of this catalogue + { + $bits=_catalogues_ocselect($GLOBALS['SITE_DB'],array(),$catalogue_name,$extra_join,$extra_select,'field_'.strval($order_by),'',array()); + list($new_key,)=$bits; + if (!is_null($bits)) + { + if (strpos($new_key,'.text_original')!==false) + { + $num_entries=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'catalogue_entries r'.implode('',$extra_join).' WHERE '.$where_clause); + if ($num_entries>300) // For large data sets too slow as after two MySQL joins it can't then use index for ordering + { + $virtual_order_by='r.id'; + unset($extra_join[$new_key]); + } else + { + $virtual_order_by=$new_key; + } + } else + { + $virtual_order_by=$new_key; + } + } + } + } else + { + $virtual_order_by='r.id'; + } + + if (is_null($num_entries)) + $num_entries=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'catalogue_entries r'.implode('',$extra_join).' WHERE '.$where_clause); + + if ($num_entries>300) // Needed to stop huge slow down, so reduce to sorting by ID + { + $in_db_sorting=true; + $virtual_order_by='r.id'; + } + + $sql='SELECT r.'.implode(',',$extra_select).' FROM '.get_table_prefix().'catalogue_entries r'.implode('',$extra_join).' WHERE '.$where_clause; + $in_db_sorting=$do_sorting && $can_do_db_sorting; // This defines whether $virtual_order_by can actually be used in SQL (if not, we have to sort manually) + if ($in_db_sorting && $do_sorting) $sql.=' ORDER BY '.$virtual_order_by.' '.$direction; + + if ($max>0) + { + $entries=$GLOBALS['SITE_DB']->query($sql,$in_db_sorting?$max:NULL,$in_db_sorting?$start:0); + } else + { + $entries=array(); + } + + return array($in_db_sorting,$num_entries,$entries); +} + +/* + * Manually sort some catalogue entries. + * + * @param array Fields array for catalogue + * @param array Entries to sort (by reference) + * @param ID_TEXT What to sort by + * @param ID_TEXT Sort direction + * @return array Entries + / +function catalogue_entries_manual_sort($fields,&$entries,$order_by,$direction) +{ + $num_entries=count($entries); + + for ($i=0;$i<$num_entries;$i++) // Bubble sort + { + for ($j=$i+1;$j<$num_entries;$j++) + { + if ($order_by=='distance') + { + $considered_field='DISTANCE_PLAIN'; // Not in there by default, but addons might make it + } else + { + $considered_field='FIELD_'.$order_by; + } + + $a=@$entries[$j]['map'][$considered_field]; + if (array_key_exists($considered_field.'_PLAIN',@$entries[$j]['map'])) + { + $a=@$entries[$j]['map'][$considered_field.'_PLAIN']; + } + $b=@$entries[$i]['map'][$considered_field]; + + if (array_key_exists($considered_field.'_PLAIN',@$entries[$i]['map'])) + { + $b=@$entries[$i]['map'][$considered_field.'_PLAIN']; + } + if (is_object($a)) $a=$a->evaluate(); + if (is_object($b)) $b=$b->evaluate(); + + if ((isset($fields[$order_by])) && ($fields[$order_by]['cf_type']=='date')) // Special case for dates + { + $bits=explode(' ',$a,2); + $date_bits=explode((strpos($bits[0],'-')!==false)?'-':'/',$bits[0],3); + if (!array_key_exists(1,$date_bits)) $date_bits[1]=date('m'); + if (!array_key_exists(2,$date_bits)) $date_bits[2]=date('Y'); + $time_bits=explode(':',$bits[1],3); + if (!array_key_exists(1,$time_bits)) $time_bits[1]='00'; + if (!array_key_exists(2,$time_bits)) $time_bits[2]='00'; + $time_a=mktime(intval($time_bits[0]),intval($time_bits[1]),intval($time_bits[2]),intval($date_bits[1]),intval($date_bits[2]),intval($date_bits[0])); + $bits=explode(' ',$b,2); + $date_bits=explode((strpos($bits[0],'-')!==false)?'-':'/',$bits[0],3); + if (!array_key_exists(1,$date_bits)) $date_bits[1]=date('m'); + if (!array_key_exists(2,$date_bits)) $date_bits[2]=date('Y'); + $time_bits=explode(':',$bits[1],3); + if (!array_key_exists(1,$time_bits)) $time_bits[1]='00'; + if (!array_key_exists(2,$time_bits)) $time_bits[2]='00'; + $time_b=mktime(intval($time_bits[0]),intval($time_bits[1]),intval($time_bits[2]),intval($date_bits[1]),intval($date_bits[2]),intval($date_bits[0])); + + $r=($time_a<$time_b)?-1:(($time_a==$time_b)?0:1); + } + elseif ($order_by=='distance') // By distance + { + $r=(floatval($a)<floatval($b))?-1:1; + } else // Normal case + { + $r=strnatcmp(strtolower($a),strtolower($b)); + } + if ((($r<0) && ($direction=='ASC')) \|\| (($r>0) && ($direction=='DESC'))) + { + $temp=$entries[$i]; + $entries[$i]=$entries[$j]; + $entries[$j]=$temp; + } + } + } + + return $entries; +} + +/* * Get a map of the fields for the given entry. * * @param array A database row of the entry we are working with @@ -640,7 +748,9 @@ require_code('feedback'); $c_value=array_key_exists('FIELD_0_PLAIN_PURE',$map)?$map['FIELD_0_PLAIN_PURE']:$map['FIELD_0_PLAIN']; if (is_object($c_value)) $c_value=$c_value->evaluate(); - $self_url=build_url(array('page'=>'catalogues','type'=>'entry','id'=>$id),get_module_zone('catalogues'),NULL,false,false,true); + $url_map=array('page'=>'catalogues','type'=>'entry','id'=>$id); + if (get_page_name()=='catalogues') $url_map+=propagate_ocselect(); + $self_url=build_url($url_map,get_module_zone('catalogues'),NULL,false,false,true); if (($feedback_details) \|\| ($only_fields!==array(0))) { $map['RATING']=($entry['allow_rating']==1)?display_rating($self_url,$c_value,'catalogues',strval($id),'RATING_INLINE_STATIC',$entry['ce_submitter']):new ocp_tempcode(); @@ -663,7 +773,9 @@ if ((get_option('is_on_comments')=='1') && ($entry['allow_comments']>=1) \|\| (get_option('is_on_rating')=='1') && ($entry['allow_rating']==1) \|\| (get_option('is_on_trackbacks')=='1') && ($entry['allow_trackbacks']==1) \|\| (!$all_visible)) { - $map['VIEW_URL']=($tpl_set=='WML')?make_string_tempcode('wap.php?page=catalogues&type=entry&id='.strval($id)):build_url(array('page'=>'catalogues','type'=>'entry','id'=>$id,'root'=>($root==-1)?NULL:$root),get_module_zone('catalogues')); + $url_map=array('page'=>'catalogues','type'=>'entry','id'=>$id,'root'=>($root==-1)?NULL:$root); + if (get_page_name()=='catalogues') $url_map+=propagate_ocselect(); + $map['VIEW_URL']=build_url($url_map,get_module_zone('catalogues')); } else { $map['VIEW_URL']=''; @@ -1134,6 +1246,7 @@ { $map=array('page'=>'catalogues','type'=>'category','id'=>$category_id); if (!is_null($root)) $map['root']=$root; + if (get_page_name()=='catalogues') $map+=propagate_ocselect(); $url=build_url($map,get_module_zone('catalogues')); if (is_null($category_id)) return new ocp_tempcode(); @@ -1323,7 +1436,9 @@ $url=build_url(array('page'=>'_SELF','type'=>'index','id'=>$catalogue_name),'_SELF'); $map['TREE']->attach(hyperlink($url,escape_html(get_translated_text($catalogue['c_title'])),false,false,do_lang('INDEX'))); $map['TREE']->attach(do_template('BREADCRUMB_ESCAPED')); - $url=build_url(array('page'=>'_SELF','type'=>'category','id'=>$category['id']),'_SELF'); + $url_map=array('page'=>'_SELF','type'=>'category','id'=>$category['id']); + if (get_page_name()=='catalogues') $url_map+=propagate_ocselect(); + $url=build_url($url_map,'_SELF'); $map['TREE']->attach(hyperlink($url,escape_html(get_translated_text($category['cc_title'])),false,false,do_lang('GO_BACKWARDS_TO',get_translated_text($category['cc_title'])),NULL,NULL,'up')); } $map['CATEGORY_TITLE']=get_translated_text($category['cc_title']); diff --git a/sources/downloads.php b/sources/downloads.php index 41e49ff..ac15c77 100644 --- a/sources/downloads.php +++ b/sources/downloads.php @@ -66,7 +66,9 @@ function get_download_html($row,$pic=true,$breadcrumbs=true,$zone=NULL,$text_sum $filesize=($filesize>0)?clean_file_size($filesize):do_lang('UNKNOWN'); $description=get_translated_tempcode($row['description']); $root=get_param_integer('root',db_get_first_id(),true); - $download_url=build_url(array('page'=>'downloads','type'=>'entry','id'=>$row['id'],'root'=>($root==db_get_first_id())?NULL:$root),$zone); + $map=array('page'=>'downloads','type'=>'entry','id'=>$row['id'],'root'=>($root==db_get_first_id())?NULL:$root); + if (get_page_name()=='downloads') $map+=propagate_ocselect(); + $download_url=build_url($map,$zone); $date=get_timezoned_date($row['add_date'],false); $date_raw=$row['add_date']; @@ -376,7 +378,7 @@ function download_breadcrumbs($category_id,$root=NULL,$no_link_for_me_sir=true,$ if (is_null($root)) $root=db_get_first_id(); if (is_null($zone)) $zone=get_module_zone('downloads'); - $url=build_url(array('page'=>'downloads','type'=>'misc','id'=>($category_id==db_get_first_id())?NULL:$category_id,'root'=>($root==db_get_first_id())?NULL:$root),$zone); + $url=build_url(array('page'=>'downloads','type'=>'misc','id'=>($category_id==db_get_first_id())?NULL:$category_id,'root'=>($root==db_get_first_id())?NULL:$root)+propagate_ocselect(),$zone); if (($category_id==$root) \|\| ($category_id==db_get_first_id())) { @@ -449,10 +451,35 @@ function get_category_downloads($category_id,$root,$order=NULL) $max=get_param_integer('max',30); $start=get_param_integer('start',0); + // WHERE clause + if (get_option('downloads_subcat_narrowin')=='1') + { + require_code('ocfiltering'); + $map=ocfilter_to_sqlfragment(strval($category_id).'','id','download_categories','parent_id','category_id','id'); + } else + { + $map='category_id='.strval($category_id); + } + if (!has_specific_permission(get_member(),'see_unvalidated')) $map.=' AND validated=1'; + + // ocSelect + $ocselect=either_param('active_filter',''); + if ($ocselect!='') + { + require_code('ocselect'); + $content_type='download'; + list($ocselect_extra_select,$ocselect_extra_join,$ocselect_extra_where)=ocselect_to_sql($GLOBALS['SITE_DB'],parse_ocselect($ocselect),$content_type,''); + $extra_select_sql=implode('',$ocselect_extra_select); + $extra_join_sql=implode('',$ocselect_extra_join); + $map.=$ocselect_extra_where; + } else + { + $extra_select_sql=''; + $extra_join_sql=''; + } + // How many might there have been? (So we know how to browse pages nicely) - $map=array('category_id'=>$category_id); - if (!has_specific_permission(get_member(),'see_unvalidated')) $map['validated']=1; - $max_rows=$GLOBALS['SITE_DB']->query_value('download_downloads','COUNT()',$map); + $max_rows=$GLOBALS['SITE_DB']->query_value_null_ok_full('SELECT COUNT() FROM '.get_table_prefix().'download_downloads r'.$extra_join_sql.' WHERE '.$map); // Quick security check if (is_null($order)) @@ -476,7 +503,7 @@ function get_category_downloads($category_id,$root,$order=NULL) $NON_CANONICAL_PARAMS[]='order'; // Fetch - $rows=$GLOBALS['SITE_DB']->query_select('download_downloads d LEFT JOIN '.get_table_prefix().'translate t ON '.db_string_equal_to('language',user_lang()).' AND d.name=t.id',array('d.','text_original'),$map,'ORDER BY '.$order,$max,$start); + $rows=$GLOBALS['SITE_DB']->query('SELECT r.,t.text_original'.$extra_select_sql.' FROM '.get_table_prefix().'download_downloads r'.$extra_join_sql.' LEFT JOIN '.get_table_prefix().'translate t ON '.db_string_equal_to('t.language',user_lang()).' AND r.name=t.id WHERE '.$map.' ORDER BY '.$order,$max,$start); $out=new ocp_tempcode(); foreach ($rows as $myrow) { @@ -488,7 +515,7 @@ function get_category_downloads($category_id,$root,$order=NULL) if ($out->is_empty()) return $out; require_code('templates_results_browser'); - $out->attach(results_browser(do_lang_tempcode('SECTION_DOWNLOADS'),$category_id,$start,'start',$max,'max',$max_rows,$root,'misc')); + $out->attach(results_browser(do_lang_tempcode('SECTION_DOWNLOADS'),$category_id,$start,'start',$max,'max',$max_rows,$root,'misc',true)); return $out; } @@ -530,7 +557,7 @@ function get_download_sub_categories($category_id,$root=NULL,$zone=NULL,$order=N $num_downloads=$info['num_downloads_children']; $display_string=do_lang_tempcode('CATEGORY_SUBORDINATE',integer_format($num_downloads),integer_format($num_children)); - $url=build_url(array('page'=>'downloads','type'=>'misc','id'=>($child_id==db_get_first_id())?NULL:$child_id,'root'=>($root==db_get_first_id())?NULL:$root,'order'=>get_param('order',NULL)),$zone); + $url=build_url(array('page'=>'downloads','type'=>'misc','id'=>($child_id==db_get_first_id())?NULL:$child_id,'root'=>($root==db_get_first_id())?NULL:$root,'order'=>get_param('order',NULL))+propagate_ocselect(),$zone); if ($myrow['rep_image']!='') { diff --git a/sources/fields.php b/sources/fields.php index 1fd9549..1e6ed2b 100644 --- a/sources/fields.php +++ b/sources/fields.php @@ -19,6 +19,29 @@ / /** + * Ensure a catalogues fields are loaded up in a cache, and return them. + * + * @param ?ID_TEXT The name of the catalogue (NULL: all catalogues) + * @return array The fields + / +function get_catalogue_fields($catalogue_name=NULL) +{ + global $CAT_FIELDS_CACHE; + if (isset($CAT_FIELDS_CACHE[$catalogue_name])) + { + $fields=$CAT_FIELDS_CACHE[$catalogue_name]; + } else + { + $where=array(); + if (!is_null($catalogue_name)) + $where+=array('c_name'=>$catalogue_name); + $fields=$GLOBALS['SITE_DB']->query_select('catalogue_fields',array(''),$where,'ORDER BY cf_order'); + $CAT_FIELDS_CACHE[$catalogue_name]=$fields; + } + return $fields; +} + +/** * Get a fields hook, from a given codename. * * @param ID_TEXT Codename diff --git a/sources/forum/ocf.php b/sources/forum/ocf.php index 250de38..38e8407 100644 --- a/sources/forum/ocf.php +++ b/sources/forum/ocf.php @@ -515,10 +515,14 @@ class forum_driver_ocf extends forum_driver_base if (get_value('username_profile_links')=='1') { $username=$GLOBALS['FORUM_DRIVER']->get_username($id); - $_url=build_url(array('page'=>'members','type'=>'view','id'=>is_null($username)?strval($id):$username),get_module_zone('members'),NULL,false,false,!$tempcode_okay); + $map=array('page'=>'members','type'=>'view','id'=>is_null($username)?strval($id):$username); + if (get_page_name()=='members') $map+=propagate_ocselect(); + $_url=build_url($map,get_module_zone('members'),NULL,false,false,!$tempcode_okay); } else { - $_url=build_url(array('page'=>'members','type'=>'view','id'=>$id),get_module_zone('members'),NULL,false,false,!$tempcode_okay); + $map=array('page'=>'members','type'=>'view','id'=>$id); + if (get_page_name()=='members') $map+=propagate_ocselect(); + $_url=build_url($map,get_module_zone('members'),NULL,false,false,!$tempcode_okay); } if (($tempcode_okay) && (get_base_url()==get_forum_base_url())) return $_url; $url=$_url->evaluate(); diff --git a/sources/galleries.php b/sources/galleries.php index 42d264a..943c546 100644 --- a/sources/galleries.php +++ b/sources/galleries.php @@ -217,7 +217,9 @@ function show_gallery_box($child,$root='root',$show_member_stats_if_appropriate= { $member_id=get_member_id_from_gallery_name($child['name'],$child); } - $url=build_url(array('page'=>'galleries','type'=>'misc','root'=>($root=='root')?NULL:$root,'id'=>$child['name']),$zone); + $url_map=array('page'=>'galleries','type'=>'misc','root'=>($root=='root')?NULL:$root,'id'=>$child['name']); + if (get_page_name()=='galleries') $url_map+=propagate_ocselect(); + $url=build_url($url_map,$zone); $_title=get_translated_text($child['fullname']); $pic=$child['rep_image']; if (($pic=='') && ($is_member)) $pic=$GLOBALS['FORUM_DRIVER']->get_member_avatar_url($member_id); @@ -637,7 +639,9 @@ function gallery_breadcrumbs($category_id,$root='root',$no_link_for_me_sir=true, { if ($category_id=='') $category_id='root'; // To fix corrupt data - $url=build_url(array('page'=>'galleries','type'=>'misc','id'=>$category_id,'root'=>($root=='root')?NULL:$root),$zone); + $url_map=array('page'=>'galleries','type'=>'misc','id'=>$category_id,'root'=>($root=='root')?NULL:$root); + if (get_page_name()=='galleries') $url_map+=propagate_ocselect(); + $url=build_url($url_map,$zone); if (($category_id==$root) \|\| ($category_id=='root')) { @@ -673,6 +677,7 @@ function gallery_breadcrumbs($category_id,$root='root',$no_link_for_me_sir=true, { list($page_link,$title)=$bits; list($zone,$map,$hash)=page_link_decode($page_link); + if (get_page_name()=='galleries') $map+=propagate_ocselect(); $url=build_url($map,$zone,NULL,false,false,false,$hash); if ($i!=0) $below->attach(do_template('BREADCRUMB_ESCAPED')); $below->attach(hyperlink($url,escape_html($title),false,false,do_lang_tempcode('GO_BACKWARDS_TO',$title),NULL,NULL,'up')); diff --git a/sources/hooks/systems/content_meta_aware/catalogue_entry.php b/sources/hooks/systems/content_meta_aware/catalogue_entry.php index a100e8c..410fae9 100644 --- a/sources/hooks/systems/content_meta_aware/catalogue_entry.php +++ b/sources/hooks/systems/content_meta_aware/catalogue_entry.php @@ -58,6 +58,9 @@ class Hook_content_meta_aware_catalogue_entry 'addon_name'=>'catalogues', 'module'=>'catalogues', + + 'ocselect'=>'catalogues::_catalogues_ocselect', + 'ocselect_protected_fields'=>array(), // These are ones even some staff should never know ); } diff --git a/sources/hooks/systems/content_meta_aware/member.php b/sources/hooks/systems/content_meta_aware/member.php index e6db67d..5040296 100755 --- a/sources/hooks/systems/content_meta_aware/member.php +++ b/sources/hooks/systems/content_meta_aware/member.php @@ -57,6 +57,9 @@ class Hook_content_meta_aware_member 'addon_name'=>'core_ocf', 'module'=>'members', + + 'ocselect'=>'ocf_members2::_members_ocselect', + 'ocselect_protected_fields'=>array('m_pass_hash_salted','m_pass_salt','m_password_change_code'), // These are ones even some staff should never know ); } diff --git a/sources/hooks/systems/profiles_tabs/about.php b/sources/hooks/systems/profiles_tabs/about.php index 1850aa6..3348af8 100755 --- a/sources/hooks/systems/profiles_tabs/about.php +++ b/sources/hooks/systems/profiles_tabs/about.php @@ -284,8 +284,6 @@ class Hook_Profiles_Tabs_about $b=($photo_thumb_url=='')?0:intval(get_option('thumb_width')); $right_margin=(max($a,$b)==0)?'auto':(strval(max($a,$b)+6).'px'); - breadcrumb_set_parents(array(array('_SELF:_SELF:misc',do_lang_tempcode('MEMBERS')))); - if (has_specific_permission($member_id_viewing,'see_ip')) { $ip_address=$GLOBALS['FORUM_DRIVER']->get_member_row_field($member_id_of,'m_ip_address'); diff --git a/sources/lang3.php b/sources/lang3.php index ed59a6a..c4c89f2 100644 --- a/sources/lang3.php +++ b/sources/lang3.php @@ -99,13 +99,12 @@ function _find_all_langs($even_empty_langs=false) } /** - * Get a nice formatted XHTML listed language selector. + * Get the title for a language. * - * @param ?LANGUAGE_NAME The language to have selected by default (NULL: uses the current language) - * @param boolean Whether to show languages that have no language details currently defined for them - * @return tempcode The language selector + * @param LANGUAGE_NAME The language to have selected by default + * @return string The language title / -function _nice_get_langs($select_lang=NULL,$show_unset=false) +function get_language_title($lang) { global $LANGS_MAP; @@ -117,6 +116,18 @@ function _nice_get_langs($select_lang=NULL,$show_unset=false) $LANGS_MAP=better_parse_ini_file($map_b); } + return array_key_exists($lang,$LANGS_MAP)?$LANGS_MAP[$lang]:$lang; +} + +/* + * Get a nice formatted XHTML listed language selector. + * + * @param ?LANGUAGE_NAME The language to have selected by default (NULL: uses the current language) + * @param boolean Whether to show languages that have no language details currently defined for them + * @return tempcode The language selector + / +function _nice_get_langs($select_lang=NULL,$show_unset=false) +{ $langs=new ocp_tempcode(); $_langs=find_all_langs(); @@ -124,11 +135,12 @@ function _nice_get_langs($select_lang=NULL,$show_unset=false) foreach (array_keys($_langs) as $lang) { - $langs->attach(form_input_list_entry($lang,($lang==$select_lang),array_key_exists($lang,$LANGS_MAP)?$LANGS_MAP[$lang]:$lang)); + $langs->attach(form_input_list_entry($lang,($lang==$select_lang),get_language_title($lang))); } if ($show_unset) { + global $LANGS_MAP; asort($LANGS_MAP); foreach ($LANGS_MAP as $lang=>$full) { diff --git a/sources/ocf_members2.php b/sources/ocf_members2.php index d3d99d6..7ca57a1 100644 --- a/sources/ocf_members2.php +++ b/sources/ocf_members2.php @@ -19,6 +19,53 @@ / /** + * Make sure we are doing necessary join to be able to access the given field + * + * @param object Database connection + * @param array Content type info + * @param ?ID_TEXT Context (unused) + * @param array List of joins (passed as reference) + * @param array List of selects (passed as reference) + * @param ID_TEXT The field to get + * @param string The field value for this + * @param array Database field data + * @return ?array A triple: Proper database field name to access with, The fields API table type (blank: no special table), The new filter value (NULL: error) + / +function _members_ocselect($db,$info,$context,&$extra_join,&$extra_select,$filter_key,$field_val,$db_fields) +{ + // If it's trivial + if (($filter_key=='id') \|\| (preg_match('#^m\_[\w\_]+$#',$filter_key)!=0)) + { + if (!array_key_exists($filter_key,$db_fields)) return NULL; + return array($filter_key,'',$field_val); + } + + // CPFS... + // ------- + + $join_sql=' LEFT JOIN '.$db->get_table_prefix().'f_member_custom_fields f ON f.mf_member_id=r.id'; + + if (!in_array($join_sql,$extra_join)) + $extra_join[$filter_key]=$join_sql; + + $new_filter_key=$filter_key; + if (is_numeric($filter_key)) + { + $new_filter_key='field_'.strval($new_filter_key); + } + elseif (preg_match('#^field\_\d+$#',$filter_key)==0) // If it's not already correct + { + require_code('ocf_members'); + $new_filter_key='field_'.strval(find_cpf_field_id($filter_key)); + } else + { + if (!array_key_exists($filter_key,$db_fields)) return NULL; + } + + return array($new_filter_key,'',$field_val); +} + +/* * Get tempcode for a mouseover for a member. For use with OCF_POSTER_MEMBER.tpl. * * @param mixed Either a member ID or an array containing: ip_address, poster_num_warnings, poster, poster_posts, poster_points, poster_join_date_string, primary_group_name. diff --git a/sources/ocselect.php b/sources/ocselect.php new file mode 100644 index 0000000..5b90145 --- /dev/null +++ b/sources/ocselect.php @@ -0,0 +1,807 @@ +<?php /* + + ocPortal + Copyright (c) ocProducts, 2004-2012 + + See text/EN/licence.txt for full licencing information. + + + NOTE TO PROGRAMMERS: + Do not edit this file. If you need to make changes, save your changed file to the appropriate _custom folder + * If you ignore this advice, then your website upgrades (e.g. for bug fixes) will likely kill your changes ** + +/ + +/* + * @license http://opensource.org/licenses/cpal_1.0 Common Public Attribution License + * @copyright ocProducts Ltd + * @package core + / + +/* + * Read an ocSelect parameter value from GET/POST. + * + * @param ID_TEXT The field name + * @param ?ID_TEXT The field type (NULL: work out what is there to read automatically) + * @return string The parameter value + / +function read_ocselect_parameter_from_env($field_name,$field_type=NULL) +{ + if (is_null($field_type)) + { + $env=$_POST+$_GET; + + $field_type='line'; + if (!array_key_exists('filter_'.$field_name,$env)) + { + if (array_key_exists('filter_'.$field_name.'_year',$env)) + { + $field_type='time'; + } + } elseif (is_array($env['filter_'.$field_name])) + { + $field_type='multilist'; + } + } + + if (($field_type=='date') \|\| ($field_type=='time')) + { + $_default_value=get_input_date('filter_'.$field_name,true); + $default_value=is_null($_default_value)?'':strval($_default_value); + } elseif ($field_type=='multilist') + { + $default_value=array_key_exists('filter_'.$field_name,$_POST)?implode(',',$_POST['filter_'.$field_name]):''; + } else + { + $default_value=post_param('filter_'.$field_name,''); + } + return $default_value; +} + +/* + * Get a form for inputting unknown variables within a filter. + * + * @param string String-based search filter (blank: make one up to cover everything, but only works if $table is known) + * @param ?array Labels for field names (NULL: none, use auto-generated) + * @param ?ID_TEXT Content-type to auto-probe from (NULL: none, use string inputs) + * @param ?array Field types (NULL: none, use string inputs / defaults for table) + * @return array The form fields, The modded filter, Merger links + / +function form_for_ocselect($filter,$labels=NULL,$content_type=NULL,$types=NULL) +{ + $table=mixed(); + $db=$GLOBALS['SITE_DB']; + $info=array(); + if (!is_null($content_type)) + { + require_code('hooks/systems/content_meta_aware/'.$content_type); + $ob=object_factory('Hook_content_meta_aware_'.$content_type); + $info=$ob->info(); + + $table=$info['table']; + if (($content_type=='post') \|\| ($content_type=='topic') \|\| ($content_type=='member') \|\| ($content_type=='group') \|\| ($content_type=='forum')) + { + $db=$GLOBALS['FORUM_DB']; + } + } + + if (is_null($labels)) $labels=array(); + if (is_null($types)) $types=array(); + + $fields_needed=array(); + + require_lang('ocselect'); + + $catalogue_name=mixed(); + if (preg_match('#^\w+$#',$filter)!=0) + { + $catalogue_name=$filter; + } + + $_links=array(); + + // Load up fields to compare to + if ($table!==NULL) + { + $db_fields=collapse_2d_complexity('m_name','m_type',$db->query_select('db_meta',array('m_name','m_type'),array('m_table'=>$table))); + + if (isset($info['feedback_type_code'])) + { + $db_fields['compound_rating']='INTEGER'; + $types['compound_rating']='rating'; + } + + if (isset($info['seo_type_code'])) + { + $db_fields['meta_keywords']='SHORT_TEXT'; + $db_fields['meta_description']='LONG_TEXT'; + $types['meta_keywords']='line'; + $types['meta_description']='line'; + } + + // Custom fields + require_code('content'); + $award_hook=convert_ocportal_type_codes('cma_hook',$content_type,'award_hook'); + if (!is_null($award_hook)) + { + require_code('hooks/systems/awards/'.$award_hook); + $ob2=object_factory('Hook_awards_'.$award_hook); + $info2=$ob2->info(); + if ((isset($info2['supports_custom_fields'])) && ($info2['supports_custom_fields'])) + { + require_code('fields'); + $catalogue_fields=list_to_map('id',get_catalogue_fields(($award_hook=='catalogue_entry')?$catalogue_name:'_'.$award_hook)); + foreach ($catalogue_fields as $catalogue_field) + { + if ($catalogue_field['cf_put_in_search']==1) + { + $remapped_name='field_'.strval($catalogue_field['id']); + $db_fields[$remapped_name]='SHORT_TEXT'; + $types[$remapped_name]=$catalogue_field['cf_type']; + $labels[$remapped_name]=get_translated_text($catalogue_field['cf_name']); + } + } + } + } + + if ($filter=='') + { + foreach ($db_fields as $key=>$type) + { + if ($key=='notes') continue; // Protected, staff notes + if ((isset($info['ocselect_protected_fields'])) && (in_array($key,$info['ocselect_protected_fields']))) continue; + + $type=str_replace(array('?',''),array('',''),$type); + switch ($type) + { + // Any of these field types will go into the default filter (we support some that don't, but user likely does not want them) + case 'BINARY': + case 'SHORT_INTEGER': + case 'UINTEGER': + case 'INTEGER': + case 'TIME': + case 'USER': + case 'REAL': + case 'LONG_TEXT': + case 'SHORT_TEXT': + case 'LONG_TRANS': + case 'SHORT_TRANS': + case 'MINIID_TEXT': + case 'ID_TEXT': + if ($filter!='') $filter.=','; + $filter.=$key.'<'.$key.'_op><'.$key.'>'; + break; + } + } + } + } else + { + $db_fields=array(); + } + + $filters=parse_ocselect($filter); + + foreach ($filters as $_filter) + { + list(,$filter_op,$filter_val)=$_filter; + + // Operator + $matches=array(); + if (preg_match('#^<([\w\_\-]+)>$#',$filter_op,$matches)!=0) + { + $field_name=filter_naughty_harsh($matches[1]); + $field_title=array_key_exists($field_name,$labels)?make_string_tempcode($labels[$field_name]):do_lang_tempcode('OPERATOR_FOR',escape_html(titleify(preg_replace('#^filter\_#','',preg_replace('#\_op$#','',$field_name))))); + + $fields_needed[]=array( + 'list', + $field_name, + $field_title, + post_param('filter_'.$field_name,'~='), + array( + '<'=>do_lang_tempcode('OCSELECT_OP_LT'), + '>'=>do_lang_tempcode('OCSELECT_OP_GT'), + '<='=>do_lang_tempcode('OCSELECT_OP_LTE'), + '>='=>do_lang_tempcode('OCSELECT_OP_GTE'), + '='=>do_lang_tempcode('OCSELECT_OP_EQ'), + '=='=>do_lang_tempcode('OCSELECT_OP_EQE'), + '~='=>do_lang_tempcode('OCSELECT_OP_CO'), + '~'=>do_lang_tempcode('OCSELECT_OP_FT'), + ) + ); + } + + // Filter inputter + $matches=array(); + if (preg_match('#^<([\w\_\-]+)>$#',$filter_val,$matches)!=0) + { + $field_name=filter_naughty_harsh($matches[1]); + + $extra=mixed(); + + if (array_key_exists($field_name,$types)) + { + $field_type=$types[$field_name]; + + if (($field_type=='list') \|\| ($field_type=='linklist') \|\| ($field_type=='mulilist')) + { + // Work out what list values there are + $extra=array(); + if (!is_null($table)) + { + if (($field_name!='meta_keywords') && ($field_name!='meta_description') && ($field_name!='compound_rating')) + { + $_extra=$db->query_select($table,array('DISTINCT '.filter_naughty_harsh($field_name)),NULL,'ORDER BY '.filter_naughty_harsh($field_name)); + foreach ($_extra as $e) + { + if (!is_string($e[$field_name])) $e[$field_name]=strval($e[$field_name]); + $extra[$e[$field_name]]=$e[$field_name]; + } + } else + { + if ($field_name=='meta_keywords') + { + $_extra=$db->query_select('seo_meta',array('DISTINCT meta_keywords'),NULL,'ORDER BY '.filter_naughty_harsh($field_name)); + foreach ($_extra as $e) + { + $keywords=explode(',',$e['meta_keywords']); + foreach ($keywords as $k) + { + $extra[trim($k)]=$e[trim($k)]; + } + } + } + } + } + ksort($extra); + } + } else + { + $field_type='line'; + if (array_key_exists($field_name,$db_fields)) + { + switch (str_replace(array('?',''),array('',''),$db_fields[$field_name])) + { + case 'TIME': + $field_type='time'; + break; + case 'BINARY': + $field_type='tick'; + break; + case 'AUTO': + case 'AUTO_LINK': + case 'SHORT_INTEGER': + case 'UINTEGER': + case 'INTEGER': + case 'GROUP': + $field_type='integer'; + break; + case 'USER': + $field_type='username'; + break; + case 'REAL': + $field_type='float'; + break; + case 'MD5': + case 'URLPATH': + case 'IP': + case 'LONG_TEXT': + case 'SHORT_TEXT': + case 'LONG_TRANS': + case 'SHORT_TRANS': + $field_type='line'; + break; + case 'MINIID_TEXT': + case 'ID_TEXT': + $field_type='codename'; + break; + case 'LANGUAGE_NAME': + $field_type='list'; + require_code('lang3'); + $_extra=array_keys(find_all_langs()); + $extra=array(); + foreach (array_keys(find_all_langs()) as $lang) + { + $extra[$lang]=get_language_title($lang); + } + break; + } + } + } + + $field_title=array_key_exists($field_name,$labels)?$labels[$field_name]:titleify(preg_replace('#^filter\_#','',$field_name)); + + $default_value=read_ocselect_parameter_from_env($field_name,$field_type); + + $fields_needed[]=array( + $field_type, + $field_name, + $field_title, + $default_value, + $extra, + ); + } + } + + require_code('form_templates'); + + $form_fields=new ocp_tempcode(); + foreach ($fields_needed as $field) + { + list($field_type,$field_name,$field_label,$default_value,$extra)=$field; + + switch ($field_type) // NB: These type codes also vaguelly correspond to field hooks, just for convention (we don't use them) + { + case 'time': + $form_fields->attach(form_input_date($field_label,'',$field_name,true,$default_value=='',true,($default_value=='')?NULL:intval($default_value))); + break; + + case 'date': + $form_fields->attach(form_input_date($field_label,'',$field_name,true,$default_value=='',false,($default_value=='')?NULL:intval($default_value))); + break; + + case 'days': + $list_options=new ocp_tempcode(); + $days_options=array(); + foreach (array(2,5,15,30,45,60,120,240,365) as $days_option) + $days_options[strval(time()-606024$days_option)]=do_lang_tempcode('SUBMIT_AGE_DAYS',escape_html(integer_format($days_option))); + $list_options->attach(form_input_list_entry('',$default_value=='','')); + foreach ($days_options as $key=>$val) + $list_options->attach(form_input_list_entry($key,$default_value==$key,$val)); + $form_fields->attach(form_input_list($field_label,'',$field_name,$list_options,NULL,false,false)); + break; + + case 'tick': + $list_options=new ocp_tempcode(); + foreach (array(''=>'','0'=>do_lang_tempcode('NO'),'1'=>do_lang_tempcode('YES')) as $key=>$val) + $list_options->attach(form_input_list_entry($key,$default_value==$key,$val)); + $form_fields->attach(form_input_list($field_label,'',$field_name,$list_options,NULL,false,false)); + break; + + case 'rating': + $list_options=new ocp_tempcode(); + $list_options->attach(form_input_list_entry('',$default_value=='','')); + foreach (array(1=>'✩',4=>'✩✩',6=>'✩✩✩',8=>'✩✩✩✩',10=>'✩✩✩✩✩') as $rating=>$rating_label) + $list_options->attach(form_input_list_entry(strval($rating),$default_value==strval($rating),protect_from_escaping($rating_label))); + $form_fields->attach(form_input_list($field_label,'',$field_name,$list_options,NULL,false,false)); + break; + + case 'list': + $list_options=new ocp_tempcode(); + $list_options->attach(form_input_list_entry('',$default_value=='','')); + foreach ($extra as $key=>$val) + $list_options->attach(form_input_list_entry($key,$default_value==$key,$val)); + $form_fields->attach(form_input_list($field_label,'',$field_name,$list_options,NULL,false,false)); + break; + + case 'multilist': + $list_options=new ocp_tempcode(); + foreach ($extra as $key=>$val) + $list_options->attach(form_input_list_entry($key,preg_match('#(^\|,)'.str_replace('#','\#',preg_quote($key)).'(,\|$)#',$default_value)!=0,$val)); + $form_fields->attach(form_input_multi_list($field_label,'',$field_name,$list_options,NULL,5,false)); + break; + + case 'linklist': + foreach ($extra as $key=>$val) + $_links[$val]=$key; + break; + + case 'float': + $form_fields->attach(form_input_float($field_label,'',$field_name,($default_value=='')?NULL:floatval($default_value),false)); + break; + + case 'integer': + $form_fields->attach(form_input_integer($field_label,'',$field_name,($default_value=='')?NULL:intval($default_value),false)); + break; + + case 'email': + $form_fields->attach(form_input_email($field_label,'',$field_name,$default_value,false)); + break; + + case 'author': + $form_fields->attach(form_input_author($field_label,'',$field_name,$default_value,false)); + break; + + case 'username': + $form_fields->attach(form_input_username($field_label,'',$field_name,$default_value,false)); + break; + + case 'codename': + $form_fields->attach(form_input_codename($field_label,'',$field_name,$default_value,false)); + break; + + case 'line': + default: + $form_fields->attach(form_input_line($field_label,'',$field_name,$default_value,false)); + break; + } + } + + return array($form_fields,$filter,$_links); +} + +/** + * Parse some string based ocSelect search filters into the expected array structure. + * + * @param string String-based search filter + * @return array Parsed structure + / +function parse_ocselect($filter) +{ + $parsed=array(); + foreach (preg_split('#(,\|\n)#',$filter) as $bit) + { + if ($bit!='') + { + $parts=preg_split('#(<[\w\-\_]+>\|<=\|>=\|<\|>\|=\|==\|~=\|~)#',$bit,2,PREG_SPLIT_DELIM_CAPTURE); // NB: preg_split is not greedy, so longest operators need to go first + if (count($parts)==3) $parsed[]=$parts; + } + } + return $parsed; +} + +/* + * Take some parsed ocSelect search filters into the string format (i.e. reverse of parse_ocselect). + * + * @param array Parsed structure + * @return string String-based search filter + / +function unparse_ocselect($parsed) +{ + $filter=''; + foreach ($parsed as $_filter) + { + list($filter_key,$filter_op,$filter_val)=$_filter; + if ($filter!='') $filter.=','; + $filter.=$filter_key.$filter_op.$filter_val; + } + return $filter; +} + +/* + * Make sure we are doing necessary join to be able to access the given field + * + * @param object Database connection + * @param array Content type info + * @param ?ID_TEXT Name of the catalogue (NULL: unknown; reduces performance) + * @param array List of joins (passed as reference) + * @param array List of selects (passed as reference) + * @param ID_TEXT The field to get + * @param string The field value for this + * @param array Database field data + * @return ?array A triple: Proper database field name to access with, The fields API table type (blank: no special table), The new filter value (NULL: error) + / +function _fields_api_ocselect($db,$info,$catalogue_name,&$extra_join,&$extra_select,$filter_key,$filter_val,$db_fields) +{ + require_code('fields'); + $fields=list_to_map('id',get_catalogue_fields($catalogue_name)); + + $matches=array(); + if (preg_match('#^field\_(\d+)#',$filter_key,$matches)==0) return NULL; + $field_in_seq=intval($matches[1]); + + if ((!isset($fields[intval($field_in_seq)])) \|\| ($fields[intval($field_in_seq)]['cf_put_in_search']==0)) return NULL; + + $ob=get_fields_hook($fields[intval($field_in_seq)]['cf_type']); + list(,,$table)=$ob->get_field_value_row_bits($fields[$field_in_seq]); + + if (strpos($table,'_trans')!==false) + { + $extra_join[$filter_key]=' LEFT JOIN '.$db->get_table_prefix().'catalogue_efv_'.$table.' f'.strval($field_in_seq).' ON f'.strval($field_in_seq).'.ce_id=r.id AND f'.strval($field_in_seq).'.cf_id='.strval($fields[$field_in_seq]['id']).' LEFT JOIN '.$db->get_table_prefix().'translate t'.strval($field_in_seq).' ON f'.strval($field_in_seq).'.cv_value=t'.strval($field_in_seq).'.id'; + return array('t'.strval($field_in_seq).'.text_original',$table,$filter_val); + } + + $extra_join[$filter_key]=' LEFT JOIN '.$db->get_table_prefix().'catalogue_efv_'.$table.' f'.strval($field_in_seq).' ON f'.strval($field_in_seq).'.ce_id=r.id AND f'.strval($field_in_seq).'.cf_id='.strval($fields[$field_in_seq]['id']); + return array('f'.strval($field_in_seq).'.cv_value',$table,$filter_val); +} + +/* + * Make sure we are doing necessary join to be able to access the given field + * + * @param object Database connection + * @param array Content type info + * @param ?ID_TEXT Name of the catalogue (NULL: unknown; reduces performance) + * @param array List of joins (passed as reference) + * @param array List of selects (passed as reference) + * @param ID_TEXT The field to get + * @param string The field value for this + * @param array Database field data + * @return ?array A triple: Proper database field name to access with, The fields API table type (blank: no special table), The new filter value (NULL: error) + / +function _default_conv_func($db,$info,$unused,&$extra_join,&$extra_select,$filter_key,$filter_val,$db_fields) +{ + // Special case for ratings + if ($filter_key=='compound_rating') + { + $clause='(SELECT AVG(rating) FROM '.$db->get_table_prefix().'rating rat WHERE '.db_string_equal_to('rat.rating_for_type','catalogues').' AND rat.rating_for_id=r.id)'; + $extra_select[$filter_key]=', '.$clause.' AS compound_rating'; + return array($clause,'',$filter_val); + } + + // Special case for SEO fields + if (($filter_key=='meta_keywords') \|\| ($filter_key=='meta_description')) + { + $seo_type_code=isset($info['seo_type_code'])?$info['seo_type_code']:'!!!ERROR!!!'; + $join=' LEFT JOIN '.$db->get_table_prefix().'seo_meta sm ON sm.meta_for_id=r.id AND '.db_string_equal_to('sm.meta_for_type',$seo_type_code); + if (!in_array($join,$extra_join)) + $extra_join[$filter_key]=$join; + return array($clause,'',$filter_val); + } + + // Fields API + $matches=array(); + if ((preg_match('#^field\_(\d+)#',$filter_key,$matches)!=0) && (isset($info['cma_hook']))) + { + return _fields_api_ocselect($db,$info,'_'.$info['cma_hook'],$extra_join,$extra_select,$filter_key,$filter_val,$db_fields); + } + + $filter_key=filter_naughty_harsh($filter_key); + + // Natural fields + $field_type=''; + if (array_key_exists($filter_key,$db_fields)) + { + switch (str_replace(array('?',''),array('',''),$db_fields[$filter_key])) + { + case 'AUTO': + case 'AUTO_LINK': + case 'SHORT_INTEGER': + case 'UINTEGER': + case 'INTEGER': + case 'TIME': + case 'BINARY': + case 'GROUP': + $field_type='integer'; + break; + case 'USER': + $field_type='integer'; + if ((!is_numeric($filter_val)) && ($filter_val!='')) + { + $_filter_val=$GLOBALS['FORUM_DRIVER']->get_member_from_username($filter_val); + $filter_val=is_null($_filter_val)?'':strval($_filter_val); + } + break; + case 'REAL': + $field_type='float'; + break; + case 'MD5': + case 'URLPATH': + case 'LANGUAGE_NAME': + case 'IP': + case 'MINIID_TEXT': + case 'ID_TEXT': + case 'LONG_TEXT': + case 'SHORT_TEXT': + $field_type='line'; + break; + case 'LONG_TRANS': + case 'SHORT_TRANS': + $field_type='line'; + static $filter_i=1; + $extra_join[$filter_key]=' LEFT JOIN '.$db->get_table_prefix().'translate ft'.strval($filter_i).' ON ft'.strval($filter_i).'.id='.strval($filter_key); + $filter_key='ft'.strval($filter_i).'.text_original'; + $filter_i++; + break; + } + } else + { + // Fields API (named) + if (isset($info['cma_hook'])) + { + require_code('fields'); + $fields=list_to_map('id',get_catalogue_fields('_'.$info['cma_hook'])); + foreach ($fields as $field) + { + if (get_translated_text($field['cf_name'])==$filter_key) + { + return _fields_api_ocselect($db,$info,'_'.$info['cma_hook'],$extra_join,$extra_select,'field_'.strval($field['id']),$filter_val,$db_fields); + } + } + } + + return NULL; + } + + // $filter_key is exactly as said in most cases + + return array($filter_key,$field_type,$filter_val); +} + +/** + * Convert some ocSelect filters into some SQL fragments. + * + * @param object Database object to use + * @param array Parsed ocSelect structure + * @param ID_TEXT The content type (blank: no function needed, direct in-table mapping always works) + * @param string First parameter to send to the conversion function, may mean whatever that function wants it to. If we have no conversion function, this is the name of a table to read field meta data from + * @return array Tuple: array of extra select, array of extra join, string of extra where + / +function ocselect_to_sql($db,$filters,$content_type='',$context='') +{ + // Nothing to do? + if ((is_null($filters)) \|\| ($filters==array())) return array(array(),array(),''); + + // Get the conversion function. The conversion function takes field names and works out how that results in SQL + $info=array(); + $conv_func='_default_conv_func'; + if ($content_type!='') + { + require_code('hooks/systems/content_meta_aware/'.$content_type); + $ob=object_factory('Hook_content_meta_aware_'.$content_type); + $info=$ob->info(); + $info['cma_hook']=$content_type; + + if (isset($info['ocselect'])) + { + if (strpos($info['ocselect'],'::')!==false) + { + list($code_file,$conv_func)=explode('::',$info['ocselect']); + require_code($code_file); + } else + { + $conv_func=$info['ocselect']; + } + } + } + + $extra_select=array(); + $extra_join=array(); + $where_clause=''; + + $disallowed_fields=array('notes'); + $disallowed_fields[]='notes'; + if (isset($info['ocselect_protected_fields'])) + { + $disallowed_fields=array_merge($disallowed_fields,$info['ocselect_protected_fields']); + } + $configured_protected_fields=get_value('ocselect_protected_fields'); + if ((!is_null($configured_protected_fields)) && ($configured_protected_fields!='')) + { + $disallowed_fields=array_merge($disallowed_fields,explode(',',$configured_protected_fields)); + } + + // Load up fields to compare to + $db_fields=array(); + if (isset($info['table'])) + { + $table=$info['table']; + $db_fields=collapse_2d_complexity('m_name','m_type',$db->query_select('db_meta',array('m_name','m_type'),array('m_table'=>$table))); + } + + foreach ($filters as $filter_i=>$filter) + { + list($filter_keys,$filter_op,$filter_val)=$filter; + + // Allow specification of reading from the environment + $matches=array(); + if (preg_match('#^<([\w\_\-]+)>$#',$filter_op,$matches)!=0) + { + $filter_op=either_param($matches[1],'~='); + } + if (preg_match('#^<([\w\_\-]+)>$#',$filter_val,$matches)!=0) + { + $filter_val=read_ocselect_parameter_from_env($matches[1]); + } + + if ($filter_op!='==') + { + if ($filter_val=='') continue; + } + + $filter_keys=preg_replace('#[^\w\\|]#','',$filter_keys); // So can safely come from environment + + $alt=''; + + // Go through each filter (these are ANDd) + foreach (explode('\|',$filter_keys) as $filter_key) + { + if (in_array($filter_key,$disallowed_fields)) continue; + + $bits=call_user_func_array($conv_func,array($db,$info,&$context,&$extra_join,&$extra_select,&$filter_key,$filter_val,$db_fields)); // call_user_func_array has to be used for reference passing, bizarrely + if (is_null($bits)) + { + require_lang('ocselect'); + attach_message(do_lang_tempcode('OCSELECT_UNKNOWN_FIELD',escape_html($filter_key)),'warn'); + + continue; + } + list($filter_key,$field_type,$filter_val)=$bits; + + if (in_array($filter_key,$disallowed_fields)) continue; + + switch ($filter_op) + { + case '<': + case '>': + case '<=': + case '>=': + if ((is_numeric($filter_val)) && (($field_type=='integer') \|\| ($field_type=='float') \|\| ($field_type==''))) + { + if ($alt!='') $alt.=' OR '; + $alt.=$filter_key.$filter_op.$filter_val; + } + break; + + case '=': + if ($alt!='') $alt.=' OR '; + if ((is_numeric($filter_val)) && (($field_type=='integer') \|\| ($field_type=='float') \|\| ($field_type==''))) + $alt.=$filter_key.'='.strval($filter_val); + else + $alt.=db_string_equal_to($filter_key,$filter_val); + break; + + case '~': + if (strlen($filter_val)>3) // Within MySQL filter limits + { + if ($filter_val!='') + { + if ($alt!='') $alt.=' OR '; + $alt.=str_replace('?',$filter_key,db_full_text_assemble($filter_val,false)); + } + break; + } + + case '~=': + if ($filter_val!='') + { + if ($alt!='') $alt.=' OR '; + $alt.=$filter_key.' LIKE \''.db_encode_like('%'.$filter_val.'%').'\''; + /$alt.=$filter_key.' LIKE \''.db_encode_like('% '.$filter_val.' %').'\''; + $alt.=' OR '.$filter_key.' LIKE \''.db_encode_like($filter_val.' %').'\''; + $alt.=' OR '.$filter_key.' LIKE \''.db_encode_like('% '.$filter_val).'\'';/ + } + break; + + default: + fatal_exit(do_lang_tempcode('INTERNAL_ERROR')); // Impossible opcode + } + } + if ($alt!='') $where_clause.=' AND ('.$alt.')'; + } + + return array($extra_select,$extra_join,$where_clause); +} + +/* + * Get template-ready details for a merger-link style ocfilter. This is used to do filtering via drill-down using links. + * + * @param string ocSelect filter + * @return array Template-ready details + / +function prepare_ocselect_merger_link($_link_filter) +{ + $active_filter=parse_ocselect(either_param('active_filter','')); + $link_filter=parse_ocselect($_link_filter); + $extra_params=array(); + $old_filter=$active_filter; + foreach ($link_filter as $filter_bits) + { + list($filter_key,$filter_op,$filter_val)=$filter_bits; + + // Propagate/inject in filter value + $matches=array(); + if (preg_match('#^<([\w\_\-]+)>$#',$filter_val,$matches)!=0) + { + $filter_val=read_ocselect_parameter_from_env($matches[1]); + $extra_params['filter_'.$matches[1]]=$filter_val; + } + + // Take out any rules pertaining to this key from the active filter + foreach ($old_filter as $i2=>$filter_bits_2) + { + list($filter_key_2,$filter_op_2,$filter_val_2)=$filter_bits_2; + if ($filter_key_2==$filter_key) unset($old_filter[$i2]); + } + } + $extra_params['active_filter']=unparse_ocselect(array_merge($old_filter,$link_filter)); + $link_url=get_self_url(false,false,$extra_params); + $active=true; + foreach ($extra_params as $key=>$val) + { + if (read_ocselect_parameter_from_env($key)!=$val) $active=false; + } + + return array( + 'ACTIVE'=>$active, + 'URL'=>$link_url, + ); +} diff --git a/sources/site.php b/sources/site.php index 065108c..1f05bf0 100644 --- a/sources/site.php +++ b/sources/site.php @@ -54,7 +54,7 @@ function init__site() $FEED_URL_2=NULL; global $NON_CANONICAL_PARAMS; - $NON_CANONICAL_PARAMS=array('keep_has_js','keep_session','redirected','redirect_url','redirect','redirect_passon','keep_devtest','keep_su','wide_print','keep_cache','keep_markers','keep_print','keep_novalidate','keep_no_query_limit','keep_avoid_memory_limit','keep_no_swfupload','keep_no_xhtml','keep_no_minify','keep_no_frames','keep_su_online','keep_show_parse_errors','keep_firephp_queries','keep_firephp','keep_fatalistic','keep_currency','keep_country','keep_mobile','keep_textonly','keep_noiepng','keep_no_debug_mode','keep_referrer','keep_timezone'); + $NON_CANONICAL_PARAMS=array('active_filter','keep_has_js','keep_session','redirected','redirect_url','redirect','redirect_passon','keep_devtest','keep_su','wide_print','keep_cache','keep_markers','keep_print','keep_novalidate','keep_no_query_limit','keep_avoid_memory_limit','keep_no_swfupload','keep_no_xhtml','keep_no_minify','keep_no_frames','keep_su_online','keep_show_parse_errors','keep_firephp_queries','keep_firephp','keep_fatalistic','keep_currency','keep_country','keep_mobile','keep_textonly','keep_noiepng','keep_no_debug_mode','keep_referrer','keep_timezone'); global $ATTACHED_MESSAGES,$ATTACHED_MESSAGES_RAW,$FAILED_TO_ATTACH_ALL_ERRORS; $ATTACHED_MESSAGES=new ocp_tempcode(); diff --git a/sources/support.php b/sources/support.php index fef3778..12b125e 100644 --- a/sources/support.php +++ b/sources/support.php @@ -2049,3 +2049,53 @@ function get_site_salt() //$site_salt.=serialize($SITE_INFO); return md5($site_salt); } + +/* + * Turn a boring codename, into a "pretty" title. + * + * @param ID_TEXT The codename + * @return string The title + / +function titleify($boring) +{ + return ucwords(str_replace('_',' ',$boring)); +} + +/* + * Propagate ocSelect through links. + * + * @return array Extra URL mappings + / +function propagate_ocselect() +{ + $active_filter=either_param('active_filter',''); + $map=array(); + if ($active_filter!='') + { + $map['active_filter']=$active_filter; + foreach (array_keys($_GET+$_POST) as $key) + { + if (substr($key,0,7)=='filter_') + { + $map[$key]=either_param($key,''); + } + } + } + return $map; +} + +/* + * Propagate ocSelect through page-links. + * + * @return array Extra URL mappings + / +function propagate_ocselect_pagelink() +{ + $map=propagate_ocselect(); + $_map=''; + foreach ($map as $key=>$val) + { + $_map.=':'.$key.'='.urlencode($val); + } + return $_map; +} diff --git a/themes/default/templates/BLOCK_MAIN_CONTENT_FILTERING.tpl b/themes/default/templates/BLOCK_MAIN_CONTENT_FILTERING.tpl new file mode 100644 index 0000000..c4e2dd2 --- /dev/null +++ b/themes/default/templates/BLOCK_MAIN_CONTENT_FILTERING.tpl @@ -0,0 +1,43 @@ +{$JAVASCRIPT_INCLUDE,javascript_validation} + +{+START,IF_NON_EMPTY,{FIELDS}} + <form title="{!PRIMARY_PAGE_FORM}" method="get" action="{$URL_FOR_GET_FORM,{$SELF_URL}}"> + {+START,IF_NON_PASSED,GET}{$INSERT_SPAMMER_BLACKHOLE}{+END} + + {+START,IF_PASSED,GET}{$HIDDENS_FOR_GET_FORM,{$SELF_URL,0,0,0,active_filter=<null>}}{+END} + + <div> + <input type="hidden" name="active_filter" value="{ACTIVE_FILTER}" /> + + <div class="wide_table_wrap"><table summary="{!MAP_TABLE}" class="dottedborder wide_table"> + {+START,IF,{$NOT,{$MOBILE}}} + <colgroup> + <col style="width: 198px" /> + <col style="width: 100%" /> + </colgroup> + {+END} + + <tbody> + {FIELDS} + </tbody> + </table></div> + + {+START,INCLUDE,FORM_STANDARD_END}SUBMIT_NAME={!FILTER}{+END} + </div> + </form> +{+END} + +{+START,IF_NON_EMPTY,{LINKS}} + <ul> + {+START,LOOP,LINKS} + <li> + {+START,IF,{ACTIVE}} + {TITLE} + {+END} + {+START,IF,{$NOT,{ACTIVE}}} + <a href="{URL}">{TITLE}</a> + {+END} + </li> + {+END} + </ul> +{+END} diff --git a/themes/default/templates/DOWNLOAD_CATEGORY_SCREEN.tpl b/themes/default/templates/DOWNLOAD_CATEGORY_SCREEN.tpl index 8d42b69..95da1d2 100644 --- a/themes/default/templates/DOWNLOAD_CATEGORY_SCREEN.tpl +++ b/themes/default/templates/DOWNLOAD_CATEGORY_SCREEN.tpl @@ -58,31 +58,4 @@ 3_REL=edit {+END} -{+START,IF_NON_EMPTY,{SUBDOWNLOADS}} - <hr class="long_break" /> - {+START,BOX,{!RANDOM_20_DOWNLOADS},,light} - {$JAVASCRIPT_INCLUDE,javascript_dyn_comcode} - - {$SET,carousel_id,{$RAND}} - - <div id="carousel_{$GET,carousel_id}" class="carousel" style="display: none"> - <div class="move_left" onmousedown="carousel_move({$GET,carousel_id},-100); return false;" onmouseover="this.className='move_left move_left_hover';" onmouseout="this.className='move_left';"></div> - <div class="move_right" onmousedown="carousel_move({$GET,carousel_id},+100); return false;" onmouseover="this.className='move_right move_right_hover';" onmouseout="this.className='move_right';"></div> - - <div class="main"> - </div> - </div> - - <div class="carousel_temp" id="carousel_ns_{$GET,carousel_id}"> - {SUBDOWNLOADS} - </div> - - <script type="text/javascript">// <![CDATA[ - addEventListenerAbstract(window,'load',function () { - initialise_carousel({$GET,carousel_id}); - } ); - //]]></script> - {+END} -{+END} - {+START,IF,{$CONFIG_OPTION,show_screen_actions}}{+START,IF_PASSED,_TITLE}{$BLOCK,failsafe=1,block=main_screen_actions,title={$META_DATA,title}}{+END}{+END} Filtercode.patch (132,251 bytes) Filtercode.tar (839,680 bytes)

Time estimation (hours)	16
Sponsorship open

Date Added	Member	Amount Sponsored

Chris Graham 2011-11-10 11:46 administrator ~230	See forum discussion: http://compo.sr/forum/topicview/misc/deploying/provide-the-ability-for.htm?redirected=1#post_76732

Chris Graham 2012-05-08 19:19 administrator ~456	Tests... main_content_filtering block renders a sensible form for a selected content type main_content_filtering generates an appropriate default filter: no silly fields, appropriate field selector for all shown main_content_filtering generates an appropriate default filter for a catalogue: hidden fields do not come up on filter main_content_filtering generates an appropriate default filter for inclusion of a content type's custom fields main_content_filtering specification of replacement field labels works main_content_filtering specification of replacement field types works The main_content_filtering block works in-situ (i.e. the form really does filter stuff as expected) The "merge links" option on the main_content_filtering works to allow iteratively filtering via link clicking main_content_filtering form "time" field selector renders and works correctly main_content_filtering form "date" field selector renders and works correctly main_content_filtering form "days" field selector renders and works correctly main_content_filtering form "tick" field selector renders and works correctly main_content_filtering form "rating" field selector renders and works correctly main_content_filtering form "list" field selector renders and works correctly, allowing selection from any value previously entered for the field attached to the filter main_content_filtering form "list" field selector renders and works correctly for the magic meta_keywords filter, allowing selection from any tag main_content_filtering form "multilist" field selector renders and works correctly main_content_filtering form "linklist" field selector renders and works correctly main_content_filtering form "float" field selector renders and works correctly main_content_filtering form "integer" field selector renders and works correctly main_content_filtering form "email" field selector renders and works correctly main_content_filtering form "author" field selector renders and works correctly main_content_filtering form "username" field selector renders and works correctly main_content_filtering form "codename" field selector renders and works correctly main_content_filtering form "line" field selector renders and works correctly Filtercode works on default fields Filtercode works on custom fields, when specified as field_<fieldid> Filtercode works on custom fields, when specified by the human-readable title for the field The Filtercode ">" operator works as expected The Filtercode "=" operator works as expected (equals check, excluding blank) The Filtercode "==" operator works as expected (equals check, including blank) The Filtercode "~" operator works as expected (full-text search) The Filtercode "~=" operator works as expected (substring check) Filtercode filter works for news - check things pass filters Filtercode filter works for news - check nothing passes impossible filter Filtercode propagates across news pagination Filtercode propagates down to news subcategories Filtercode propagates down to news entries Filtercode propagates back via news breadcrumbs Filtercode filter works for members - check things pass filters Filtercode filter works for members - check nothing passes impossible filter Filtercode propagates across members pagination Filtercode propagates down to members subcategories Filtercode propagates down to members entries Filtercode propagates back via members breadcrumbs Filtercode works on custom profile fields, when specified as field_<fieldid> Filtercode works on custom profile fields, when specified by the human-readable title for the field It is impossible to use an Filtercode filter on a password field The "Narrow-in when browsing" works for galleries Filtercode filter works for galleries - check things pass filters Filtercode filter works for galleries - check nothing passes impossible filter Filtercode propagates across galleries pagination Filtercode propagates down to galleries subcategories Filtercode propagates down to images Filtercode propagates back via galleries breadcrumbs The "Narrow-in when browsing" works for catalogues Filtercode filter works for catalogue - check things pass filters Filtercode filter works for catalogue - check nothing passes impossible filter Filtercode propagates across catalogue pagination Filtercode propagates down to catalogue subcategories Filtercode propagates down to catalogue entries Filtercode propagates back via catalogue breadcrumbs The "Narrow-in when browsing" works for downloads Filtercode filter works for downloads - check things pass filters Filtercode filter works for downloads - check nothing passes impossible filter Filtercode propagates across downloads pagination Filtercode propagates down to downloads subcategories Filtercode propagates down to download entries Filtercode propagates back via downloads breadcrumbs Filtercode works with the magic compound_rating field Filtercode works with the magic meta_keywords field Trying to do an Filtercode on non-existent errors produces an appropriate error, not a stack trace The hidden 'Filtercode_protected_fields' option allows locking down fields so Filtercode can't work on them Hidden catalogue fields cannot be filtered using Filtercode

Chris Graham 2012-05-08 21:51 administrator ~457	This one turned into quite a mammouth exercise. It is implemented across 5 content types (the ones you'd want to filter), as well as anything that is loaded up using the main_multi_content block. It introduces a non-trivial new language to Composr, Filtercode, that has great flexibility and is now a key building block of Composr. There really is a great deal of power in how you can do filtering. A tutorial was posted in the topic linked above. A patch and TAR has been attached. The patch/TAR will definitely conflict with the "catalogue grid view" (forget the exact name) patch that was recently implemented. That is because both heavily alter catalogue category display. The "unstable" development branch has everything working in harmony of course. The .patch file won't apply to 8.0.1 right away, but it probably work on 8.0.2. This is because some minor bugs were found during development that had to be fixed, and it didn't make sense to roll the fixes into the patch itself.