Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9587] trunk/lib
|
From: <var...@us...> - 2015-03-03 15:25:33
|
Revision: 9587
http://sourceforge.net/p/phpwiki/code/9587
Author: vargenau
Date: 2015-03-03 15:25:24 +0000 (Tue, 03 Mar 2015)
Log Message:
-----------
Align prototype for functions _getValue, _getSortableValue, format
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiTranslation.php
trunk/lib/wikilens/PageListColumns.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/PageList.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -62,7 +62,7 @@
}
}
- function format($pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, $revision_handle)
{
return HTML::td($this->_tdattr,
$this->_getValue($page_handle, $revision_handle));
@@ -197,7 +197,7 @@
* @param WikiDB_PageRevision $revision_handle
* @return mixed
*/
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
if ($this->_need_rev) {
if (!$revision_handle)
@@ -214,7 +214,7 @@
* @param WikiDB_PageRevision $revision_handle
* @return int|string
*/
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
$val = $this->_getValue($page_handle, $revision_handle);
if ($this->_field == 'hits')
@@ -241,13 +241,13 @@
class _PageList_Column_size extends _PageList_Column
{
- function format($pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, $revision_handle)
{
return HTML::td($this->_tdattr,
$this->_getValuePageList($pagelist, $page_handle, $revision_handle));
}
- function _getValuePageList($pagelist, $page_handle, &$revision_handle)
+ function _getValuePageList($pagelist, $page_handle, $revision_handle)
{
if (!$revision_handle or (!$revision_handle->_data['%content']
or $revision_handle->_data['%content'] === true)
@@ -262,7 +262,7 @@
return $size;
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
if (!$revision_handle)
$revision_handle = $page_handle->getCurrentRevision(true);
@@ -286,7 +286,7 @@
$this->_textIfFalse = new RawXml('—'); //mdash
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
//FIXME: check if $this is available in the parent (->need_rev)
$val = parent::_getValue($page_handle, $revision_handle);
@@ -308,7 +308,7 @@
parent::__construct($field, $heading, 'center');
}
- function _getValuePageList($pagelist, $page_handle, &$revision_handle)
+ function _getValuePageList($pagelist, $page_handle, $revision_handle)
{
$pagename = $page_handle->getName();
$selected = !empty($pagelist->_selected[$pagename]);
@@ -327,7 +327,7 @@
}
}
- function format($pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, $revision_handle)
{
return HTML::td($this->_tdattr,
$this->_getValuePageList($pagelist, $page_handle, $revision_handle));
@@ -350,13 +350,13 @@
$this->WikiTheme = &$WikiTheme;
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$time = parent::_getValue($page_handle, $revision_handle);
return $this->WikiTheme->formatDateTime($time);
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -364,7 +364,7 @@
class _PageList_Column_version extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
if (!$revision_handle)
$revision_handle = $page_handle->getCurrentRevision();
@@ -396,7 +396,7 @@
}
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
if (!$revision_handle or (!$revision_handle->_data['%content']
or $revision_handle->_data['%content'] === true)
@@ -465,7 +465,7 @@
true));
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
if (is_object($page_handle) and !empty($page_handle->score))
return $page_handle->score;
@@ -488,7 +488,7 @@
$this->dbi =& $request->getDbh();
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$author = parent::_getValue($page_handle, $revision_handle);
if ($this->dbi->isWikiPage($author))
@@ -497,7 +497,7 @@
return $author;
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -505,7 +505,7 @@
class _PageList_Column_owner extends _PageList_Column_author
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$author = $page_handle->getOwner();
if ($this->dbi->isWikiPage($author))
@@ -514,7 +514,7 @@
return $author;
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -522,7 +522,7 @@
class _PageList_Column_creator extends _PageList_Column_author
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$author = $page_handle->getCreator();
if ($this->dbi->isWikiPage($author))
@@ -531,7 +531,7 @@
return $author;
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return parent::_getValue($page_handle, $revision_handle);
}
@@ -548,7 +548,7 @@
$this->dbi = &$request->getDbh();
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
if ($this->dbi->isWikiPage($page_handle->getName()))
return WikiLink($page_handle, 'known');
@@ -556,7 +556,7 @@
return WikiLink($page_handle, 'unknown');
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return $page_handle->getName();
}
@@ -572,7 +572,7 @@
class _PageList_Column_perm extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$perm_array = pagePermissions($page_handle->_pagename);
return pagePermissionsSimpleFormat($perm_array,
@@ -583,7 +583,7 @@
class _PageList_Column_acl extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$perm_tree = pagePermissions($page_handle->_pagename);
@@ -875,7 +875,7 @@
* Take a PageList_Page object, and return an HTML object to display
* it in a table or list row.
*/
- private function renderPageRow(&$page_handle, $i = 0)
+ private function renderPageRow($page_handle, $i = 0)
{
$page_handle = $this->getPageFromHandle($page_handle);
//FIXME. only on sf.net
Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/BackLinks.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -192,7 +192,7 @@
// how many links from this backLink to other pages
class _PageList_Column_BackLinks_count extends _PageList_Column
{
- function _getValue($page, &$revision_handle)
+ function _getValue($page, $revision_handle)
{
$iter = $page->getPageLinks();
$count = $iter->count();
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/FullTextSearch.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -171,7 +171,7 @@
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- function _getValue(&$page, $revision_handle)
+ function _getValue($page, $revision_handle)
{
$pagename = $page->getName();
$count = count($this->parentobj->_wpagelist[$pagename]);
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/LinkDatabase.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -213,7 +213,7 @@
class _PageList_Column_LinkDatabase_links extends _PageList_Column
{
- function _getValue($page, &$revision_handle)
+ function _getValue($page, $revision_handle)
{
$out = HTML();
$links = $page->getPageLinks();
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/LinkSearch.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -179,7 +179,7 @@
$this->_pagelist =& $pagelist;
}
- function _getValue(&$page, $revision_handle)
+ function _getValue($page, $revision_handle)
{
if (is_object($page)) $text = $page->getName();
else $text = $page;
Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/ListPages.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -143,7 +143,7 @@
return $this->_PageList_Column($field, $display, 'center');
}
- function _getValue($page, &$revision_handle)
+ function _getValue($page, $revision_handle)
{
$iter = $page->getLinks($this->_direction);
$count = $iter->count();
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/ListSubpages.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -125,7 +125,7 @@
// how many backlinks for this subpage
class _PageList_Column_ListSubpages_count extends _PageList_Column
{
- function _getValue($page, &$revision_handle)
+ function _getValue($page, $revision_handle)
{
$iter = $page->getBackLinks();
$count = $iter->count();
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/SemanticSearch.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -445,7 +445,7 @@
$this->_pagelist =& $pagelist;
}
- function _getValue(&$page, $revision_handle)
+ function _getValue($page, $revision_handle)
{
$link = $this->_pagelist->_links[$this->current_row];
return WikiLink($link['linkname'], 'if_known');
@@ -455,7 +455,7 @@
class _PageList_Column_SemanticSearch_link
extends _PageList_Column_SemanticSearch_relation
{
- function _getValue(&$page, $revision_handle)
+ function _getValue($page, $revision_handle)
{
$link = $this->_pagelist->_links[$this->current_row];
if ($this->_field != 'value')
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/WantedPages.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -164,7 +164,7 @@
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- function _getValue(&$page, $revision_handle)
+ function _getValue($page, $revision_handle)
{
$html = false;
$pagename = $page->getName();
@@ -189,7 +189,7 @@
$this->_PageList_Column($params[0], $params[1], $params[2]);
}
- function _getValue(&$page, $revision_handle)
+ function _getValue($page, $revision_handle)
{
$pagename = $page->getName();
$count = count($this->parentobj->_wpagelist[$pagename]);
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/WikiAdminRemove.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -247,7 +247,7 @@
class _PageList_Column_remove extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
return Button(array('action' => 'remove'), _("Remove"),
$page_handle->getName());
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/WikiAdminRename.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -312,7 +312,7 @@
// moved from lib/PageList.php
class _PageList_Column_renamed_pagename extends _PageList_Column
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
global $request;
$post_args = $request->getArg('admin_rename');
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/WikiAdminUtils.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -312,7 +312,7 @@
class _PageList_Column_email
extends _PageList_Column
{
- function _getValue(&$prefs, $dummy)
+ function _getValue($prefs, $dummy)
{
return $prefs->get('email');
}
@@ -321,7 +321,7 @@
class _PageList_Column_emailVerified
extends _PageList_Column
{
- function _getValue(&$prefs, $status)
+ function _getValue($prefs, $status)
{
$name = $prefs->get('userid');
$input = HTML::input(array('type' => 'checkbox',
Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/plugin/WikiTranslation.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -516,7 +516,7 @@
$this->_PageList_Column_base($this->_field);
}
- function _getValue($page, &$revision_handle)
+ function _getValue($page, $revision_handle)
{
if (is_object($page)) $text = $page->getName();
else $text = $page;
Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php 2015-03-02 17:27:12 UTC (rev 9586)
+++ trunk/lib/wikilens/PageListColumns.php 2015-03-03 15:25:24 UTC (rev 9587)
@@ -43,13 +43,13 @@
*/
class _PageList_Column_numbacklinks extends _PageList_Column_custom
{
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$theIter = $page_handle->getBackLinks();
return $theIter->count();
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return $this->_getValue($page_handle, $revision_handle);
}
@@ -64,7 +64,7 @@
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
global $request;
@@ -97,7 +97,7 @@
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
global $request, $WikiTheme;
@@ -121,7 +121,7 @@
$this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
global $request, $WikiTheme;
@@ -164,7 +164,7 @@
if (!$this->_dimension) $this->_dimension = 0;
}
- function format($pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, $revision_handle)
{
/**
* @var WikiRequest $request
@@ -188,7 +188,7 @@
return $td;
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$pagename = $page_handle->getName();
@@ -215,7 +215,7 @@
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return $this->_getValue($page_handle, $revision_handle);
}
@@ -235,7 +235,7 @@
if (!$this->_dimension) $this->_dimension = 0;
}
- function format($pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, $revision_handle)
{
$plugin = new WikiPlugin_RateIt();
if (defined('FUSIONFORGE') && FUSIONFORGE) {
@@ -250,7 +250,7 @@
return $td;
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
global $request;
@@ -268,7 +268,7 @@
}
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return $this->_getValue($page_handle, $revision_handle);
}
@@ -294,7 +294,7 @@
$this->_users = $this->_pagelist->getOption('users');
}
- function format($pagelist, $page_handle, &$revision_handle)
+ function format($pagelist, $page_handle, $revision_handle)
{
$pred = $this->_getValue($page_handle, $revision_handle);
$mean = $this->_active_ratings_user->mean_rating($this->_dimension);
@@ -310,7 +310,7 @@
return $td;
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$pagename = $page_handle->getName();
@@ -318,7 +318,7 @@
return sprintf("%.1f", min(5, max(0, $pred)));
}
- function _getSortableValue($page_handle, &$revision_handle)
+ function _getSortableValue($page_handle, $revision_handle)
{
return $this->_getValue($page_handle, $revision_handle);
}
@@ -352,7 +352,7 @@
}
}
- function _getValue($page_handle, &$revision_handle)
+ function _getValue($page_handle, $revision_handle)
{
$ratings = $this->_active_ratings_user->get_ratings();
$iter = $page_handle->getLinks();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
