Changeset 9975 for extensions/ContestResults/include

Timestamp:

Apr 2, 2011, 11:43:40 AM (13 years ago)

Author:

mistic100

Message:

• many corrections

Location:

extensions/ContestResults/include

Files:

• compatibility.inc.php (modified) (1 diff)
• cr_comment_picture.php (modified) (2 diffs)
• cr_main.php (modified) (2 diffs)
• cr_menubar.php (modified) (2 diffs)
• cr_page.php (modified) (4 diffs)

extensions/ContestResults/include/compatibility.inc.php

@@ -70 +70 @@
 if (!isset($conf['ContestResults']['truncate_summary'])) {
         $conf['ContestResults']['truncate_summary'] = 350;
+        $conf['ContestResults']['menubar_bloc']['display_days'] = true;
         pwg_query("UPDATE " . CONFIG_TABLE . " SET value='" . serialize($conf['ContestResults']) . "' WHERE param = 'ContestResults';");
 }

extensions/ContestResults/include/cr_comment_picture.php

@@ -29 +29 @@
                 
                 // Lien vers le concours
-                $result['contest_name'] = trigger_event('render_CR_content', $result['contest_name']);
+                $result['contest_name'] = trigger_event('render_category_name', $result['contest_name']);
                 $result['contest_link'] = CR_PUBLIC . $result['contest_id'] . '-' . str2url($result['contest_name']);
                 
@@ -35 +35 @@
                 $comment .= '<div class="CR_comment">
                         <b><a href="' . $result['contest_link'] .'">' . $result['contest_name'] . '</a></b> :: <u>' . $result['rank'] . ' ' . l10n('CR_place') . '</u>
-                        <p>' . trigger_event('render_CR_content', $result['comment']) . '</p>
+                        <p>' . trigger_event('render_category_name', $result['comment']) . '</p>
                 </div>';
                 

extensions/ContestResults/include/cr_main.php

@@ -23 +23 @@
                 $item =  array(
                         'ID' => $contest['id'],
-                        'NAME' => trigger_event('render_CR_content', $contest['name']),
+                        'NAME' => trigger_event('render_element_name', $contest['name']),
                         'VISIBLE' => $contest['visible'],
                         'STATUS' => $contest['status'],
@@ -29 +29 @@
                         'DATE_BEGIN' => format_date($contest['date_begin']),
                         'LOGO' => $contest['logo'],
-                        'SUMMARY' => CR_cut_string(trigger_event('render_CR_content', $contest['summary']), $conf['ContestResults']['truncate_summary']),
-                        'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
+                        'SUMMARY' => CR_cut_string(trigger_event('render_category_name', $contest['summary']), $conf['ContestResults']['truncate_summary']),
+                        'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_category_name', $contest['name'])),
                         'DAYS' => $contest['days'],
                 );

extensions/ContestResults/include/cr_menubar.php

@@ -26 +26 @@
         $menu = &$menu_ref_arr[0];
         
+        if (is_string($conf['ContestResults'])) {
+                $conf['ContestResults'] = unserialize($conf['ContestResults']);
+        }
+        
         // Block Contest - un nouveau bloc dans le menu
         if (($block = $menu->get_block('mbContestResults')) != null) {
@@ -46 +50 @@
                         if (($contest['visible'] OR is_admin()) AND $m < $conf['ContestResults']['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']),
+                                        'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_category_name', $contest['name'])),
+                                        'LABEL' => trigger_event('render_category_name', $contest['name']),
                                         'DATE' => format_date($contest['date_begin']) . ' - ' . format_date($contest['date_end']),
                                         'VISIBLE' => $contest['visible'],
                                         'STATUS' => $contest['status'],
-                                        'DAYS' => $contest['days'],
+                                        'DAYS' => $conf['ContestResults']['menubar_block']['display_days'] ? $contest['days'] : null,
                                 ));
                         }

extensions/ContestResults/include/cr_page.php

@@ -22 +22 @@
 $template->assign(array(
         'ID' => $contest['id'],
-        'NAME' => trigger_event('render_CR_content', $contest['name']),
+        'NAME' => trigger_event('render_category_name', $contest['name']),
         'VISIBLE' => $contest['visible'],
         'STATUS' => $contest['status'],
@@ -29 +29 @@
         'LOGO' => $contest['logo'],
         'BANNER' => $contest['banner'],
-        'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
+        'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_category_name', $contest['name'])),
         'DAYS' => $contest['days'],
 ));
@@ -38 +38 @@
         foreach ($contest['description'] as $desc) {
                 $template->append('description', array(
-                        'NAME' => trigger_event('render_CR_content', stripslashes($desc['name'])),
-                        'CONTENT' => trigger_event('render_CR_content', stripslashes($desc['content'])),
+                        'NAME' => trigger_event('render_category_name', stripslashes($desc['name'])),
+                        'CONTENT' => trigger_event('render_category_name', stripslashes($desc['content'])),
                 ));
         }
@@ -90 +90 @@
                                 'IMAGE_URL' => $image['url'],
                                 'IMAGE_NAME' => (empty($image['name'])) ? get_name_from_file($image['file']) : $image['name'],
-                                'COMMENT' => CR_cut_string(trigger_event('render_CR_content', $result['comment']), 450),
+                                'COMMENT' => CR_cut_string(trigger_event('render_category_name', $result['comment']), 450),
                         );
                 }else{