Changeset 9572 for extensions/ContestResults/include

Timestamp:

Mar 8, 2011, 1:19:06 PM (13 years ago)

Author:

mistic100

Message:

[extensions] ContestResults 1.3

• Add error and success messages on admin page
• Add Spain (es_ES) thanks to jpr928
• Contest status is automatic and shows remaining days
• More flexibility for description fields
• Compatibility with Piwigo 2.2.0

Location:

extensions/ContestResults/include

Files:

• cr_comment_picture.php (modified) (3 diffs)
• cr_main.php (modified) (5 diffs)
• cr_menubar.php (modified) (3 diffs)
• cr_page.php (modified) (3 diffs)
• cutstring.class.php (modified) (1 diff)
• functions.php (modified) (1 diff)

extensions/ContestResults/include/cr_comment_picture.php

@@ -1 +1 @@
 <?php
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+// +-----------------------------------------------------------------------+
+//              Affichage du commentaire sur la page d'une image participante
+// +-----------------------------------------------------------------------+
 
 // Requète simple pour savoir si l'image a participé à des concours 
@@ -6 +10 @@
 
 if(pwg_db_num_rows($participation)){
+        // requète complète
         $results = pwg_query("SELECT 
                         i.rank,
@@ -46 +51 @@
         </style>';
 
+        // +-----------------------------------------------------------------------+
+        //                              Template
+        // +-----------------------------------------------------------------------+
         $template->assign('COMMENT_IMG', $template->get_template_vars('COMMENT_IMG') . $comment);
-        $template->assign('PLUGIN_PICTURE_BEFORE', $template->get_template_vars('PLUGIN_PICTURE_BEFORE') . $css);
+        $template->append('footer_elements', $css);
 }
 ?>

extensions/ContestResults/include/cr_main.php

@@ -11 +11 @@
                 date_begin, 
                 date_end, 
-                status, 
                 logo, 
                 summary 
@@ -19 +18 @@
 while ($contest = pwg_db_fetch_assoc($contests)) {
         if ($contest['visible'] OR is_admin()) {
+                $contest['finished'] = is_date_passed($contest['date_end']);
+                
                 // infos sur le concours
                 $item =  array(
@@ -24 +25 @@
                         'NAME' => trigger_event('render_CR_content', $contest['name']),
                         'VISIBLE' => $contest['visible'],
-                        'STATUS' => $contest['status'],
+                        'FINISHED' => $contest['finished'],
                         'DATE_END' => format_date($contest['date_end']),
                         'DATE_BEGIN' => format_date($contest['date_begin']),
@@ -30 +31 @@
                         'SUMMARY' => CR_cut_string(trigger_event('render_CR_content', $contest['summary']), 350),
                         'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
+                        'DAYS' => DateDiff($contest['date_end'], date('Y-m-d')),
                 );
                 
                 // podium si terminé
-                if ($contest['status'] == 'finished') {
+                if ($contest['finished'] == true) {
                         $results = pwg_query("SELECT
                                         i.id,
@@ -67 +69 @@
 //                              Template
 // +-----------------------------------------------------------------------+
+if (is_admin()) {
+        $template->assign('U_EDIT', CR_ADMIN);
+}
 $template->assign('CR_PATH', CR_PATH);
 $template->assign('SEPARATOR', $conf['level_separator']);

extensions/ContestResults/include/cr_menubar.php

@@ -37 +37 @@
                                 name, 
                                 visible, 
-                                status, 
                                 date_begin, 
                                 date_end 
@@ -43 +42 @@
                         ORDER BY date_begin DESC;");
 
-                $m = 0; // copteur pour limiter le nombre de concours affichés
+                $m = 0; // compteur 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']) {
@@ -50 +49 @@
                                         'LABEL' => trigger_event('render_CR_content', $contest['name']),
                                         'DATE' => format_date($contest['date_begin']) . ' - ' . format_date($contest['date_end']),
-                                        'STATUS' => $contest['status'],
-                                        'VISIBLE' => $contest['visible']
+                                        'VISIBLE' => $contest['visible'],
+                                        'FINISHED' => is_date_passed($contest['date_end']),
+                                        'DAYS' => DateDiff($contest['date_end'],date('Y-m-d')),
                                 ));
                         }

extensions/ContestResults/include/cr_page.php

@@ -15 +15 @@
 if (pwg_db_num_rows($contest)) { 
         $contest = pwg_db_fetch_assoc($contest);
+        $contest['finished'] = is_date_passed($contest['date_end']);
         
         // Concours non-publique
@@ -25 +26 @@
                 'ID' => $contest['id'],
                 'NAME' => trigger_event('render_CR_content', $contest['name']),
-                'STATUS' => $contest['status'],
                 'VISIBLE' => $contest['visible'],
+                'FINISHED' => $contest['finished'],
                 'DATE_BEGIN' => format_date($contest['date_begin']),
                 'DATE_END' => format_date($contest['date_end']),
@@ -32 +33 @@
                 'BANNER' => $contest['banner'],
                 'URL' => CR_PUBLIC . $contest['id'] . '-' . str2url(trigger_event('render_CR_content', $contest['name'])),
+                'DAYS' => DateDiff($contest['date_end'], date('Y-m-d')),
         ));
         
         // Les quatre zones texte
-        foreach (array('presentation','rules','prices','final') AS $key) {
-                $template->assign(strtoupper($key), trigger_event('render_CR_content', $contest[$key]));
+        if (!empty($contest['description'])) {
+                $contest['description'] = unserialize(base64_decode($contest['description']));
+                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'])),
+                        ));
+                }
         }
         
         // Affichage des résultats
-        if ($contest['status'] == 'finished') {
+        if ($contest['finished'] == true) {
                 // Infos des résultats
                 $results = pwg_query("SELECT * FROM " . CR_TABLE_2 . " WHERE contest_id=" . $contest['id'] . " ORDER BY rank ASC;");

extensions/ContestResults/include/cutstring.class.php

@@ -6 +6 @@
 
 class HtmlCutString{
-  function __construct($string, $limit){
-    // create dom element using the html string
-    $this->tempDiv = new DomDocument;
-    $this->tempDiv->loadXML('<div>'.$string.'</div>');
-    // keep the characters count till now
-    $this->charCount = 0;
-    $this->encoding = 'UTF-8';
-    // character limit need to check
-    $this->limit = $limit;
-  }
-  function cut(){
-    // create empty document to store new html
-    $this->newDiv = new DomDocument;
-    // cut the string by parsing through each element
-    $this->searchEnd($this->tempDiv->documentElement,$this->newDiv);
-    $newhtml = $this->newDiv->saveHTML();
-    return $newhtml;
-  }
-
-  function deleteChildren($node) {
-    while (isset($node->firstChild)) {
-      $this->deleteChildren($node->firstChild);
-      $node->removeChild($node->firstChild);
-    }
-  } 
-  function searchEnd($parseDiv, $newParent){
-    foreach($parseDiv->childNodes as $ele){
-        // not text node
-        if($ele->nodeType != 3){
-          $newEle = $this->newDiv->importNode($ele,true);
-          if(count($ele->childNodes) === 0){
-            $newParent->appendChild($newEle);
-            continue;
-          }
-          $this->deleteChildren($newEle);
-          $newParent->appendChild($newEle);
-            $res = $this->searchEnd($ele,$newEle);
-            if($res)
-                        return $res;
-            else
-                        continue;
+        function __construct($string, $limit){
+                // create dom element using the html string
+                $this->tempDiv = new DomDocument;
+                $this->tempDiv->loadXML('<div>'.$string.'</div>');
+                // keep the characters count till now
+                $this->charCount = 0;
+                $this->encoding = 'UTF-8';
+                // character limit need to check
+                $this->limit = $limit;
         }
-
-        // the limit of the char count reached
-        if(mb_strlen($ele->nodeValue,$this->encoding) + $this->charCount >= $this->limit){
-          $newEle = $this->newDiv->importNode($ele);
-            $newEle->nodeValue = substr($newEle->nodeValue,0, $this->limit - $this->charCount);
-            $newParent->appendChild($newEle);
-            return true;
+        function cut(){
+                // create empty document to store new html
+                $this->newDiv = new DomDocument;
+                // cut the string by parsing through each element
+                $this->searchEnd($this->tempDiv->documentElement,$this->newDiv);
+                $newhtml = $this->newDiv->saveHTML();
+                return $newhtml;
         }
-        $newEle = $this->newDiv->importNode($ele);
-        $newParent->appendChild($newEle);
-        $this->charCount += mb_strlen($newEle->nodeValue,$this->encoding);
-    }
-    return false;
-  }
+        function deleteChildren($node) {
+                while (isset($node->firstChild)) {
+                        $this->deleteChildren($node->firstChild);
+                        $node->removeChild($node->firstChild);
+                }
+        } 
+        function searchEnd($parseDiv, $newParent){
+                foreach($parseDiv->childNodes as $ele){
+                        // not text node
+                        if($ele->nodeType != 3){
+                                $newEle = $this->newDiv->importNode($ele,true);
+                                if(count($ele->childNodes) === 0){
+                                        $newParent->appendChild($newEle);
+                                        continue;
+                                }
+                                $this->deleteChildren($newEle);
+                                $newParent->appendChild($newEle);
+                                $res = $this->searchEnd($ele,$newEle);
+                                if($res)
+                                        return $res;
+                                else
+                                        continue;
+                        }
+                        // the limit of the char count reached
+                        if(mb_strlen($ele->nodeValue,$this->encoding) + $this->charCount >= $this->limit){
+                                $newEle = $this->newDiv->importNode($ele);
+                                $newEle->nodeValue = substr($newEle->nodeValue,0, $this->limit - $this->charCount);
+                                $newParent->appendChild($newEle);
+                                return true;
+                        }
+                        $newEle = $this->newDiv->importNode($ele);
+                        $newParent->appendChild($newEle);
+                        $this->charCount += mb_strlen($newEle->nodeValue,$this->encoding);
+                }
+                return false;
+        }
 }
 ?>

extensions/ContestResults/include/functions.php

@@ -23 +23 @@
         }
 }
+
+// Nombre de jours entre deux dates
+function DateDiff($date2, $date1) {
+        return ceil((strtotime($date2)-strtotime($date1))/(3600*24));
+}
+
+// Date passée
+function is_date_passed($date) {
+        if (time() > strtotime($date)) {
+                return true;
+        } else {
+                return false;
+        }
+}
 ?>