Changeset 9200 for extensions/ContestResults/include/cr_menubar.php

Timestamp:

Feb 13, 2011, 11:12:58 AM (13 years ago)

Author:

mistic100

Message:

ContestResults :

• Code revision
• Add Letton (lv_LV) language, thanks to Aivars Baldone
• Delete display options
• Fix languages bugs
• Improve public appearence

File:

• extensions/ContestResults/include/cr_menubar.php (modified) (4 diffs)

extensions/ContestResults/include/cr_menubar.php

@@ -3 +3 @@
 
 // +-----------------------------------------------------------------------+
-//                              Trigger
+//                              Triggers
 // +-----------------------------------------------------------------------+
-global $conf;
 $config = unserialize($conf['ContestResults']);
-if($config['menubar_mode']['block'])
+if ($config['menubar_mode']['block']) {
         add_event_handler('blockmanager_register_blocks', 'CR_register_menubar_blocks');
+}
 add_event_handler('blockmanager_apply', 'CR_menubar_apply');
 
@@ -14 +14 @@
 //                              Ajouter un block
 // +-----------------------------------------------------------------------+
-function CR_register_menubar_blocks($menu_ref_arr){
+function CR_register_menubar_blocks($menu_ref_arr) {
         $menu = &$menu_ref_arr[0];
-        if($menu->get_id() != 'menubar') return;
+        if ($menu->get_id() != 'menubar') { return; }
         $menu->register_block(new RegisteredBlock('mbContestResults', l10n('Contests'), 'ContestResults'));
 }
 
 // +-----------------------------------------------------------------------+
-//                      Remplis les block
+//                              Remplis les block
 // +-----------------------------------------------------------------------+
-function CR_menubar_apply($menu_ref_arr){
+function CR_menubar_apply($menu_ref_arr) {
         global $template, $conf;
         $config = unserialize($conf['ContestResults']);
         $menu = &$menu_ref_arr[0];
         
-        // Block Contest
-        if(($block = $menu->get_block('mbContestResults')) != null){
+        // Block Contest - un nouveau bloc dans le menu
+        if (($block = $menu->get_block('mbContestResults')) != null) {
                 $data = array();
+                
+                // on récupère les concours
+                $contests = pwg_query("SELECT
+                                id, 
+                                name, 
+                                visible, 
+                                status, 
+                                date_begin, 
+                                date_end 
+                        FROM " . CR_TABLE_1 . " 
+                        ORDER BY date_begin DESC;");
 
-                $query = "SELECT id, name, visible, status, date_begin, date_end 
-                        FROM " . CR_TABLE_1 . " 
-                        ORDER BY date_begin DESC 
-                        LIMIT " . $config['menubar_block']['number'] . " OFFSET 0;";
-                $result = pwg_query($query);
-
-                while($contest = pwg_db_fetch_assoc($result)){
-                        if($contest['visible'] OR is_admin()){
+                $m = 0; // copteur pour limiter le nombre de concours affichés
+                while($contest = pwg_db_fetch_assoc($contests)){
+                        if (($contest['visible'] OR is_admin()) AND $m < $config['menubar_block']['number']) {
                                 array_push($data, array(
                                         'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
                                         'LABEL' => trigger_event('render_CR_content', $contest['name']),
                                         'DATE' => format_date($contest['date_begin']) . ' - ' . format_date($contest['date_end']),
-                                        'STATUS' => $contest['status']
+                                        'STATUS' => $contest['status'],
+                                        'VISIBLE' => $contest['visible']
                                 ));
                         }
+                        $m++;
                 }
 
-                if(!empty($data)){
+                // Finalement on rempli le bloc avec les concours
+                if (!empty($data)) {
                         $template->set_template_dir(CR_PATH . 'template/');
                         $block->set_title('<a href="' . CR_PUBLIC . '">' . l10n('Contests') . '</a>');
@@ -57 +66 @@
         }
         
-        // Block Menu
-        if($config['menubar_mode']['link'] AND $config['menubar_link']['menu'] AND ($block = $menu->get_block('mbMenu')) != null){
+        // Block Menu - ajout d'un lien dans le bloc Menu
+        if ($config['menubar_mode']['link'] AND $config['menubar_link']['menu'] AND ($block = $menu->get_block('mbMenu')) != null) {
                 array_push($block->data, array(
                         'URL' => CR_PUBLIC,
@@ -66 +75 @@
         }
         
-        // Block Specials
+        // Block Specials - ajout d'un lien dans le bloc Specials
         if($config['menubar_mode']['link'] AND $config['menubar_link']['specials'] AND ($block = $menu->get_block('mbSpecials')) != null){
                 array_push($block->data, array(