Changeset 8946 for extensions/ConcoursPhoto/admin/audit.php

Timestamp:

Jan 27, 2011, 8:46:55 PM (13 years ago)

Author:

tiico

Message:

Prepare v2.0.0 for Concours photo plugin :

• Add exaequo checking for the result (beta)
• Add EN language
• Correct "concours not displayed" when no group is selected in admin page. Now, concours is available for all registered user (not depending on the group appartenance)
• Add option to allow author to vote for their photos (disable check based on username=authorname)
• Add option to allow user to change the score after a validation
• Add to guest the possibility to vote for a concours (BETA)
• Some correction (code and database structure)

File:

• extensions/ConcoursPhoto/admin/audit.php (modified) (8 diffs)

extensions/ConcoursPhoto/admin/audit.php

@@ -17 +17 @@
     $user_id = 0;
     
-//echo "USER_ID=".$user_id;
+echo "USER_ID=".$user_id;
    
 // Get the concours id if present
@@ -29 +29 @@
     $users = array();     // contain {id;username} or each 
     $groups = $concours->concours_infos['groups'];
-    $query = 'SELECT user_id, username FROM ' . USER_GROUP_TABLE 
+    $query = 'SELECT distinct(user_id), username FROM ' . USER_GROUP_TABLE 
     .' INNER JOIN ' . USERS_TABLE .' ON id = user_id'
-    .($groups != NULL ? ' WHERE group_id = '.$groups : '')
+    .($groups != NULL ? ' WHERE group_id IN ('.$groups.')' : '')
+//    = '.$groups : '')
     .' ORDER BY username ASC'
     .';';
@@ -55 +56 @@
     }
 
+    // Add the guest list (if coucours OK for guest)
+    $ipguest = $concours->get_guest_list();
+    if ($concours->concours_infos['guest'])
+    {
+        foreach ( $ipguest as $i => $userid ) //on parcours le tableau 
+        {
+            $template->append('user_list',
+                array(  'ID' => 'G'.$i,     //$userid['user_id'],
+                        'NAME' => $userid,
+                        'SELECTED' => ($user_id == 'G'.$i ? 'selected' : '')));
+        }
+    }
     
     // Send concours info to template
@@ -70 +83 @@
 // Step 3 : Display theses informations
         
-        
-        // nb of users who vote for each image (for a selected concours
-        $query = 'SELECT img_id, COUNT(DISTINCT user_id) AS NBVOTE FROM ' . CONCOURS_DATA_TABLE 
-        .' WHERE id_concours = '.($concours_id !== null ? $concours_id : $this->concours_id )
-        .' GROUP BY img_id '
-        .';';
-                        
-        $result = pwg_query($query);
-        $nbvotes = array();
-        while ($row = mysql_fetch_assoc($result))
-        {
-                $nbvotes[$row['img_id']] = $row['NBVOTE'];
-        }
+    // Get the nb of vote for the concours
+    $nbvotes = $concours->nb_votes_by_img();
+
 
         // Get all the users who have notes for the concours
-        $query = 'SELECT distinct(user_id), USER.username'
+        $query = 'SELECT distinct user_id, USER.username'
         .' FROM ' .CONCOURS_DATA_TABLE
         .' INNER JOIN ' . USERS_TABLE.' AS USER on USER.id = user_id'
         .' WHERE id_concours = '.$concours_id
+        // Dont take the guest informations because 
+    .' AND user_id <> '.$conf['guest_id']
         .' ORDER BY username ASC'
         .';';
@@ -95 +100 @@
         $user_list = array();
         while ($row2 = mysql_fetch_assoc($result))
-                array_push($user_list, $row2);  
-
+        // Dont take the guest informations because 
+//        if ($row2['user_id'] != $conf['guest_id'])
+            array_push($user_list, $row2);      
 
 
@@ -185 +191 @@
                 $user_note = array();
                 $globalnote = 0;
-                if ($user_id != 0)      // for user 
+            echo "USER=".$user_id."\n";
+                if (!is_numeric($user_id) OR $user_id != 0)     // for user 
+                {   
+            echo "USERNON0=".$user_id."\n";
+            $pos = strpos($user_id, 'G');
+            if ($pos === false)
+            {
+                $globalnote = $concours->get_img_globalnote_user($row['id'], $concours_id, $user_id);
+                $user_note = $concours->get_img_note_user($row['id'], $concours_id, $user_id);
+            }
+            else
+            {
+                echo "G...".substr($user_id, $pos+1)." = ".substr($user_id, $pos+1)."\n";
+                echo "IPGUEST=".$ipguest[substr($user_id, $pos+1)]."\n";
+                $globalnote = $concours->get_img_globalnote_user($row['id'], $concours_id, $conf['guest_id'], $ipguest[substr($user_id, $pos+1)]);
+                $user_note = $concours->get_img_note_user($row['id'], $concours_id, $conf['guest_id'], $ipguest[substr($user_id, $pos+1)]);
+            }
+                }
+                elseif (is_numeric($user_id) AND $user_id == 0) // for user     // global
                 {
-                        $globalnote = $concours->get_img_globalnote_user($row['id'], $concours_id, $user_id);
-                        $user_note = $concours->get_img_note_user($row['id'], $concours_id, $user_id);
-                }
-                else    // global
-                {
-                        foreach ($user_list as $userid)
-                        $globalnote += $concours->get_img_globalnote_user($row['id'], null, $userid['user_id']);
-                }
+            echo "USER00=".$user_id."\n";
+        
+                        foreach ($user_list as $i => $userid)
+               $globalnote += $concours->get_img_globalnote_user($row['id'], null, $userid['user_id']);
+            
+                        foreach ($ipguest as $i => $ipguestt)
+            {
+                $globalnote += $concours->get_img_globalnote_user($row['id'], null, $conf['guest_id'], $ipguestt);
+            }
+        }
 
                 
@@ -233 +259 @@
     
         $rang = 1;
+    $previousNote = $previousMoy = 0;
+
         foreach ($concours_img  as $key => $value) 
         {
+
+        // Check the exaequos
+        if ($concours->my_config['check_exaequo'])
+        {
+            if ( ($concours->concours_infos['method'] == 1      // total
+                   AND ($concours_img[$key]['note'] == $previousNote))
+                 OR  ($concours->concours_infos['method'] == 2  // moyenne
+                      AND ($concours_img[$key]['moyenne'] == $previousMoy)))
+            {
+                $rang --;
+                
+            }
+        }
+//        echo "RANG=".$rang."\n";
            $concours_img[$key]['rang'] = $rang;
-                $rang++;
 
                 $template->append( 'concours_note', array(
@@ -251 +292 @@
 
                         ));
+        $rang++;
+
+        $previousNote = $concours_img[$key]['note'];
+        $previousMoy = $concours_img[$key]['moyenne'];
         }