Changeset 1031 for trunk/include/functions_category.inc.php

Timestamp:

Feb 10, 2006, 3:10:41 AM (19 years ago)

Author:

rvelices

Message:

feature 77: standard navigation link - finalized

3 small fixes: simplified code (unnecessary $pagetab_expand),
urls in comments (at end of line nl2br issue+regex+html 4 validated) and
$pagewhere correction for most_visited

File:

• trunk/include/functions_category.inc.php (modified) (4 diffs)

trunk/include/functions_category.inc.php

@@ -133 +133 @@
     $query.= '
     AND (id_uppercat is NULL';
-    if (isset ($page['tab_expand']) and count($page['tab_expand']) > 0)
-    {
-      $query.= ' OR id_uppercat IN ('.implode(',',$page['tab_expand']).')';
+    if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
+    {
+      $query.= ' OR id_uppercat IN ('.$page['uppercats'].')';
     }
     $query.= ')';
@@ -324 +324 @@
   global $conf;
   return array(
-        array('Default', '', true),
-        array(get_lang('best_rated_cat'),   'average_rate DESC', $conf['rate']),
-        array(get_lang('most_visited_cat'), 'hit DESC', true),
-        array(get_lang('Creation date'), 'date_creation DESC', true),
-        array(get_lang('Availability date'), 'date_available DESC', true),
-        array(get_lang('File name'), 'file ASC', true)
+    array('Default', '', true),
+    array(l10n('best_rated_cat'),   'average_rate DESC', $conf['rate']),
+    array(l10n('most_visited_cat'), 'hit DESC', true),
+    array(l10n('Creation date'), 'date_creation DESC', true),
+    array(l10n('Availability date'), 'date_available DESC', true),
+    array(l10n('File name'), 'file ASC', true)
   );
 }
@@ -372 +372 @@
       $page['cat_uploadable'] = $result['uploadable'];
       $page['cat_commentable'] = $result['commentable'];
+      $page['cat_id_uppercat'] = $result['id_uppercat'];
       $page['uppercats']      = $result['uppercats'];
       $page['title'] =
@@ -469 +470 @@
         if (isset($forbidden))
         {
-          $page['where'] = "\n".'    AND '.$forbidden;
+          $page['where'] .= "\n".'    AND '.$forbidden;
         }