Changeset 386 for trunk

Timestamp:

Mar 5, 2004, 11:54:53 PM (21 years ago)

Author:

z0rglub

Message:

• deletion of expand string in $_GET array

• refactoring of display_category function (no tab in code, please)

• displays always number of sub-categories for each category in the menu

• in the menu, special style only for the opened category

File:

• trunk/category.php (modified) (8 diffs)

trunk/category.php

@@ -53 +53 @@
 function display_category( $category, $indent )
 {
-  global $user,$lang,$template, $handle;
-  
-  $style='';
+  global $user,$template,$page;
+  
   $url = './category.php?cat='.$category['id'];
-  $url.= '&expand='.$category['expand_string'];
+
+  $style = '';
+  if ( isset( $page['cat'] )
+       and is_numeric( $page['cat'] )
+       and $category['id'] == $page['cat'] )
+  {
+    $style = 'font-weight:normal;color:yellow;';
+  }
+  
   $name = $category['name'];
   if ( $name == '' ) $name = str_replace( '_', ' ', $category['dir'] );
-  if ( $category['id_uppercat'] == '' )
-  {
-    $style = 'font-weight:bold;';
-  }
-  
-  $template->assign_block_vars('category', array(
-    'LINK_NAME' => $name,
-        'INDENT' => $indent,
-        'NB_SUBCATS'=>$category['nb_sub_categories'],
-        'TOTAL_CAT'=>$category['nb_images'],
-        'CAT_ICON'=>get_icon($category['date_last']),
-        
-        'T_NAME'=>$style,
-    'U_LINK' => add_session_id($url)));
-
+  
+  $template->assign_block_vars(
+    'category',
+    array(
+      'T_NAME' => $style,
+      'LINK_NAME' => $name,
+      'INDENT' => $indent,
+      'NB_SUBCATS'=>$category['nb_sub_categories'],
+      'TOTAL_CAT'=>$category['nb_images'],
+      'CAT_ICON'=>get_icon($category['date_last']),
+      
+      'U_LINK' => add_session_id($url))
+    );
+  
   if ( $user['expand'] or $category['nb_sub_categories'] == 0 )
   {
-        $template->assign_block_vars('category.bulletnolink', array('BULLET_IMAGE' =>  $user['lien_collapsed']));
+    $template->assign_block_vars(
+      'category.bulletnolink',
+      array('BULLET_IMAGE' => $user['lien_collapsed'])
+      );
   }
   else
   {
-        $url = './category.php';
-        if (isset($page['cat']))
-        {
-          $url .='?cat='.$page['cat'];
-      $url.= '&expand='.$category['expand_string'];
-        }
-        else if ($category['expand_string']<>'')
-        {
-          $url.= '?expand='.$category['expand_string'];
-        }
-        
-        if ( $category['expanded'] )
+    $url = './category.php';
+    if (isset($page['cat']))
+    {
+      $url .='?cat='.$page['cat'];
+    }
+    
+    if ( $category['expanded'] )
     {
       $img=$user['lien_expanded'];
@@ -100 +104 @@
       $img=$user['lien_collapsed'];
     }
-        
-    $template->assign_block_vars('category.bulletlink', array(
-      'BULLET_IMAGE' =>  $img,
-          'U_BULLET_LINK'=>  add_session_id($url)               
-        ));
-  }
-
+    
+    $template->assign_block_vars(
+      'category.bulletlink',
+      array(
+        'BULLET_IMAGE' =>  $img,
+        'U_BULLET_LINK'=>  add_session_id($url))
+      );
+  }
+  
   // recursive call
   if ( $category['expanded'] )
   {
     foreach ( $category['subcats'] as $subcat ) {
-          $template->assign_block_vars('category.subcat', array());
+      $template->assign_block_vars('category.subcat', array());
       display_category( $subcat, $indent.str_repeat( '&nbsp', 2 ));
     }
@@ -131 +137 @@
 // $page['expand'] contains the string to display in URL with comma
 $page['tab_expand'] = array();
-if ( isset ( $_GET['expand'] ) and $_GET['expand'] != 'all' )
-{
-  $tab_expand = explode( ',', $_GET['expand'] );
-  foreach ( $tab_expand as $id ) {
-    if ( is_numeric( $id ) ) array_push( $page['tab_expand'], $id );
-  }
-}
-if ( isset($page['cat']) && is_numeric( $page['cat'] ) )
+if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
 {
   // the category displayed (in the URL cat=23) must be seen in the menu ->
@@ -147 +146 @@
   }
 }
-$page['tab_expand'] = array_unique( $page['tab_expand'] );
-$page['expand'] = implode( ',', $page['tab_expand'] );
-// in case of expanding all authorized cats
-// The $page['expand'] equals 'all' and
-// $page['tab_expand'] contains all the authorized cat ids
-if ( $user['expand']
-     or ( isset( $_GET['expand'] ) and $_GET['expand'] == 'all' ) )
+// in case of expanding all authorized cats $page['tab_expand'] is empty
+if ( $user['expand'] )
 {
   $page['tab_expand'] = array();
-  $page['expand'] = 'all';
-}
+}
+
 // Sometimes, a "num" is provided in the URL. It is the number
 // of the picture to show. This picture must be in the thumbnails page.
@@ -247 +241 @@
 
   'U_HOME' => add_session_id( PHPWG_ROOT_PATH.'category.php' ),
-  'U_FAVORITE' => add_session_id( PHPWG_ROOT_PATH.'category.php?cat=fav&amp;expand='.$page['expand'] ),
-  'U_MOST_VISITED'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=most_visited&amp;expand='.$page['expand'] ),
-  'U_RECENT'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=recent&amp;expand='.$page['expand'] ),
+  'U_FAVORITE' => add_session_id( PHPWG_ROOT_PATH.'category.php?cat=fav' ),
+  'U_MOST_VISITED'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=most_visited' ),
+  'U_RECENT'=>add_session_id( PHPWG_ROOT_PATH.'category.php?cat=recent' ),
   'U_LOGOUT' => add_session_id( PHPWG_ROOT_PATH.'category.php?act=logout' ),
   'U_ADMIN'=>add_session_id( PHPWG_ROOT_PATH.'admin.php' ),
@@ -363 +357 @@
     // url link on picture.php page
     $url_link = './picture.php?cat='.$page['cat'];
-    $url_link.= '&amp;image_id='.$row['id'].'&amp;expand='.$page['expand'];
+    $url_link.= '&amp;image_id='.$row['id'];
     if ( $page['cat'] == 'search' )
     {
@@ -454 +448 @@
 
     $url_link = './category.php?cat='.$subcat_id;
-    if ( isset($page['cat'])&& !in_array( $page['cat'], $page['tab_expand'] ) )
-    {
-      array_push( $page['tab_expand'], $page['cat'] );
-      $page['expand'] = implode( ',', $page['tab_expand'] );
-    }
-    $url_link.= '&amp;expand='.$page['expand'];
-    // we add the category to explore in the expand list
-    if ( $page['expand'] != '' ) $url_link.= ',';
-    $url_link.= $subcat_id;
 
     $date = $page['plain_structure'][$subcat_id]['date_last'];
@@ -499 +484 @@
          and $page['cat_uploadable'] )
     {
-      $url = './upload.php?cat='.$page['cat'].'&amp;expand='.$page['expand'];
+      $url = './upload.php?cat='.$page['cat'];
           $template->assign_block_vars('upload',array('U_UPLOAD'=>add_session_id( $url )));
     }