From: <var...@us...> - 2015-02-11 10:00:21
|
Revision: 9518 http://sourceforge.net/p/phpwiki/code/9518 Author: vargenau Date: 2015-02-11 10:00:13 +0000 (Wed, 11 Feb 2015) Log Message: ----------- Merge for plain Phpwiki and Fusionforge Modified Paths: -------------- trunk/lib/wikilens/PageListColumns.php Modified: trunk/lib/wikilens/PageListColumns.php =================================================================== --- trunk/lib/wikilens/PageListColumns.php 2015-02-11 09:11:42 UTC (rev 9517) +++ trunk/lib/wikilens/PageListColumns.php 2015-02-11 10:00:13 UTC (rev 9518) @@ -154,6 +154,11 @@ { $this->_pagelist =& $params[3]; $this->_user =& $params[4]; //$this->_pagelist->getOption('user'); + if (defined('FUSIONFORGE') && FUSIONFORGE) { + if (empty($this->_user)) { + $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid); + } + } $this->_PageList_Column($params[0], $params[1], $params[2]); $this->_dimension = $this->_pagelist->getOption('dimension'); if (!$this->_dimension) $this->_dimension = 0; @@ -233,8 +238,13 @@ function format($pagelist, $page_handle, &$revision_handle) { $plugin = new WikiPlugin_RateIt(); - $widget = $plugin->RatingWidgetHtml($page_handle->getName(), "", + if (defined('FUSIONFORGE') && FUSIONFORGE) { + $widget = $plugin->RatingWidgetHtml($page_handle->getName(), "", + "BStar", $this->_dimension, "small"); + } else { + $widget = $plugin->RatingWidgetHtml($page_handle->getName(), "", "Star", $this->_dimension, "small"); + } $td = HTML::td($widget); $td->setAttr('nowrap', 'nowrap'); return $td; @@ -244,12 +254,18 @@ { global $request; - $pagename = $page_handle->getName(); - $active_user = $request->getUser(); - $active_userid = $active_user->_userid; - - $tu = & RatingsUserFactory::getUser($active_userid); - return $tu->get_rating($pagename, $this->_dimension); + if (defined('FUSIONFORGE') && FUSIONFORGE) { + // Returns average rating of a page + $pagename = $page_handle->getName(); + $rdbi = RatingsDb::getTheRatingsDb(); + return $rdbi->getAvg($pagename, $this->_dimension); + } else { + $pagename = $page_handle->getName(); + $active_user = $request->getUser(); + $active_userid = $active_user->_userid; + $tu = & RatingsUserFactory::getUser($active_userid); + return $tu->get_rating($pagename, $this->_dimension); + } } function _getSortableValue($page_handle, &$revision_handle) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |