From 42b3cdeee00881410ba60bb0d892300f407ea372 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 26 Apr 2013 14:10:54 +0000 Subject: [PATCH] private git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8776 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/plugin/WikiAdminRename.php | 8 ++++---- lib/plugin/WikiAdminSearchReplace.php | 8 ++++---- lib/plugin/WikiPoll.php | 10 +++++----- lib/plugin/YouTube.php | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/plugin/WikiAdminRename.php b/lib/plugin/WikiAdminRename.php index 9bf712615..a662b3b47 100644 --- a/lib/plugin/WikiAdminRename.php +++ b/lib/plugin/WikiAdminRename.php @@ -55,7 +55,7 @@ class WikiPlugin_WikiAdminRename )); } - function renameHelper($name, $from, $to, $options = false) + private function renameHelper($name, $from, $to, $options = false) { if (isset($options['regex'])) { return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name); @@ -66,7 +66,7 @@ class WikiPlugin_WikiAdminRename } } - function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false, + private function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks = false, $createredirect = false) { $result = HTML::div(); @@ -259,7 +259,7 @@ class WikiPlugin_WikiAdminRename => WIKIAUTH_ADMIN)))); } - function checkBox(&$post_args, $name, $msg) + private function checkBox(&$post_args, $name, $msg) { $id = 'admin_rename-' . $name; $checkbox = HTML::input(array('type' => 'checkbox', @@ -271,7 +271,7 @@ class WikiPlugin_WikiAdminRename return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg)); } - function renameForm(&$header, $post_args, $singlepage) + private function renameForm(&$header, $post_args, $singlepage) { $table = HTML::table(); $this->tablePush($table, _("Rename") . " " . _("from") . _(": "), diff --git a/lib/plugin/WikiAdminSearchReplace.php b/lib/plugin/WikiAdminSearchReplace.php index ff64aa5ce..a06aeff66 100644 --- a/lib/plugin/WikiAdminSearchReplace.php +++ b/lib/plugin/WikiAdminSearchReplace.php @@ -53,7 +53,7 @@ class WikiPlugin_WikiAdminSearchReplace )); } - function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) + private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) { $page = $dbi->getPage($pagename); if ($page->exists()) { // don't replace default contents @@ -86,7 +86,7 @@ class WikiPlugin_WikiAdminSearchReplace return false; } - function searchReplacePages(&$dbi, &$request, $pages, $from, $to) + private function searchReplacePages(&$dbi, &$request, $pages, $from, $to) { if (empty($from)) return HTML::p(HTML::strong(fmt("Error: Empty search string."))); $result = HTML::div(); @@ -221,7 +221,7 @@ class WikiPlugin_WikiAdminSearchReplace : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN))); } - function checkBox(&$post_args, $name, $msg) + private function checkBox(&$post_args, $name, $msg) { $id = 'admin_replace-' . $name; $checkbox = HTML::input(array('type' => 'checkbox', @@ -233,7 +233,7 @@ class WikiPlugin_WikiAdminSearchReplace return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg)); } - function replaceForm(&$header, $post_args) + private function replaceForm(&$header, $post_args) { $header->pushContent(HTML::div(array('class' => 'hint'), _("Replace all occurences of the given string in the content of all pages.")), diff --git a/lib/plugin/WikiPoll.php b/lib/plugin/WikiPoll.php index 3f0481b7b..b734d3ac1 100644 --- a/lib/plugin/WikiPoll.php +++ b/lib/plugin/WikiPoll.php @@ -124,7 +124,7 @@ class WikiPlugin_WikiPoll return; } - function str2array($var, $obarray = false) + private function str2array($var, $obarray = false) { if (!$obarray) $obarray = $GLOBALS; $i = 0; @@ -235,7 +235,7 @@ class WikiPlugin_WikiPoll return $html; } - function bar($percent) + private function bar($percent) { global $WikiTheme; return HTML(HTML::img(array('src' => $WikiTheme->getImageUrl('leftbar'), @@ -248,7 +248,7 @@ class WikiPlugin_WikiPoll 'alt' => '>'))); } - function doPoll($page, $request, $answers, $readonly = false) + private function doPoll($page, $request, $answers, $readonly = false) { $question = $this->_args['question']; $answer = $this->_args['answer']; @@ -312,7 +312,7 @@ class WikiPlugin_WikiPoll } - function getResult($page, $i, $j) + private function getResult($page, $i, $j) { $poll = $page->get("poll"); @$count = $poll['data']['count'][$i][$j]; @@ -321,7 +321,7 @@ class WikiPlugin_WikiPoll return array($percent, $count, $all); } - function storeResult($page, $i, $j) + private function storeResult($page, $i, $j) { $poll = $page->get("poll"); if (!$poll) { diff --git a/lib/plugin/YouTube.php b/lib/plugin/YouTube.php index 04ccbcfdf..5891dfbce 100644 --- a/lib/plugin/YouTube.php +++ b/lib/plugin/YouTube.php @@ -190,7 +190,7 @@ class WikiPlugin_YouTube return $object; } - function Daily_pick() + private function Daily_pick() { if ($xml = url_get_contents("http://www.youtube.com/categories")) { if (preg_match('/
Pick of The Day<\/b><\/div>.*?/s', $xml, $m)) -- 2.42.0