Resolved 0000728: Add description triggers for categories and elements

Add:
  o render_category_description
  o render_category_literal_description
  o render_element_description

Merge branch-1_7 2048:2050 into BSF

git-svn-id: http://piwigo.org/svn/trunk@2079 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 18 insertions, 4 deletions

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index 4acd7dff4..68b0ec4c2 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -217,6 +217,12 @@ 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'])
   {
@@ -224,7 +230,6 @@ if (count($categories) > 0)
 
     foreach ($categories as $category)
     {
-      $comment = strip_tags(@$category['comment'], '<a><br><p><b><i><small><strong><font>');
       if ($page['section']=='recent_cats')
       {
         $name = get_cat_display_name_cache($category['uppercats'], null, false);
@@ -257,7 +262,10 @@ if (count($categories) > 0)
                                     true,
                                     '<br />'
                                   ),
-          'DESCRIPTION' => @$comment,
+          'DESCRIPTION' =>
+            trigger_event('render_category_literal_description', 
+              trigger_event('render_category_description', 
+                @$category['comment'])),
           'NAME'  => $name,
           )
         );
diff --git a/index.php b/index.php
index 6116828f3..f3edd49de 100644
--- a/index.php
+++ b/index.php
@@ -296,7 +296,8 @@ if (isset($page['comment']) and $page['comment'] != '')
   $template->assign_block_vars(
     'cat_infos.comment',
     array(
-      'COMMENTS' => $page['comment']
+      'COMMENTS' =>
+        trigger_event('render_category_description', $page['comment'])
       )
     );
   $header_infos['COMMENT'] = strip_tags($page['comment']);
diff --git a/picture.php b/picture.php
index 50e06bc33..de2c7b8dd 100644
--- a/picture.php
+++ b/picture.php
@@ -55,6 +55,9 @@ add_event_handler(
   EVENT_HANDLER_PRIORITY_NEUTRAL,
   2
   );
+// add default event handler for rendering element description
+add_event_handler('render_element_description', 'nl2br');
+
 trigger_action('loc_begin_picture');
 
 // this is the default handler that generates the display for the element
@@ -640,7 +643,9 @@ if (isset($picture['current']['comment'])
   $template->assign_block_vars(
     'legend',
     array(
-      'COMMENT_IMG' => nl2br($picture['current']['comment'])
+      'COMMENT_IMG' =>
+        trigger_event('render_element_description',
+          $picture['current']['comment'])
       ));
   $header_infos['COMMENT'] = strip_tags($picture['current']['comment']);
 }