diff options
| -rw-r--r-- | include/category_cats.inc.php | 5 | ||||
| -rw-r--r-- | include/common.inc.php | 6 | ||||
| -rw-r--r-- | include/functions_category.inc.php | 10 | ||||
| -rw-r--r-- | include/functions_html.inc.php | 34 | ||||
| -rw-r--r-- | include/section_init.inc.php | 17 | ||||
| -rw-r--r-- | index.php | 3 |
6 files changed, 46 insertions, 29 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index a5fe848e5..ff131c007 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -215,11 +215,6 @@ if (count($categories) > 0) update_cats_with_filtered_data($categories); } - // add default event handler for rendering category literal description - add_event_handler('render_category_literal_description', - create_function('$d', - 'return strip_tags($d, \'<a><br><p><b><i><small><strong><font>\');')); - trigger_action('loc_begin_index_category_thumbnails', $categories); if ($conf['subcatify']) { diff --git a/include/common.inc.php b/include/common.inc.php index f3e4f093d..ee043642c 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -171,9 +171,9 @@ if (is_a_guest()) } // template instance -if +if ( - defined('IN_ADMIN') and IN_ADMIN and + defined('IN_ADMIN') and IN_ADMIN and isset($user['admin_template']) and isset($user['admin_theme']) ) @@ -262,6 +262,8 @@ if (isset($conf['header_notes'])) } // default event handlers +add_event_handler('render_category_literal_description', 'render_category_literal_description'); +add_event_handler('render_category_description', 'render_category_description'); add_event_handler('render_comment_content', 'htmlspecialchars'); add_event_handler('render_comment_content', 'parse_comment_content'); add_event_handler('render_comment_author', 'strip_tags'); diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index c23c4a395..a0a42135e 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -156,12 +156,6 @@ SELECT * $cat[$k] = get_boolean( $cat[$k] ); } } - global $conf; - if ( !( $conf['allow_html_descriptions'] and - preg_match('/<(div|br|img|script).*>/i', $cat['comment']) ) ) - { - $cat['comment'] = nl2br(@$cat['comment']); - } $upper_ids = explode(',', $cat['uppercats']); if ( count($upper_ids)==1 ) @@ -448,7 +442,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_ $cat_count_images-= $cat_nb_images; $cat_nb_images = 0; } - + //at least one image direct or indirect $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images); @@ -469,4 +463,4 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_ return $display_text; } -?> +?>
\ No newline at end of file diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index bdda81d4a..d5b0a4bf1 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -58,7 +58,7 @@ function get_icon($date, $is_child_date = false) if (!isset($page['get_icon_cache']['unix_timestamp'])) { // Use MySql date in order to standardize all recent "actions/queries" - list($page['get_icon_cache']['unix_timestamp']) = + list($page['get_icon_cache']['unix_timestamp']) = mysql_fetch_array(pwg_query('select UNIX_TIMESTAMP(CURRENT_DATE)')); } @@ -455,7 +455,7 @@ function get_html_menu_category($categories, $selected_category) {// at least one direct or indirect image $menu.= "\n".'<span class="'; // at least one image in this category -> class menuInfoCat - $menu.= ($category['nb_images'] > 0 ? "menuInfoCat" + $menu.= ($category['nb_images'] > 0 ? "menuInfoCat" : "menuInfoCatByChild").'"'; $menu.= ' title=" '.$title.'">'; // show total number of images @@ -735,10 +735,32 @@ function set_status_header($code, $text='') */ function set_span_class($count) { - if ($count > 1) - { + if ($count > 1) + { return 'plural'; } - return ( $count == 0 ) ? 'zero':'one'; + return ( $count == 0 ) ? 'zero':'one'; +} + +/** returns the category comment for rendering in html. + * this is an event handler. don't call directly + */ +function render_category_description($desc) +{ + global $conf; + if ( !( $conf['allow_html_descriptions'] and + preg_match('/<(div|br|img|script).*>/i', $desc) ) ) + { + $desc = nl2br($desc); + } + return $desc; +} + +/** returns the category comment for rendering in html textual mode (subcatify) + * this is an event handler. don't call directly + */ +function render_category_literal_description($desc) +{ + return strip_tags($desc, '<span><p><a><br><b><i><small><big><strong><em>'); } -?> +?>
\ No newline at end of file diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 918d394fd..f5b301677 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -203,7 +203,11 @@ if ('categories' == $page['section']) $page = array_merge( $page, array( - 'comment' => $page['category']['comment'], + 'comment' => + trigger_event( + 'render_category_description', + $page['category']['comment'] + ), 'title' => get_cat_display_name($page['category']['upper_names'], '', false), ) @@ -330,7 +334,8 @@ SELECT DISTINCT(id) $page = array_merge( $page, array( - 'title' => $lang['search_result'], + 'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">' + .$lang['search_result'].'</a>', ) ); } @@ -384,7 +389,7 @@ SELECT DISTINCT(id) $page = array_merge( $page, array( - 'title' => '<a href="'.duplicate_index_url().'">' + 'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">' .$lang['recent_pics_cat'].'</a>', 'items' => array_from_query($query, 'id'), ) @@ -422,7 +427,7 @@ SELECT DISTINCT(id) $page = array_merge( $page, array( - 'title' => '<a href="'.duplicate_index_url().'">' + 'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">' .$conf['top_number'].' '.$lang['most_visited_cat'].'</a>', 'items' => array_from_query($query, 'id'), ) @@ -448,7 +453,7 @@ SELECT DISTINCT(id) $page = array_merge( $page, array( - 'title' => '<a href="'.duplicate_index_url().'">' + 'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">' .$conf['top_number'].' '.$lang['best_rated_cat'].'</a>', 'items' => array_from_query($query, 'id'), ) @@ -471,7 +476,7 @@ SELECT DISTINCT(id) $page = array_merge( $page, array( - 'title' => '<a href="'.duplicate_index_url().'">' + 'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">' .$lang['random_cat'].'</a>', 'items' => array_from_query($query, 'id'), ) @@ -296,8 +296,7 @@ if (isset($page['comment']) and $page['comment'] != '') $template->assign_block_vars( 'cat_infos.comment', array( - 'COMMENTS' => - trigger_event('render_category_description', $page['comment']) + 'COMMENTS' => $page['comment'] ) ); $header_infos['COMMENT'] = strip_tags($page['comment']); |