Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2011-03-03 17:53:00
|
Revision: 7958
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7958&view=rev
Author: vargenau
Date: 2011-03-03 17:52:53 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2011-03-03 17:38:22 UTC (rev 7957)
+++ trunk/lib/wikilens/PageListColumns.php 2011-03-03 17:52:53 UTC (rev 7958)
@@ -57,7 +57,7 @@
class _PageList_Column_coagreement extends _PageList_Column_custom
{
function _PageList_Column_coagreement ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
@@ -89,7 +89,7 @@
class _PageList_Column_minmisery extends _PageList_Column_custom
{
function _PageList_Column_minmisery ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
@@ -104,7 +104,7 @@
$active_userId = $active_user->getId();
$dbi = $request->getDbh();
$p = MinMisery($dbi, $pagename, $this->_selectedBuddies, $active_userId);
- $imgFix = floor($p * 2) / 2;
+ $imgFix = floor($p * 2) / 2;
return HTML::img(array('src' => $WikiTheme->getImageURL("Rateit" . $imgFix)));
}
}
@@ -113,7 +113,7 @@
{
function _PageList_Column_averagerating ($params)
{
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
@@ -147,7 +147,7 @@
var $_dimension;
function _PageList_Column_ratingvalue ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_user =& $params[4];//$this->_pagelist->getOption('user');
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_dimension = $this->_pagelist->getOption('dimension');
@@ -212,7 +212,7 @@
class _PageList_Column_ratingwidget extends _PageList_Column_custom
{
function _PageList_Column_ratingwidget ($params) {
- $this->_pagelist =& $params[3];
+ $this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_dimension = $this->_pagelist->getOption('dimension');
if (!$this->_dimension) $this->_dimension = 0;
@@ -255,7 +255,7 @@
$active_user = $request->getUser();
// This needs to be a reference so things aren't recomputed for this user
$this->_active_ratings_user =& RatingsUserFactory::getUser($active_user->getId());
-
+
$this->_pagelist =& $params[3];
$this->_PageList_Column($params[0], $params[1], $params[2]);
$this->_dimension = $this->_pagelist->getOption('dimension');;
@@ -302,9 +302,9 @@
global $request;
$active_user = $request->getUser();
if (is_string($active_user)) {
- //FIXME: try to find the bug at test.php which sets request->_user and ->_group
- trigger_error("request->getUser => string: $active_user", E_USER_WARNING);
- $active_user = new MockUser($active_user,true);
+ //FIXME: try to find the bug at test.php which sets request->_user and ->_group
+ trigger_error("request->getUser => string: $active_user", E_USER_WARNING);
+ $active_user = new MockUser($active_user,true);
}
// No, I don't know exactly why, but this needs to be a reference for
// the memoization in pearson_similarity and mean_rating to work
@@ -369,25 +369,25 @@
(
'numbacklinks'
=> array('_PageList_Column_numbacklinks','custom:numbacklinks',
- _("# things"), 'center'),
- 'rating'
+ _("# things"), 'center'),
+ 'rating'
=> array('_PageList_Column_ratingwidget','custom:rating',
- _("Rate"), false),
+ _("Rate"), false),
'ratingvalue'
=> array('_PageList_Column_ratingvalue','custom:ratingvalue',
- _("Rating"), 'center'),
+ _("Rating"), 'center'),
'coagreement'
=> array('_PageList_Column_coagreement','custom:coagreement',
- _("Go?"), 'center'),
+ _("Go?"), 'center'),
'minmisery'
=> array('_PageList_Column_minmisery','custom:minmisery',
- _("MinMisery"), 'center'),
+ _("MinMisery"), 'center'),
'averagerating'
=> array('_PageList_Column_averagerating','custom:averagerating',
- _("Avg. Rating"), 'left'),
+ _("Avg. Rating"), 'left'),
'top3recs'
=> array('_PageList_Column_top3recs','custom:top3recs',
- _("Top Recommendations"), 'left'),
+ _("Top Recommendations"), 'left'),
/*'prediction'
=> array('_PageList_Column_prediction','custom:prediction',
_("Prediction"), false),*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-05-29 08:17:48
|
Revision: 8790
http://sourceforge.net/p/phpwiki/code/8790
Author: vargenau
Date: 2013-05-29 08:17:45 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Revert
Modified Paths:
--------------
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2013-05-29 07:32:07 UTC (rev 8789)
+++ trunk/lib/wikilens/PageListColumns.php 2013-05-29 08:17:45 UTC (rev 8790)
@@ -154,8 +154,6 @@
{
$this->_pagelist =& $params[3];
$this->_user =& $params[4]; //$this->_pagelist->getOption('user');
- 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;
@@ -163,6 +161,8 @@
function format($pagelist, $page_handle, &$revision_handle)
{
+ if (empty($this->_user))
+ $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid);
assert(!empty($this->_user));
$rating = $this->_getValue($page_handle, $revision_handle);
$mean = $this->_user->mean_rating($this->_dimension);
@@ -229,7 +229,7 @@
{
$plugin = new WikiPlugin_RateIt();
$widget = $plugin->RatingWidgetHtml($page_handle->getName(), "",
- "BStar", $this->_dimension, "small");
+ "Star", $this->_dimension, "small");
$td = HTML::td($widget);
$td->setAttr('nowrap', 'nowrap');
return $td;
@@ -237,10 +237,14 @@
function _getValue($page_handle, &$revision_handle)
{
- // Returns average rating of a page
+ global $request;
+
$pagename = $page_handle->getName();
- $rdbi = RatingsDb::getTheRatingsDb();
- return $rdbi->getAvg($pagename, $this->_dimension);
+ $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.
|
|
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.
|
|
From: <var...@us...> - 2016-10-06 17:06:44
|
Revision: 9939
http://sourceforge.net/p/phpwiki/code/9939
Author: vargenau
Date: 2016-10-06 17:06:42 +0000 (Thu, 06 Oct 2016)
Log Message:
-----------
Add SPDX-License-Identifier
Modified Paths:
--------------
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2016-10-06 16:55:25 UTC (rev 9938)
+++ trunk/lib/wikilens/PageListColumns.php 2016-10-06 17:06:42 UTC (rev 9939)
@@ -1,7 +1,7 @@
<?php
-
-/*
- * Copyright 2004 Mike Cassano
+/**
+ * Copyright © 2004 Mike Cassano
+ * Copyright © 2004-2005, 2008-2014 $ThePhpWikiProgrammingTeam
*
* This file is part of PhpWiki.
*
@@ -18,6 +18,9 @@
* You should have received a copy of the GNU General Public License along
* with PhpWiki; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
*/
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2017-08-10 14:12:33
|
Revision: 10024
http://sourceforge.net/p/phpwiki/code/10024
Author: vargenau
Date: 2017-08-10 14:12:30 +0000 (Thu, 10 Aug 2017)
Log Message:
-----------
Remove commented code
Modified Paths:
--------------
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2017-07-11 13:47:03 UTC (rev 10023)
+++ trunk/lib/wikilens/PageListColumns.php 2017-08-10 14:12:30 UTC (rev 10024)
@@ -391,7 +391,6 @@
$html->pushContent(_("None"));
}
- //return $top3list;
return $html;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X