Changeset 605

Timestamp:

Nov 16, 2004, 12:13:24 AM (19 years ago)

Author:

plg

Message:

category random replaced by a more generic category : list. You give a list
of element identifiers and it creates a page virtual temporary
category. random.php generates a randomized list of element id visible to
the user (according to permissions) and redirects to category.php.

Major problem : elements order is in id ascending order, I don't know how to
change order when having id1,id2,id3 and id2,id3,id1 (the display order is
the same)

Location:

trunk

Files:

• category.php (modified) (2 diffs)
• include/category_default.inc.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (6 diffs)
• picture.php (modified) (1 diff)
• random.php (added)

trunk/category.php

@@ -198 +198 @@
   'special_cat',
   array(
-    'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=random'),
+    'URL' => add_session_id(PHPWG_ROOT_PATH.'random.php'),
     'TITLE' => $lang['random_cat_hint'],
     'NAME' => $lang['random_cat']
@@ -275 +275 @@
                            ,'recent_pics'
                            ,'best_rated'
-                           ,'random'
+                           ,'list'
                        ))))
 {

trunk/include/category_default.inc.php

@@ -106 +106 @@
     $url_link.= '&search='.$_GET['search'];
   }
+  else if ($page['cat'] == 'list')
+  {
+    $url_link.= '&list='.$_GET['list'];
+  }
     
   $template->assign_block_vars(

trunk/include/functions_category.inc.php

@@ -67 +67 @@
  *  - equals 'recent_cats'
  *  - equals 'calendar'
- *  - equals 'random'
+ *  - equals 'list'
  *
  * The function fills the global var $page['cat'] and returns nothing
@@ -100 +100 @@
          or $cat == 'recent_pics'
          or $cat == 'recent_cats'
-         or $cat == 'calendar'
-         or $cat == 'random' )
+         or $cat == 'calendar' )
     {
       $page['cat'] = $cat;
@@ -108 +107 @@
     {
       $page['cat'] = $cat;
+    }
+    if ($cat == 'list'
+        and isset($_GET['list'])
+        and preg_match('/^\d+(,\d+)*$/', $_GET['list']))
+    {
+      $page['cat'] = 'list';
     }
   }
@@ -435 +440 @@
 //       - best rated pictures
 //       - recent pictures
-//       - random pictures
+//       - defined list (used for random)
 // 3. determination of the title of the page
 // 4. creation of the navigation bar
@@ -468 +473 @@
     else
     {
-      if ( $page['cat'] == 'search'
-           or $page['cat'] == 'most_visited'
-           or $page['cat'] == 'recent_pics'
-           or $page['cat'] == 'recent_cats'
-           or $page['cat'] == 'best_rated'
-           or $page['cat'] == 'calendar' )
+      if ($page['cat'] == 'search'
+          or $page['cat'] == 'most_visited'
+          or $page['cat'] == 'recent_pics'
+          or $page['cat'] == 'recent_cats'
+          or $page['cat'] == 'best_rated'
+          or $page['cat'] == 'calendar'
+          or $page['cat'] == 'list')
       {
         // we must not show pictures of a forbidden category
@@ -789 +795 @@
         }
       }
-      else if ($page['cat'] == 'random')
+      else if ($page['cat'] == 'list')
       {
         $page['title'] = $lang['random_cat'];
           
+        $page['where'] = 'WHERE 1=1';
         if (isset($forbidden))
         {
-          $page['where'] = 'WHERE '.$forbidden;
-        }
-        else
-        {
-          $page['where'] = 'WHERE 1=1';
-        }
-
-        $conf['order_by'] = ' ORDER BY RAND()';
-
-        $page['cat_nb_images'] = $conf['top_number'];
-        $page['nb_image_page'] = $page['cat_nb_images'];
+          $page['where'].= ' AND '.$forbidden;
+        }
+        $page['where'].= ' AND image_id IN ('.$_GET['list'].')';
+        $page['cat_nb_images'] = count(explode(',', $_GET['list']));
       }
 

trunk/picture.php

@@ -209 +209 @@
 {
   $url_up.= "&search=".$_GET['search'];
+}
+if ( $page['cat'] == 'list' )
+{
+  $url_up.= "&list=".$_GET['list'];
 }