Changeset 32553 for extensions/ConcoursPhoto/include

Timestamp:

Mar 31, 2021, 8:34:20 AM (4 years ago)

Author:

tiico

Message:

corrections

File:

• extensions/ConcoursPhoto/include/Concours.class.php (modified) (5 diffs)

extensions/ConcoursPhoto/include/Concours.class.php

@@ -5 +5 @@
  */
  
+ 
+include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+
 global $user, $conf;
 
@@ -620 +623 @@
         }
         
-
+        
+        
+// TESTTEST 
+        // function to return the number of images for a concours 
+        function nb_img_by_concours($concours_id = NULL)
+        {
+
+                
+                // nb of users who vote for each image (for a selected concours
+                $query = 'SELECT count(img.id) AS NBIMG '
+                                .' FROM ' . IMAGES_TABLE.' AS img'
+                                .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id'
+                                .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id'
+                                .' INNER JOIN '.CONCOURS_TABLE.' AS conc ON conc.category = cat.id'
+                                        .' WHERE conc.id = '.($concours_id !== null ? $concours_id : $this->concours_id )
+                                .';';
+                                
+                $result = pwg_query($query);
+                if ($row = pwg_db_fetch_array($result))
+                {
+                        return $row['NBIMG'];
+                }
+                                
+                return 0;
+        }
 
         
@@ -1247 +1274 @@
                         // for the image, check (depending the config) if user = author or addedby or none
                         if ($this->check_img_user($page['current_item']))
+                        {
                                 return;
+                        }
                                 
                         // Check if user is guest and if guest is allowed
@@ -2410 +2439 @@
                                                         $query = 'SELECT ' 
                                                         .' RESULT.id_concours, CONC.name, CONC.descr, CONC.begin_date, CONC.end_date, CONC.method, 
-                                                                RESULT.img_id as id, IMG.name, IMG.author, IMG.file, IMG.path, 
+                                                                RESULT.img_id as id, IMG.name, IMG.author, IMG.file, IMG.path, IMG.added_by,
                                                                 ic.category_id, cat.name AS catname,
                                                                 RESULT.date, RESULT.note, RESULT.moyenne, RESULT.moderation1, RESULT.moderation2, RESULT.nbvotant, RESULT.datas'
@@ -2468 +2497 @@
                                                         $block['contests'][$result['id_concours']]['RESULTS'][$rank] = array(
                                                         'RANK' => $rank,
-                                                        'AUTHOR' => $result['author'],
+//                                                      'AUTHOR' => $result['author'],
+                                                        'AUTHOR' => (strlen($result['author']) === 0 ? get_username($result['added_by']): $result['author']),
                                                         'TN_SRC' => DerivativeImage::thumb_url($result),
                                                         'XSMALL_SRC' => DerivativeImage::url(IMG_XSMALL, $result),