Mess around with ratings

Drop the public variables from the rating class; everyone should use the
getters.

Add the ability for themes and applications to distinguish between
a user's actual rating and the global average rating; in the web
interface the average shows up if a user hasn't rated something but at
least one other user has.

1 files changed, 15 insertions, 8 deletions

diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php
index 8fa40fac..0feefd4d 100644
--- a/templates/show_object_rating.inc.php
+++ b/templates/show_object_rating.inc.php
@@ -29,31 +29,38 @@
 /* Create some variables we are going to need */
 $web_path = Config::get('web_path');
 $base_url = '?action=set_rating&rating_type=' . $rating->type . '&object_id=' . $rating->id;
+$othering = false;
+$rate = $rating->get_user_rating();
+if (!$rate) {
+	$rate = $rating->get_average_rating();
+	$othering = true;
+}
 ?>
 
-<div class="star-rating dynamic-star-rating">
+<div class="star-rating dynamic-star-rating<?php if ($othering) { echo ' global-star-rating'; } ?>">
   <ul>
     <?php
     // decide width of rating (5 stars -> 20% per star)
-    $width = $rating->preciserating*20;
+    $width = $rate * 20;
     if ($width < 0) $width = 0;
 
     //set the current rating background
-    echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . T_('Current rating: ');
-    if ($rating->rating <= 0) {
+    echo '<li class="current-rating" style="width:' . $width . '%" >';
+    echo T_('Current rating: ');
+    if ($rate <= 0) {
     	echo T_('not rated yet') . "</li>\n";
     }
-    else printf(T_('%s of 5'), $rating->preciserating); echo "</li>\n";
+    else printf(T_('%s of 5'), $rate); echo "</li>\n";
 
-    for ($i=1; $i<6; $i++)
+    for ($i = 1; $i < 6; $i++)
     {
     ?>
       <li>
-      	<?php echo Ajax::text($base_url . '&rating='.$i,'','rating'.$i.'_' . $rating->id,'','star'.$i); ?>
+      	<?php echo Ajax::text($base_url . '&rating=' . $i, '', 'rating' . $i . '_' . $rating->id, '', 'star' . $i); ?>
       </li>
     <?php
     }
     ?>
   </ul>
-   	<?php echo Ajax::text($base_url . '&rating=-1','','rating0_' . $rating->id,'','star0'); ?>
+   	<?php echo Ajax::text($base_url . '&rating=-1', '', 'rating0_' . $rating->id, '', 'star0'); ?>
 </div>