From 875de469c298b53eca395b17eea95465a58170df Mon Sep 17 00:00:00 2001 From: vargenau Date: Wed, 20 Mar 2013 21:10:08 +0000 Subject: [PATCH] Remove unused variables git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8735 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/editpage.php | 1 - lib/plugin/CreatePage.php | 1 - lib/plugin/Diff.php | 1 - lib/plugin/HtmlConverter.php | 3 --- lib/plugin/PreferenceApp.php | 1 - lib/plugin/RecentChanges.php | 1 - lib/plugin/SemanticSearch.php | 4 ---- lib/plugin/SemanticSearchAdvanced.php | 3 --- lib/plugin/SiteMap.php | 1 - lib/plugin/SyncWiki.php | 1 - lib/plugin/UserPreferences.php | 1 - lib/plugin/VisualWiki.php | 5 ----- lib/plugin/WikiAdminDeleteAcl.php | 1 - lib/plugin/WikiAdminSelect.php | 5 ----- lib/plugin/WikiAdminSetExternal.php | 1 - lib/plugin/WikiFormRich.php | 1 - 16 files changed, 31 deletions(-) diff --git a/lib/editpage.php b/lib/editpage.php index 29d9b440f..29a61cc91 100644 --- a/lib/editpage.php +++ b/lib/editpage.php @@ -69,7 +69,6 @@ class PageEditor function editPage() { - global $WikiTheme; $saveFailed = false; $tokens = &$this->tokens; $tokens['PAGE_LOCKED_MESSAGE'] = ''; diff --git a/lib/plugin/CreatePage.php b/lib/plugin/CreatePage.php index 889d7e0b4..5c1676d88 100644 --- a/lib/plugin/CreatePage.php +++ b/lib/plugin/CreatePage.php @@ -78,7 +78,6 @@ class WikiPlugin_CreatePage $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."); diff --git a/lib/plugin/Diff.php b/lib/plugin/Diff.php index 9f008f275..64f00a4aa 100644 --- a/lib/plugin/Diff.php +++ b/lib/plugin/Diff.php @@ -128,7 +128,6 @@ class WikiPlugin_Diff $others = array('major', 'minor'); break; case 'minor': - $previous = 'minor'; $old = $page->getRevisionBefore($new); $old_version = _("previous revision"); $others = array('major', 'author'); diff --git a/lib/plugin/HtmlConverter.php b/lib/plugin/HtmlConverter.php index ff791fdfa..450213f81 100644 --- a/lib/plugin/HtmlConverter.php +++ b/lib/plugin/HtmlConverter.php @@ -138,9 +138,6 @@ class WikiPlugin_HtmlConverter extends WikiPlugin $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); diff --git a/lib/plugin/PreferenceApp.php b/lib/plugin/PreferenceApp.php index ccc741ec5..87348f22a 100644 --- a/lib/plugin/PreferenceApp.php +++ b/lib/plugin/PreferenceApp.php @@ -93,7 +93,6 @@ class WikiPlugin_PreferenceApp $NEUTRAL_RATING = (int)$neutralRating; $active_user = $request->getUser(); - $active_userid = $active_user->_userid; $html = HTML(); $html->pushContent(""); diff --git a/lib/plugin/RecentChanges.php b/lib/plugin/RecentChanges.php index 2c3502e5f..1aae37ea5 100644 --- a/lib/plugin/RecentChanges.php +++ b/lib/plugin/RecentChanges.php @@ -620,7 +620,6 @@ class _RecentChanges_UserContribsFormatter function format_revision($rev) { - $args = &$this->_args; $class = 'rc-' . $this->importance($rev); $time = $this->time($rev); if (!$rev->get('is_minor_edit')) diff --git a/lib/plugin/SemanticSearch.php b/lib/plugin/SemanticSearch.php index 61c581c19..9a9109a78 100644 --- a/lib/plugin/SemanticSearch.php +++ b/lib/plugin/SemanticSearch.php @@ -446,8 +446,6 @@ class _PageList_Column_SemanticSearch_relation 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 @@ class _PageList_Column_SemanticSearch_link { 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'); diff --git a/lib/plugin/SemanticSearchAdvanced.php b/lib/plugin/SemanticSearchAdvanced.php index 2ce0f7d52..14b4bb8d2 100644 --- a/lib/plugin/SemanticSearchAdvanced.php +++ b/lib/plugin/SemanticSearchAdvanced.php @@ -85,7 +85,6 @@ class WikiPlugin_SemanticSearchAdvanced function showForm(&$dbi, &$request, $args, $allrelations) { - global $WikiTheme; $action = $request->getPostURL(); $hiddenfield = HiddenInputs($request->getArgs(), '', array('action', 'page', 's')); @@ -132,8 +131,6 @@ class WikiPlugin_SemanticSearchAdvanced function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; - $this->_supported_operators = array(':=', '<', '<=', '>', '>=', '!=', '==', '=~'); $args = $this->getArgs($argstr, $request); $posted = $request->getArg('semsearch'); diff --git a/lib/plugin/SiteMap.php b/lib/plugin/SiteMap.php index 3ee0565c1..ca0673779 100644 --- a/lib/plugin/SiteMap.php +++ b/lib/plugin/SiteMap.php @@ -167,7 +167,6 @@ class WikiPlugin_SiteMap $limit = '***'; } //Fixme: override given arg - $description = $this->getDescription(); if (!$noheader) { $out = $this->getDescription() . " " . sprintf(_("(max. recursion level: %d)"), $reclimit) . ":\n\n"; diff --git a/lib/plugin/SyncWiki.php b/lib/plugin/SyncWiki.php index 293dcc1cd..82cc8ed7f 100644 --- a/lib/plugin/SyncWiki.php +++ b/lib/plugin/SyncWiki.php @@ -94,7 +94,6 @@ class WikiPlugin_SyncWiki 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)) { diff --git a/lib/plugin/UserPreferences.php b/lib/plugin/UserPreferences.php index 1eefec59e..478c83a49 100644 --- a/lib/plugin/UserPreferences.php +++ b/lib/plugin/UserPreferences.php @@ -48,7 +48,6 @@ class WikiPlugin_UserPreferences function getDefaultArguments() { global $request; - $pagename = $request->getArg('pagename'); $user = $request->getUser(); if (isset($user->_prefs) and isset($user->_prefs->_prefs) and diff --git a/lib/plugin/VisualWiki.php b/lib/plugin/VisualWiki.php index a9468da4c..f84a8d1b3 100644 --- a/lib/plugin/VisualWiki.php +++ b/lib/plugin/VisualWiki.php @@ -367,8 +367,6 @@ class WikiPlugin_VisualWiki 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 @@ class WikiPlugin_VisualWiki 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 @@ class WikiPlugin_VisualWiki $fillstring = ($fillnodes == 'on') ? 'style=filled,' : ''; - $ok = true; $names = &$this->names; $pages = &$this->pages; if ($names) diff --git a/lib/plugin/WikiAdminDeleteAcl.php b/lib/plugin/WikiAdminDeleteAcl.php index 95cf39c61..ccf6d40f4 100644 --- a/lib/plugin/WikiAdminDeleteAcl.php +++ b/lib/plugin/WikiAdminDeleteAcl.php @@ -55,7 +55,6 @@ class WikiPlugin_WikiAdminDeleteAcl 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))); diff --git a/lib/plugin/WikiAdminSelect.php b/lib/plugin/WikiAdminSelect.php index 8abb3ad68..234e2933f 100644 --- a/lib/plugin/WikiAdminSelect.php +++ b/lib/plugin/WikiAdminSelect.php @@ -125,11 +125,6 @@ class WikiPlugin_WikiAdminSelect $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; diff --git a/lib/plugin/WikiAdminSetExternal.php b/lib/plugin/WikiAdminSetExternal.php index 9cf605981..8d67c9118 100644 --- a/lib/plugin/WikiAdminSetExternal.php +++ b/lib/plugin/WikiAdminSetExternal.php @@ -70,7 +70,6 @@ class WikiPlugin_WikiAdminSetExternal $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++; diff --git a/lib/plugin/WikiFormRich.php b/lib/plugin/WikiFormRich.php index f7c3fa8e5..216478487 100644 --- a/lib/plugin/WikiFormRich.php +++ b/lib/plugin/WikiFormRich.php @@ -127,7 +127,6 @@ class WikiPlugin_WikiFormRich // 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)) { -- 2.45.0