Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8735] trunk/lib
|
From: <var...@us...> - 2013-03-20 21:10:11
|
Revision: 8735
http://sourceforge.net/p/phpwiki/code/8735
Author: vargenau
Date: 2013-03-20 21:10:08 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Remove unused variables
Modified Paths:
--------------
trunk/lib/editpage.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiFormRich.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/editpage.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -69,7 +69,6 @@
function editPage()
{
- global $WikiTheme;
$saveFailed = false;
$tokens = &$this->tokens;
$tokens['PAGE_LOCKED_MESSAGE'] = '';
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/CreatePage.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -78,7 +78,6 @@
$msg = _("Do you really want to create the page “%s”?");
}
if (isSubPage($s)) {
- $main = subPageSlice(0);
if (!$dbi->isWikiPage(subPageSlice(0))) {
$msg .= "\n" . _("The new page you want to create will be a subpage.")
. "\n" . _("Subpages cannot be created unless the parent page exists.");
Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/Diff.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -128,7 +128,6 @@
$others = array('major', 'minor');
break;
case 'minor':
- $previous = 'minor';
$old = $page->getRevisionBefore($new);
$old_version = _("previous revision");
$others = array('major', 'author');
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/HtmlConverter.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -138,9 +138,6 @@
$file = file_get_contents($file_name);
$file = html_entity_decode($file);
- $ascii = '[\x00-\x7F]';
- $euc = '[\xA1-\xFE][\xA1-\xFE]';
-
$this->_processA($file);
$this->_processIMG($file);
$this->_processUL($file);
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/PreferenceApp.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -93,7 +93,6 @@
$NEUTRAL_RATING = (int)$neutralRating;
$active_user = $request->getUser();
- $active_userid = $active_user->_userid;
$html = HTML();
$html->pushContent("");
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/RecentChanges.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -620,7 +620,6 @@
function format_revision($rev)
{
- $args = &$this->_args;
$class = 'rc-' . $this->importance($rev);
$time = $this->time($rev);
if (!$rev->get('is_minor_edit'))
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/SemanticSearch.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -446,8 +446,6 @@
function _getValue(&$page, $revision_handle)
{
- if (is_object($page)) $text = $page->getName();
- else $text = $page;
$link = $this->_pagelist->_links[$this->current_row];
return WikiLink($link['linkname'], 'if_known');
}
@@ -458,8 +456,6 @@
{
function _getValue(&$page, $revision_handle)
{
- if (is_object($page)) $text = $page->getName();
- else $text = $page;
$link = $this->_pagelist->_links[$this->current_row];
if ($this->_field != 'value')
return WikiLink($link['linkvalue'], 'if_known');
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -85,7 +85,6 @@
function showForm(&$dbi, &$request, $args, $allrelations)
{
- global $WikiTheme;
$action = $request->getPostURL();
$hiddenfield = HiddenInputs($request->getArgs(), '',
array('action', 'page', 's'));
@@ -132,8 +131,6 @@
function run($dbi, $argstr, &$request, $basepage)
{
- global $WikiTheme;
-
$this->_supported_operators = array(':=', '<', '<=', '>', '>=', '!=', '==', '=~');
$args = $this->getArgs($argstr, $request);
$posted = $request->getArg('semsearch');
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/SiteMap.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -167,7 +167,6 @@
$limit = '***';
}
//Fixme: override given arg
- $description = $this->getDescription();
if (!$noheader) {
$out = $this->getDescription() . " " . sprintf(_("(max. recursion level: %d)"),
$reclimit) . ":\n\n";
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/SyncWiki.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -94,7 +94,6 @@
if (!function_exists('wiki_xmlrpc_post')) {
include_once 'lib/XmlRpcClient.php';
}
- $userid = $request->_user->_userid;
$dbh = $request->getDbh();
$merge_point = $dbh->get('mergepoint');
if (empty($merge_point)) {
Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/UserPreferences.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -48,7 +48,6 @@
function getDefaultArguments()
{
global $request;
- $pagename = $request->getArg('pagename');
$user = $request->getUser();
if (isset($user->_prefs) and
isset($user->_prefs->_prefs) and
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/VisualWiki.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -367,8 +367,6 @@
unset($allpages);
$this->names = array_keys($pages);
- $countpages = count($pages);
-
// now select each page matching to given parameters
$all_selected = array_unique(array_merge(
$this->findbest($recent_nb, 'age', true),
@@ -388,8 +386,6 @@
unset($newpages);
unset($all_selected);
- $countpages = count($pages);
-
// remove dead links and collect links
reset($pages);
while (list($name, $page) = each($pages)) {
@@ -438,7 +434,6 @@
$fillstring = ($fillnodes == 'on') ? 'style=filled,' : '';
- $ok = true;
$names = &$this->names;
$pages = &$this->pages;
if ($names)
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -55,7 +55,6 @@
foreach ($pages as $pagename) {
// check if unchanged? we need a deep array_equal
$page = $dbi->getPage($pagename);
- $oldperm = getPagePermissions($page);
setPagePermissions($page, $perm);
$result->setAttr('class', 'feedback');
$result->pushContent(HTML::p(fmt("ACL deleted for page “%s”", $pagename)));
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/WikiAdminSelect.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -125,11 +125,6 @@
$info = $args['info'];
- // array_multisort($this->_list, SORT_NUMERIC, SORT_DESC);
- $pagename = $request->getArg('pagename');
- // GetUrlToSelf() with all given params
- //$uri = $GLOBALS['HTTP_SERVER_VARS']['REQUEST_URI']; // without s would be better.
- //$uri = $request->getURLtoSelf();//false, array('verify'));
$form = HTML::form(array('action' => $request->getPostURL(), 'method' => 'post'));
if ($request->getArg('WikiAdminSelect') == _("Go"))
$p = false;
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -70,7 +70,6 @@
$result->pushContent(HTML::p(fmt("Access denied to change page “%s”.",
WikiLink($name))));
} else {
- $version = $current->getVersion();
$page->set('external', (bool)1);
$ul->pushContent(HTML::li(fmt("change page “%s” to external.", WikiLink($name))));
$count++;
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2013-03-20 20:53:15 UTC (rev 8734)
+++ trunk/lib/plugin/WikiFormRich.php 2013-03-20 21:10:08 UTC (rev 8735)
@@ -127,7 +127,6 @@
// no editbox[] = array(...) allowed (space)
$arg_array = preg_split("/\n/", $argstr);
// for security we should check this better
- $arg = '';
for ($i = 0; $i < count($arg_array); $i++) {
//TODO: we require an name=value pair here, but submit may go without also.
if (preg_match("/^\s*(" . join("|", $allowed) . ")\[\](.*)$/", $arg_array[$i], $m)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
