Changeset 2118

Timestamp:

Oct 2, 2007, 7:42:22 AM (17 years ago)

Author:

rvelices

Message:

• merge r 2117 from trunk (render_category_description and render_category_literal_description events refactoring)
• fix admin multiview plugin

Location:

branches/branch-1_7

Files:

• include/category_cats.inc.php (modified) (1 diff)
• include/common.inc.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (2 diffs)
• include/functions_html.inc.php (modified) (3 diffs)
• include/section_init.inc.php (modified) (6 diffs)
• index.php (modified) (1 diff)
• plugins/admin_multi_view/is_admin.inc.php (modified) (1 diff)

branches/branch-1_7/include/category_cats.inc.php

@@ -179 +179 @@
   }
 
-  // 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'])

branches/branch-1_7/include/common.inc.php

@@ -173 +173 @@
 
 // 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 +262 @@
 
 // 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');

branches/branch-1_7/include/functions_category.inc.php

@@ -157 +157 @@
     }
   }
-  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']);
@@ -446 +440 @@
       $cat_nb_images = 0;
     }
-    
+
     //at least one image direct or indirect
     $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images);

branches/branch-1_7/include/functions_html.inc.php

@@ -59 +59 @@
   {
     // 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)'));
   }
@@ -456 +456 @@
       $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.'">';
@@ -736 +736 @@
 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>');
 }
 ?>

branches/branch-1_7/include/section_init.inc.php

@@ -205 +205 @@
       $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),
@@ -332 +336 @@
       $page,
       array(
-        'title' => $lang['search_result'],
+        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
+                  .$lang['search_result'].'</a>',
         )
       );
@@ -386 +391 @@
       $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'),
@@ -424 +429 @@
       $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'),
@@ -450 +455 @@
       $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'),
@@ -473 +478 @@
       $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'),

branches/branch-1_7/index.php

@@ -297 +297 @@
     'cat_infos.comment',
     array(
-      'COMMENTS' =>
-        trigger_event('render_category_description', $page['comment'])
+      'COMMENTS' => $page['comment']
       )
     );

branches/branch-1_7/plugins/admin_multi_view/is_admin.inc.php

@@ -12 +12 @@
   {
     list($user['template'], $user['theme']) = explode('/', $theme);
+    unset( $user['admin_template'], $user['admin_theme']);
   }
   $lang = pwg_get_session_var( 'multiview_lang', '' );