Index: branches/RC/core/units/general/cat_tag_processor.php
===================================================================
diff -u -N -r10712 -r10870
--- branches/RC/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 10712)
+++ branches/RC/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 10870)
@@ -404,40 +404,13 @@
*/
function VotesIndicator($params)
{
- $blocks_params = $this->prepareTagParams($params);
- $blocks_params['name'] = $params['render_as'];
-
$object =& $this->getObject($params);
/* @var $object kDBItem */
- if (false && $this->Application->ConfigValue('UseFloatRating')) {
- $rating = $object->GetDBField('CachedRating');
- $float_rating = floor(($rating - floor($rating)) / 0.25) * 0.25;
- }
- else {
- $rating = round( $object->GetDBField('CachedRating') );
- $float_rating = 0;
- }
+ $rating_helper =& $this->Application->recallObject('RatingHelper');
+ /* @var $rating_helper RatingHelper */
- $i = 1;
- $ret = '';
- while ($i <= 5) {
- $blocks_params['number'] = $i;
- $blocks_params['active'] = $rating >= $i ? 1 : 0;
-
- if ($rating > $i - 1 && $rating < $i && $float_rating > 0) {
- $blocks_params['active'] = 1;
- $blocks_params['float_rating'] = $float_rating;
- }
- else {
- $blocks_params['float_rating'] = '';
- }
-
- $ret .= trim($this->Application->ParseBlock($blocks_params));
- $i++;
- }
-
- return $ret;
+ return $rating_helper->ratingBar($object);
}
function RelevanceIndicator($params)
Index: branches/RC/core/units/general/helpers/rating_helper.php
===================================================================
diff -u -N
--- branches/RC/core/units/general/helpers/rating_helper.php (revision 0)
+++ branches/RC/core/units/general/helpers/rating_helper.php (revision 10870)
@@ -0,0 +1,165 @@
+ 'lu_CurrentRating',
+ 'vote_title' => 'lu_VoteTitle',
+ 'vote_count' => 'lu_VoteCount',
+ 'invalid_rating' => 'lu_InvalidRating',
+ 'already_voted' => 'lu_AlreadyVoted',
+ 'thanks_for_voting' => 'lu_ThanksForVoting',
+ );
+
+ /**
+ * Draws rating bar for a given category item
+ *
+ * @param kDBItem $object
+ * @param bool $show_div
+ * @param string $additional_msg
+ * @return string
+ */
+ function ratingBar(&$object, $show_div = true, $additional_msg = '')
+ {
+ $perm_prefix = $this->Application->getUnitOption($object->Prefix, 'PermItemPrefix');
+ $static = !$this->Application->CheckPermission($perm_prefix . '.RATE', 0, $object->GetDBField('CategoryId'));
+
+ $total_votes = $object->GetDBField('CachedVotesQty');
+ $total_rating = $object->GetDBField('CachedRating') * $total_votes;
+
+ $spam_helper =& $this->Application->recallObject('SpamHelper');
+ /* @var $spam_helper SpamHelper */
+
+ $config_mapping = $this->Application->getUnitOption($object->Prefix, 'ConfigMapping');
+ $review_settings = $config_mapping['RatingDelayValue'].':'.$config_mapping['RatingDelayInterval'];
+ $spam_helper->InitHelper($object->GetDBField('ResourceId'), 'Rating', $review_settings);
+
+ $user_voted = $spam_helper->InSpamControl();
+
+ // now draw the rating bar
+ $rating_width = $total_votes ? @number_format($total_rating / $total_votes, 2) * $this->ratingUnitWidth : 0;
+ $rating1 = $total_votes ? @number_format($total_rating / $total_votes, 1) : 0;
+ $rating2 = $total_votes ? @number_format($total_rating / $total_votes, 2) : 0;
+
+ $rater = '
+ ' . $this->_replaceInPhrase('current_rating', Array ('' . $rating2 . ' ', $this->ratingMaximal)) . ' ';
+
+ if (!$static && !$user_voted) {
+ // allow to set rating when not static and user not voted before
+ for ($ncount = 1; $ncount <= $this->ratingMaximal; $ncount++) {
+ $rater .= '' . $ncount . '
+ ' .
+ $this->_replaceInPhrase('vote_title', Array(''.$rating1.' ', $this->ratingMaximal)) . ' ('. $this->_replaceInPhrase('vote_count', Array($total_votes)) . ') ' . $additional_msg . '
+
';
+
+ if ($show_div) {
+ // adds div around rating stars (when drawing rating first time)
+ $rater = '';
+ }
+
+ return $rater;
+ }
+
+ /**
+ * Saves user's vote, when allowed
+ *
+ * @param kDBItem $object
+ * @return string
+ */
+ function makeVote(&$object)
+ {
+ $spam_helper =& $this->Application->recallObject('SpamHelper');
+ /* @var $spam_helper SpamHelper */
+
+ $config_mapping = $this->Application->getUnitOption($object->Prefix, 'ConfigMapping');
+ $review_settings = $config_mapping['RatingDelayValue'].':'.$config_mapping['RatingDelayInterval'];
+ $spam_helper->InitHelper($object->GetDBField('ResourceId'), 'Rating', $review_settings);
+
+ if (!$object->isLoaded() || $spam_helper->InSpamControl()) {
+ return '@err:' . $this->_replaceInPhrase('already_voted');
+ }
+
+ $perm_prefix = $this->Application->getUnitOption($object->Prefix, 'PermItemPrefix');
+ $can_rate = $this->Application->CheckPermission($perm_prefix . '.RATE', 0, $object->GetDBField('CategoryId'));
+ $rating = (int)$this->Application->GetVar('rating'); // not numeric rating is from GoogleBot :(
+
+ if (($rating <= 0) || ($rating > $this->ratingMaximal) || !$can_rate) {
+ return '@err:' . $this->_replaceInPhrase('invalid_rating');
+ }
+
+ // save current rating
+ $fields_hash = Array (
+ 'ItemId' => $object->GetID(),
+ 'RatingValue' => $rating,
+ 'IPAddress' => $_SERVER['REMOTE_ADDR'],
+ 'CreatedOn' => adodb_mktime(),
+ );
+ $this->Conn->doInsert($fields_hash, TABLE_PREFIX.'ItemRating');
+
+ // recalculate average rating
+ $votes_count = $object->GetDBField('CachedVotesQty');
+ $avg_rating = $object->GetDBField('CachedRating');
+
+ $avg_rating = round((($votes_count * $avg_rating) + $rating) / ($votes_count + 1), 2);
+ $object->SetDBField('CachedRating', "$avg_rating");
+ $object->Update();
+
+ $sql = 'UPDATE '.$object->TableName.'
+ SET CachedVotesQty = CachedVotesQty + 1
+ WHERE '.$object->IDField.' = '.$object->GetID();
+ $this->Conn->Query($sql);
+
+ $object->SetDBField('CachedVotesQty', $object->GetDBField('CachedVotesQty') + 1); // for using in template
+
+ // prevent user from voting too quickly
+ $spam_helper->AddToSpamControl();
+
+ return $this->ratingBar($object, false, '' . $this->_replaceInPhrase('thanks_for_voting') . ' ');
+ }
+
+ /**
+ * Performs sprintf on phrase translation using given variables
+ *
+ * @param string $phrase
+ * @param Array $arguments
+ * @return string
+ */
+ function _replaceInPhrase($phrase, $arguments = Array ())
+ {
+ $value = $this->Application->Phrase($this->_phrases[$phrase]);
+
+ if ($arguments) {
+ return vsprintf($value, $arguments);
+ }
+
+ return $value;
+ }
+ }
\ No newline at end of file
Index: branches/RC/themes/default2007/platform/elements/html_head.tpl
===================================================================
diff -u -N -r10362 -r10870
--- branches/RC/themes/default2007/platform/elements/html_head.tpl (.../html_head.tpl) (revision 10362)
+++ branches/RC/themes/default2007/platform/elements/html_head.tpl (.../html_head.tpl) (revision 10870)
@@ -6,13 +6,13 @@
-
-
@@ -25,14 +25,20 @@
-
+" + Request.progressText + "
";
+}
+
+Request.getProgressObject = function($id) {
+ var $div = document.createElement('DIV');
+ var $parent_div = document.getElementById($id);
+
+ $div.id = $id + '_progress';
+
+ $div.style.width = $parent_div.clientWidth + 'px';
+ $div.style.height = '150px'; // default height if div is empty (first ajax request for div)
+ $div.style.left = getRealLeft($parent_div) + 'px';
+ $div.style.top = getRealTop($parent_div) + 'px';
+ $div.style.position = 'absolute';
+
+ /*$div.style.border = '1px solid green';
+ $div.style.backgroundColor = '#FF0000';*/
+
+ $div.innerHTML = ''+Request.progressText+'
';
+ return $div;
+}
+
+Request.getErrorHtml = function(p_req) {
+ //TODO: implement accepted way to handle request error
+ return '[status: ' + p_req.status + '; status_text: ' + p_req.statusText + '; responce_text: ' + p_req.responseText + ']';
+}
+
+Request.serializeForm = function(theform) {
+ if (typeof(theform) == 'string') {
+ theform = document.getElementById(theform);
+ }
+
+ var els = theform.elements;
+ var len = els.length;
+ var queryString = '';
+
+ Request.addField = function(name, value) {
+ if (queryString.length > 0) queryString += '&';
+ queryString += encodeURIComponent(name) + '=' + encodeURIComponent(value);
+ };
+
+ for (var i = 0; i= 0) {
+ Request.addField(el.name, el.options[el.selectedIndex].value);
+ }
+ break;
+
+ case 'select-multiple':
+ for (var j = 0; j < el.options.length; j++) {
+ if (!el.options[j].selected) continue;
+ Request.addField(el.name, el.options[j].value);
+ }
+ break;
+
+ case 'checkbox':
+ case 'radio':
+ if (!el.checked) continue;
+ Request.addField(el.name,el.value);
+ break;
+ }
+ }
+ return queryString;
+};
+
+function RatingManager ($url) {
+ this.Url = $url;
+ this.BusyRequest = false;
+}
+
+RatingManager.prototype.makeVote = function ($vote, $prefix, $id) {
+ var $url = this.Url.replace('#PREFIX#', $prefix).replace('#VOTE#', $vote).replace('#ID#', $id);
+
+ Request.makeRequest($url, this.BusyRequest, '', this.successCallback, this.errorCallback, [$vote, $prefix, $id], this);
+}
+
+RatingManager.prototype.successCallback = function ($request, $params, $object) {
+ var response = $request.responseText;
+
+ if (response.substring(0, 5) == '@err:') {
+ alert(response.substring(5));
+ return ;
+ }
+
+ document.getElementById('page_rating_' + $params[2]).innerHTML = response;
+}
+
+
+RatingManager.prototype.errorCallback = function($request, $params, $object) {
+ alert('AJAX Error; class: RatingManager; ' + Request.getErrorHtml($request));
+}
\ No newline at end of file
