Changeset 9364 for extensions/ConcoursPhoto/include

Timestamp:

Feb 23, 2011, 11:45:29 PM (13 years ago)

Author:

tiico

Message:

Complete v2.0.0 :

• Add information on admin page
• Change blockmenu to show Contests without groups or for Guests.

File:

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

extensions/ConcoursPhoto/include/Concours.class.php

@@ -933 +933 @@
 
 
-    
                 if (($page['section']) == 'categories' AND !empty($page['category']))
                 {
@@ -1004 +1003 @@
                                 if (isset($_POST['concours_submit']))
                                 {
+                
+//                    array_push($page['infos'] , l10n('concours_vote_saved'));
+                    
                                         $user_note = "";
                 if ($this->debug)                       echo "SUBMIT";
@@ -1784 +1786 @@
         }
 
-  /*
-    initialise menubar's menu
-    called by menubar object when making menu
-  */
+    // initialise menubar's menu.     called by menubar object when making menu
         public function blockmanager_apply( $menu_ref_arr )
         {
@@ -1799 +1798 @@
                 if ( ($block = $menu->get_block( 'CONCOURS_menu' ) ) != null )
                 {
-                  if($user['id']==2)
-                  {
-                        $vote_id = $_SERVER['REMOTE_ADDR'];
-                  }
-                  else
-                  {
-                        $vote_id = $user['id'];
-                  }
-
-        //      $polls_list=$this->get_polls_list($vote_id, is_admin(), $user['language']);
+
                   $menu_list=array();
 
@@ -1824 +1814 @@
 
                         // recover all img_id from the category
-                        $query = 'SELECT distinct(id_concours), groups, CONC.name'
+                        $query = 'SELECT distinct(id_concours), groups, guest, CONC.name'
                         .' FROM ' .CONCOURS_RESULT_TABLE
                         .' INNER JOIN '.CONCOURS_TABLE. ' AS CONC ON CONC.id = id_concours'
-                        .' ORDER BY date DESC'
+                        .' ORDER BY id DESC'
                         .';';
                         
@@ -1839 +1829 @@
                                         break;
                                         
-                                if (!empty($row['groups']))
+                $conc_to_show = false;  // Default ==> dont show
+                
+                // Guest
+                                if (is_a_guest() AND $row['guest'])
+                    $conc_to_show = true;
+                // Group present
+                elseif (!empty($row['groups']))
                                 {
                                         $authorized_groups = explode(',', $row['groups']);
-                                        if (array_intersect($this->user_groups, $authorized_groups) == array()) 
+                                        if (array_intersect($this->user_groups, $authorized_groups) != array()) 
+                        $conc_to_show = true;
+                }
+                // Allowed for any user (logged)
+                elseif (empty($row['groups']))
+                    $conc_to_show = true;
+                
+                if ($conc_to_show)
                                         {
-                                                continue;
-                                        }
                                         $nb_concours ++;
                                         array_push($menu_list,
@@ -1851 +1852 @@
                                                 'nfo' => "",
                                                 'text' => $row['name'],
-        //                                      'link' => CONCOURS_PATH.'publish.php?id='.$row['id_concours'],
                                                 'link' => './index.php?/concours/'.$row['id_concours'],
                                                 'edit' => (is_admin()? PHPWG_ROOT_PATH . 'admin.php?page=plugin&section=' . CONCOURS_DIR . '%2Fadmin%2Fadd_concours.php&concours=' . $row['id_concours'].'&action=modify':"")
@@ -1862 +1862 @@
                   {
 
-                          $block->set_title("Concours Photo");
+                          $block->set_title(l10n('concoursphoto'));
                           $block->template = CONCOURS_ROOT.'/template/concours_menu.tpl';
                           $block->data = $menu_list;