Changeset 1042 for trunk

Timestamp:

Feb 15, 2006, 3:29:26 AM (19 years ago)

Author:

rvelices

Message:

feature 288: manage rates for administrators

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/include/functions.php (modified) (3 diffs)
• admin/rating.php (added)
• include/functions_category.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (4 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (2 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (4 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• template/yoga/admin.tpl (modified) (1 diff)
• template/yoga/admin/rating.tpl (added)

trunk/admin.php

@@ -84 +84 @@
     'U_WAITING'=> $link_start.'waiting',
     'U_COMMENTS'=> $link_start.'comments',
+    'U_RATING'=> $link_start.'rating',
     'U_CADDIE'=> $link_start.'element_set&cat=caddie',
     'U_THUMBNAILS'=> $link_start.'thumbnail',

trunk/admin/include/functions.php

@@ -1312 +1312 @@
 /**
  * update images.average_rate field
- *
+ * param int $element_id optional, otherwise applies to all
  * @return void
  */
-function update_average_rate()
+function update_average_rate( $element_id=-1 )
 {
   $average_rates = array();
@@ -1322 +1322 @@
 SELECT element_id,
        ROUND(AVG(rate),2) AS average_rate
-  FROM '.RATE_TABLE.'
-  GROUP BY element_id
-;';
+  FROM '.RATE_TABLE;
+  if ( $element_id != -1 )
+  {
+    $query .= ' WHERE element_id=' . $element_id;
+  }
+  $query .= ' GROUP BY element_id;';
+  
   $result = pwg_query($query);
   while ($row = mysql_fetch_array($result))
@@ -1344 +1348 @@
   $fields = array('primary' => array('id'), 'update' => array('average_rate'));
   mass_updates(IMAGES_TABLE, $fields, $datas);
+
+  $query='
+UPDATE '.IMAGES_TABLE .' 
+  LEFT JOIN '.RATE_TABLE.' ON id=element_id
+  SET average_rate=NULL
+  WHERE element_id IS NULL';
+  if ( $element_id != -1 )
+  {
+    $query .= ' AND id=' . $element_id;
+  }
+  pwg_query($query);
 }
 

trunk/include/functions_category.inc.php

@@ -260 +260 @@
   return array(
     array('Default', '', true),
-    array(l10n('best_rated_cat'),   'average_rate DESC', $conf['rate']),
+    array(l10n('Average rate'), 'average_rate DESC', $conf['rate']),
     array(l10n('most_visited_cat'), 'hit DESC', true),
     array(l10n('Creation date'), 'date_creation DESC', true),

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -54 +54 @@
 $lang['Check for upgrade'] = 'Check for upgrade';
 $lang['Comments for all'] = 'Comments for all';
+$lang['Controversy'] = 'Controversy';
 $lang['Creation date'] = 'Creation date';
 $lang['Database'] = 'Database';
@@ -98 +99 @@
 $lang['Number of comments per page'] = 'Number of comments per page';
 $lang['Number of images per row'] = 'Number of images per row';
+$lang['Number of rates'] = 'Number of rates';
 $lang['Number of rows per page'] = 'Number of rows per page';
 $lang['Number of thumbnails to create'] = 'Number of thumbnails to create';
@@ -117 +119 @@
 $lang['Properties'] = 'Properties';
 $lang['Random picture'] = 'Random picture';
+$lang['Rate date'] = 'Rate date';
+$lang['Rating'] = 'Rating';
 $lang['Recent period'] = 'Recent period';
 $lang['Registration date'] = 'Registration date';
@@ -134 +138 @@
 $lang['Storage category'] = 'Storage category';
 $lang['Submit'] = 'Submit';
+$lang['Sum of rates'] = 'Sum of rates';
 $lang['Take selected elements out of caddie'] = 'Take selected elements out of caddie';
 $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Unable to check for upgrade since allow_url_fopen is disabled.';

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -91 +91 @@
 $lang['Profile'] = 'Profile';
 $lang['Quick connect'] = 'Quick connect';
+$lang['Rate'] = 'Rate';
 $lang['RSS feed'] = 'RSS feed';
 $lang['Register'] = 'Register';
@@ -297 +298 @@
 $lang['title_menu'] = 'Menu';
 $lang['title_send_mail'] = 'A comment on your site';
-$lang['to_rate'] = 'Rate';
 $lang['today'] = 'today';
 $lang['total'] = 'images';

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -54 +54 @@
 $lang['Check for upgrade'] = 'Dernière version ?';
 $lang['Comments for all'] = 'Commentaires utilisateur pour tous';
+$lang['Controversy'] = 'Controverse';
 $lang['Creation date'] = 'Date de création';
 $lang['Database'] = 'Base de données';
@@ -98 +99 @@
 $lang['Number of comments per page'] = 'Nombre de commentaires utilisateur par page';
 $lang['Number of images per row'] = 'Nombre de miniatures par ligne';
+$lang['Number of rates'] = 'Nombre de notes';
 $lang['Number of rows per page'] = 'Nombre de lignes par page';
 $lang['Number of thumbnails to create'] = 'Nombre de miniatures à créer';
@@ -117 +119 @@
 $lang['Properties'] = 'Propriétés';
 $lang['Random picture'] = 'Au hasard';
+$lang['Rate date'] = 'Date de notation';
+$lang['Rating'] = 'Notation';
 $lang['Recent period'] = 'Période récente';
 $lang['Registration date'] = 'Date d\'enregistrement';
@@ -134 +138 @@
 $lang['Storage category'] = 'Catégorie de stockage';
 $lang['Submit'] = 'Valider';
+$lang['Sum of rates'] = 'Somme des notes';
 $lang['Take selected elements out of caddie'] = 'Sortir les éléments sélectionnés du panier';
 $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Impossible de connaître la dernière version cat la fonction allow_url_fopen est désactivée.';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -90 +90 @@
 $lang['Profile'] = 'Profil';
 $lang['Quick connect'] = 'Connexion rapide';
+$lang['Rate'] = 'Note';
 $lang['RSS feed'] = 'flux RSS';
 $lang['Register'] = 'S\'enregistrer';
@@ -296 +297 @@
 $lang['title_menu'] = 'Menu';
 $lang['title_send_mail'] = 'Un commentaire sur le site';
-$lang['to_rate'] = 'Note';
 $lang['today'] = 'aujourd\'hui';
 $lang['total'] = 'images';

trunk/picture.php

@@ -1043 +1043 @@
       else
       {
-        $sentence = $lang['never_rated'].'. '.$lang['to_rate'];
+        $sentence = $lang['never_rated'].'. '.$lang['Rate'];
       }
     }
     else  
     {
-      $sentence = $lang['never_rated'].'. '.$lang['to_rate'];
+      $sentence = $lang['never_rated'].'. '.$lang['Rate'];
     }
     $template->assign_block_vars(

trunk/template/yoga/admin.tpl

@@ -53 +53 @@
         <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
         <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
+        <li><a href="{U_RATING}">{lang:Rating}</a></li>
         <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
       </ul>