### Eclipse Workspace Patch 1.0 #P nodereview Index: nodereview_node_nodereview.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/nodereview/nodereview_node_nodereview.inc,v retrieving revision 1.6 diff -u -r1.6 nodereview_node_nodereview.inc --- nodereview_node_nodereview.inc 25 Feb 2007 02:50:10 -0000 1.6 +++ nodereview_node_nodereview.inc 20 May 2008 14:39:58 -0000 @@ -91,19 +91,14 @@ function _nodereview_form_review(&$form, $axis, $reviews, $votes) { static $options; + $maximum = ''; + $half_of_maximum = ''; + $maximum = variable_get('nodereview_maximum_'. $axis->node_type, 10); + $half_of_maximum = round($maximum / 2) * 10; if (!isset($options)) { - $options = array( - 10 => 1, - 20 => 2, - 30 => 3, - 40 => 4, - 50 => 5, - 60 => 6, - 70 => 7, - 80 => 8, - 90 => 9, - 100 => 10, - ); + for ($i = 1; $i <= $maximum; $i ++){ + $options[$i * 10] = $i; + } } $form['reviews'][$axis->aid] = array( '#type' => 'fieldset', @@ -115,7 +110,7 @@ '#type' => 'select', '#title' => t('Score'), '#options' => $options, - '#default_value' => $votes[$axis->tag] ? $votes[$axis->tag] : 50, + '#default_value' => $votes[$axis->tag] ? $votes[$axis->tag] : $half_of_maximum, '#description' => t('Score for this axis'), '#required' => TRUE, ); @@ -168,7 +163,7 @@ } $additions->reviews = array(); - $result = db_query('SELECT nr.aid, tag, review FROM {nodereview_reviews} nr INNER JOIN {nodereview_axes} na ON nr.aid=na.aid WHERE nid = %d ORDER BY na.weight, na.tag', $node->nid); + $result = db_query('SELECT nr.aid, tag, review, node_type FROM {nodereview_reviews} nr INNER JOIN {nodereview_axes} na ON nr.aid=na.aid WHERE nid = %d ORDER BY na.weight, na.tag', $node->nid); while ($record = db_fetch_object($result)) { // Add in the numeric scores $record->score = $votes[$record->tag]->value; @@ -259,12 +254,13 @@ if ($node->in_preview) { // We have to load in our axis data, which the $_POST doesn't have but we need - $result = db_query("SELECT tag, aid + $result = db_query("SELECT tag, aid, node_type FROM {nodereview_axes} na INNER JOIN {node} n ON na.node_type=n.type WHERE n.nid=%d", $node->reviewed_nid); while ($record = db_fetch_array($result)) { $node->reviews[$record['aid']]['tag'] = $record['tag']; + $node->reviews[$record['aid']]['reviewed_type'] = $record['node_type']; } foreach ($node->reviews as $review) { @@ -306,7 +302,8 @@ $output = ''; $title = $review->tag; - $title .= ': ' . $review->score/10 . '/10'; + $maximum = variable_get('nodereview_maximum_'. $review->node_type, 10); + $title .= ': ' . $review->score/10 . '/' . $maximum; $output .= theme('box', $title, $review->review); return $output; @@ -316,7 +313,8 @@ $output = ''; $title = $review['tag']; - $title .= ': ' . $review['score']/10 . '/10'; + $maximum = variable_get('nodereview_maximum_'. $review['reviewed_type'], 10); + $title .= ': ' . $review['score']/10 . '/' . $maximum; $output .= theme('box', $title, check_markup($review['review'], $node->format)); return $output; @@ -333,9 +331,11 @@ } foreach ($node->reviews as $review) { + $maximum = variable_get('nodereview_maximum_'. $review->node_type, 10); + $row = array(); $row[] = $review->tag; - $row[] = $review->score/10 . '/10'; + $row[] = $review->score/10 . '/' . $maximum; $review_text = truncate_utf8($review->review, 50, TRUE, TRUE); $row[] = substr($review_text, 0, strpos($review_text, "\n")); $rows[] = $row;