Changeset 9364 for extensions/ConcoursPhoto

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.

Location:

extensions/ConcoursPhoto

Files:

• CHANGELOG (modified) (1 diff)
• admin/admin.php (modified) (1 diff)
• admin/template/add_concours.tpl (modified) (1 diff)
• admin/template/audit.tpl (modified) (1 diff)
• admin/template/config.tpl (modified) (1 diff)
• admin/template/criteria.tpl (modified) (1 diff)
• admin/template/manage.tpl (modified) (1 diff)
• admin/template/params.tpl (modified) (1 diff)
• include/Concours.class.php (modified) (8 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/ConcoursPhoto/CHANGELOG

@@ -9 +9 @@
         - Correct hour/min bug when time is set to 00h00 and control coherence between end and begin dates/hours
         - Correct export to csv file (utf8decode)
+        - Add information on admin page
+        - Change blockmenu to show Contests without groups or for Guests.  
 ______________
 

extensions/ConcoursPhoto/admin/admin.php

@@ -60 +60 @@
 
     }
+}
             
-}
+$template->assign( 'CONCOURS_VERSION', l10n('concoursphoto')." (<i>Version ".CONCOURS_VERSION.'</i>)');
 
 

extensions/ConcoursPhoto/admin/template/add_concours.tpl

@@ -10 +10 @@
 
 <div class="titrePage">
-  <h2>Concours</h2>
+  <h2>{$CONCOURS_VERSION}</h2>
 </div>
 

extensions/ConcoursPhoto/admin/template/audit.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>Concours</h2>
+  <h2>{$CONCOURS_VERSION}</h2>
 </div>
 <div class="concours">

extensions/ConcoursPhoto/admin/template/config.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>Concours</h2>
+  <h2>{$CONCOURS_VERSION}</h2>
 </div>
 <p>

extensions/ConcoursPhoto/admin/template/criteria.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>Concours</h2>
+  <h2>{$CONCOURS_VERSION}</h2>
 </div>
 <p>

extensions/ConcoursPhoto/admin/template/manage.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>Concours</h2>
+  <h2>{$CONCOURS_VERSION}</h2>
 </div>
 <p>

extensions/ConcoursPhoto/admin/template/params.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>Concours</h2>
+  <h2>{$CONCOURS_VERSION}</h2>
 </div>
 <p>

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;

extensions/ConcoursPhoto/language/en_UK/plugin.lang.php

@@ -98 +98 @@
 $lang['concours_change_score']          = 'Allow user to change his score after a validation';
 $lang['concours_end_date_change_to']    = 'End date changed to %s';
-$lang['concours_saved']                 = 'Concours %s-%s saved';
+$lang['concours_saved']                 = 'Contest %s-%s saved';
+$lang['concoursphoto']                  = 'Photo Contest';
+$lang['concours_saveOK']                = 'Parameters saved';
 ?>

extensions/ConcoursPhoto/language/fr_FR/plugin.lang.php

@@ -99 +99 @@
 $lang['concours_end_date_change_to']    = 'La date de fin du concours a été modifié : %s';
 $lang['concours_saved']                 = 'Concours %s-%s sauvegardé';
+$lang['concoursphoto']                  = 'Concours Photo';
+$lang['concours_saveOK']                = 'Paramètres enregistrés';
+
 ?>

extensions/ConcoursPhoto/main.inc.php

@@ -2 +2 @@
 /*
  * Plugin Name: ConcoursPhoto
- * Version: 1.2.0
+ * Version: 2.0.0
  * Description: Concours de photo paramétrable
  * Plugin URI: http://piwigo.org/ext/extension_view.php?eid=323
@@ -16 +16 @@
 
 global $prefixeTable;
+
+define('CONCOURS_VERSION', '2.0.0 [BETA]');       // 
+
 
 define('CONCOURS_NAME', 'Concours Photo');