Changeset 1861 for trunk/include/functions_html.inc.php

Timestamp:

Feb 27, 2007, 2:56:16 AM (17 years ago)

Author:

rvelices

Message:

• refactoring pagecategory before 1.7 release

pagecategory is not an id anymore, but an associative array of category info
all of pagecat_xxx or pageuppercats merged into one
simplifies calls to make_index_url
give plugins a clean start for page variables for version 1.7

File:

• trunk/include/functions_html.inc.php (modified) (13 diffs)

trunk/include/functions_html.inc.php

@@ -236 +236 @@
  * categories string returned contains categories as given in the input
  * array $cat_informations. $cat_informations array must be an association
- * of {category_id => category_name}. If url input parameter is null,
+ * of {category_id => array( id, name) }. If url input parameter is null,
  * returns only the categories name without links.
  *
@@ -252 +252 @@
   $output = '';
   $is_first = true;
-  foreach ($cat_informations as $id => $name)
-  {
+  foreach ($cat_informations as $id => $cat)
+  {
+    is_array($cat) or trigger_error(
+        'get_cat_display_name wrong type for cat '.$id, E_USER_WARNING
+      );
     if ($is_first)
     {
@@ -265 +268 @@
     if ( !isset($url) )
     {
-      $output.= $name;
+      $output.= $cat['name'];
     }
     elseif ($url == '')
@@ -272 +275 @@
             .make_index_url(
                 array(
-                  'category'=>$id,
-                  'cat_name'=>$name
+                  'category' => $cat,
                   )
               )
             .'">';
-      $output.= $name.'</a>';
+      $output.= $cat['name'].'</a>';
     }
     else
     {
       $output.= '<a href="'.PHPWG_ROOT_PATH.$url.$id.'">';
-      $output.= $name.'</a>';
+      $output.= $cat['name'].'</a>';
     }
   }
@@ -312 +314 @@
                                     $replace_space = true)
 {
-  global $cat_names, $conf;
-
-  if (!isset($cat_names))
+  global $cache, $conf;
+
+  if (!isset($cache['cat_names']))
   {
     $query = '
-SELECT id,name
+SELECT id, name
   FROM '.CATEGORIES_TABLE.'
 ;';
     $result = pwg_query($query);
-    while ($row = mysql_fetch_array($result))
-    {
-      $cat_names[$row['id']] = $row['name'];
+    while ($row = mysql_fetch_assoc($result))
+    {
+      $cache['cat_names'][$row['id']] = $row;
     }
   }
@@ -331 +333 @@
   foreach (explode(',', $uppercats) as $category_id)
   {
-    $name = $cat_names[$category_id];
+    $cat = $cache['cat_names'][$category_id];
 
     if ($is_first)
@@ -344 +346 @@
     if ( !isset($url) )
     {
-      $output.= $name;
+      $output.= $cat['name'];
     }
     elseif ($url == '')
@@ -352 +354 @@
       .make_index_url(
           array(
-            'category'=>$category_id,
-            'cat_name'=>$name
+            'category' => $cat,
             )
         )
-      .'">'.$name.'</a>';
+      .'">'.$cat['name'].'</a>';
     }
     else
     {
       $output.= '
-<a href="'.PHPWG_ROOT_PATH.$url.$category_id.'">'.$name.'</a>';
+<a href="'.PHPWG_ROOT_PATH.$url.$category_id.'">'.$cat['name'].'</a>';
     }
   }
@@ -385 +386 @@
  * @return string
  */
-function get_html_menu_category($categories)
-{
-  global $page, $lang;
+function get_html_menu_category($categories, $selected_category)
+{
+  global $lang;
 
   $ref_level = 0;
@@ -393 +394 @@
   $menu = '';
 
-  // $page_cat value remains 0 for special sections
-  $page_cat = 0;
-  if (isset($page['category']))
-  {
-    $page_cat = $page['category'];
-  }
-
   foreach ($categories as $category)
   {
@@ -420 +414 @@
 
     $menu.= "\n\n".'<li';
-    if ($category['id'] == $page_cat)
+    if ($category['id'] == @$selected_category['id'])
     {
       $menu.= ' class="selected"';
@@ -428 +422 @@
     $url = make_index_url(
             array(
-              'category'=>$category['id'],
-              'cat_name'=>$category['name']
+              'category' => $category
               )
             );
 
     $menu.= "\n".'<a href="'.$url.'"';
-    if ($page_cat != 0
-        and $category['id'] == $page['cat_id_uppercat'])
+    if ($selected_category!=null
+        and $category['id'] == $selected_category['id_uppercat'])
     {
       $menu.= ' rel="up"';
@@ -510 +503 @@
 {
   $cat_info = get_cat_info($cat_id);
-  return get_cat_display_name($cat_info['name'], $url, $replace_space);
+  return get_cat_display_name($cat_info['upper_names'], $url, $replace_space);
 }