Changeset 3683 for extensions/AMenuManager

Timestamp:

Jul 26, 2009, 5:56:37 PM (15 years ago)

Author:

grum

Message:

Update AMM 2.1.0 - big resolved
Bug referenced in french forum (post:107877 a topic:14374)

Location:

extensions/AMenuManager

Files:

• amm_pip.class.inc.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/AMenuManager/amm_pip.class.inc.php

@@ -75 +75 @@
       Add a new random picture section
     */
-    if ( ($block = $menu->get_block( 'mbAMM_randompict' ) ) != null )
+    if ( ( ($block = $menu->get_block( 'mbAMM_randompict' ) ) != null ) && ($user['nb_total_images'] > 0) )
     {
       $block->set_title(  base64_decode($this->my_config['amm_randompicture_title'][$user['language']]) );
@@ -176 +176 @@
   private function ajax_amm_get_random_picture()
   {
+    global $user;
+
     $local_tpl = new Template(AMM_PATH."menu_templates/", "");
     $local_tpl->set_filename('body_page',
@@ -181 +183 @@
 
       $sql="SELECT i.id as image_id, i.file as image_file, i.comment, i.path, i.tn_ext, c.id as catid, c.name, c.permalink, RAND() as rndvalue, i.name as imgname
-FROM ".CATEGORIES_TABLE." c, ".IMAGES_TABLE." i, ".IMAGE_CATEGORY_TABLE." ic
-WHERE c.status='public'
-  AND c.id = ic.category_id
-  AND ic.image_id = i.id
-ORDER BY rndvalue
-LIMIT 0,1
-";
-
+            FROM ".CATEGORIES_TABLE." c, ".IMAGES_TABLE." i, ".IMAGE_CATEGORY_TABLE." ic
+            WHERE c.id = ic.category_id
+              AND ic.image_id = i.id
+              AND i.level <= ".$user['level']." ";
+      if($user['forbidden_categories']!="")
+      {
+        $sql.=" AND c.id NOT IN (".$user['forbidden_categories'].") ";
+      }
+
+      $sql.=" ORDER BY rndvalue
+            LIMIT 0,1";
 
 

extensions/AMenuManager/main.inc.php

@@ -24 +24 @@
 | 2.0.0b  | 2008/07/27 | * initial release with own blocks classes
 | 2.0.0   | 2008/10/23 | * first release for piwigo's blocks classes
-| 2.1.0   | 2009/07/26 | * add of a functionality : random image can be changed
+| 2.1.0   | 2009/07/26 | * add a functionality : random image can be changed
 |         |            |   every x seconds (from 0.5 to 60)
-|         |            |
+|         |            | * bug resolved : random image block is displayed only
+|         |            |   if user have accessibility to more than 0 images
+|         |            |   random images are choosen in the accessible images for
+|         |            |   a user (permission + level)
+|         |            |   (cf. post:107877 on french forum)
+|         |            |   (cf. topic:14374 on french forum)
 |         |            |
 |         |            |