From ce8a3eceaceeae81e20260b193a7340771ad1304 Mon Sep 17 00:00:00 2001 From: vargenau Date: Wed, 13 Apr 2011 09:58:48 +0000 Subject: [PATCH] Use braces git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8039 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/plugin/FrameInclude.php | 7 ++++--- lib/plugin/RedirectTo.php | 3 ++- lib/plugin/SyncWiki.php | 6 ++++-- lib/plugin/WikiAdminChmod.php | 3 ++- lib/plugin/WikiAdminChown.php | 6 ++++-- lib/plugin/WikiAdminMarkup.php | 6 ++++-- lib/plugin/WikiAdminPurge.php | 6 ++++-- lib/plugin/WikiAdminRemove.php | 6 ++++-- lib/plugin/WikiAdminRename.php | 5 +++-- lib/plugin/WikiAdminSearchReplace.php | 5 +++-- lib/plugin/WikiAdminSetAcl.php | 9 ++++++--- lib/plugin/WikiAdminSetAclSimple.php | 9 ++++++--- lib/plugin/WikiAdminSetExternal.php | 6 ++++-- lib/plugin/WikiAdminUtils.php | 6 ++++-- 14 files changed, 54 insertions(+), 29 deletions(-) diff --git a/lib/plugin/FrameInclude.php b/lib/plugin/FrameInclude.php index cab7c400f..78dba40f8 100644 --- a/lib/plugin/FrameInclude.php +++ b/lib/plugin/FrameInclude.php @@ -73,15 +73,16 @@ extends WikiPlugin } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; $args = ($this->getArgs($argstr, $request)); extract($args); - if ($request->getArg('action') != 'browse') + if ($request->getArg('action') != 'browse') { return $this->disabled("(action != 'browse')"); - if (! $request->isGetOrHead()) + } + if (! $request->isGetOrHead()) { return $this->disabled("(method != 'GET')"); + } if (!$src and $page) { if ($page == $request->get('pagename')) { diff --git a/lib/plugin/RedirectTo.php b/lib/plugin/RedirectTo.php index c30ab3270..634551809 100644 --- a/lib/plugin/RedirectTo.php +++ b/lib/plugin/RedirectTo.php @@ -85,8 +85,9 @@ extends WikiPlugin return $this->error(fmt("Recursive redirect to self: '%s'", $url)); } - if ($request->getArg('action') != 'browse') + if ($request->getArg('action') != 'browse') { return $this->disabled("(action != 'browse')"); + } $redirectfrom = $request->getArg('redirectfrom'); if ($redirectfrom !== false) { diff --git a/lib/plugin/SyncWiki.php b/lib/plugin/SyncWiki.php index 200d50f0c..4f5819f85 100644 --- a/lib/plugin/SyncWiki.php +++ b/lib/plugin/SyncWiki.php @@ -66,10 +66,12 @@ extends WikiPlugin_WikiAdminUtils $args = $this->getArgs($argstr, $request); $args['action'] = 'syncwiki'; extract($args); - if (empty($args['url'])) + if (empty($args['url'])) { return $this->error(fmt("A required argument '%s' is missing.", "url")); - if ($request->getArg('action') != 'browse') + } + if ($request->getArg('action') != 'browse') { return $this->disabled("(action != 'browse')"); + } $posted = $request->getArg('wikiadminutils'); if ($request->isPost() and $posted['action'] == $action diff --git a/lib/plugin/WikiAdminChmod.php b/lib/plugin/WikiAdminChmod.php index 65e5d8d12..69f740b46 100644 --- a/lib/plugin/WikiAdminChmod.php +++ b/lib/plugin/WikiAdminChmod.php @@ -89,8 +89,9 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if (!DEBUG) + if (!DEBUG) { return $this->disabled("WikiAdminChmod not yet enabled. Set DEBUG to try it."); + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminChown.php b/lib/plugin/WikiAdminChown.php index 56b6ac8fb..480415ef2 100644 --- a/lib/plugin/WikiAdminChown.php +++ b/lib/plugin/WikiAdminChown.php @@ -102,9 +102,11 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if (!$request->getArg('action') == _("PhpWikiAdministration/Chown")) + if ($request->getArg('action') != 'browse') { + if (!$request->getArg('action') == _("PhpWikiAdministration/Chown")) { return $this->disabled("(action != 'browse')"); + } + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminMarkup.php b/lib/plugin/WikiAdminMarkup.php index 1c3ec9884..4c5aabc3a 100644 --- a/lib/plugin/WikiAdminMarkup.php +++ b/lib/plugin/WikiAdminMarkup.php @@ -105,9 +105,11 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if (!$request->getArg('action') == _("PhpWikiAdministration/Markup")) + if ($request->getArg('action') != 'browse') { + if (!$request->getArg('action') == _("PhpWikiAdministration/Markup")) { return $this->disabled("(action != 'browse')"); + } + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminPurge.php b/lib/plugin/WikiAdminPurge.php index f1775a5a8..d141a441d 100644 --- a/lib/plugin/WikiAdminPurge.php +++ b/lib/plugin/WikiAdminPurge.php @@ -88,9 +88,11 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if ($request->getArg('action') != _("PhpWikiAdministration/Purge")) + if ($request->getArg('action') != 'browse') { + if ($request->getArg('action') != _("PhpWikiAdministration/Purge")) { return $this->disabled("(action != 'browse')"); + } + } $args = $this->getArgs($argstr, $request); $this->_args =& $args; diff --git a/lib/plugin/WikiAdminRemove.php b/lib/plugin/WikiAdminRemove.php index 5127a7234..beb6c4424 100644 --- a/lib/plugin/WikiAdminRemove.php +++ b/lib/plugin/WikiAdminRemove.php @@ -132,9 +132,11 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if ($request->getArg('action') != _("PhpWikiAdministration/Remove")) + if ($request->getArg('action') != 'browse') { + if ($request->getArg('action') != _("PhpWikiAdministration/Remove")) { return $this->disabled("(action != 'browse')"); + } + } $args = $this->getArgs($argstr, $request); if (!is_numeric($args['min_age'])) diff --git a/lib/plugin/WikiAdminRename.php b/lib/plugin/WikiAdminRename.php index 2cc88768b..42dc80769 100644 --- a/lib/plugin/WikiAdminRename.php +++ b/lib/plugin/WikiAdminRename.php @@ -136,10 +136,11 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - $action = $request->getArg('action'); + $action = $request->getArg('action'); if ($action != 'browse' and $action != 'rename' - and $action != _("PhpWikiAdministration")."/"._("Rename")) + and $action != _("PhpWikiAdministration")."/"._("Rename")) { return $this->disabled("(action != 'browse')"); + } if ($action == 'rename') { // We rename a single page. diff --git a/lib/plugin/WikiAdminSearchReplace.php b/lib/plugin/WikiAdminSearchReplace.php index 82c1e2cf5..8706d6701 100644 --- a/lib/plugin/WikiAdminSearchReplace.php +++ b/lib/plugin/WikiAdminSearchReplace.php @@ -116,9 +116,10 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - // no action=replace support yet - if ($request->getArg('action') != 'browse') + // no action=replace support yet + if ($request->getArg('action') != 'browse') { return $this->disabled("(action != 'browse')"); + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminSetAcl.php b/lib/plugin/WikiAdminSetAcl.php index 09cffe663..3e6a12174 100644 --- a/lib/plugin/WikiAdminSetAcl.php +++ b/lib/plugin/WikiAdminSetAcl.php @@ -136,11 +136,14 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl")) + if ($request->getArg('action') != 'browse') { + if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl")) { return $this->disabled("(action != 'browse')"); - if (!ENABLE_PAGEPERM) + } + } + if (!ENABLE_PAGEPERM) { return $this->disabled("ENABLE_PAGEPERM = false"); + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminSetAclSimple.php b/lib/plugin/WikiAdminSetAclSimple.php index f3132d4ba..c6c5297f4 100644 --- a/lib/plugin/WikiAdminSetAclSimple.php +++ b/lib/plugin/WikiAdminSetAclSimple.php @@ -43,11 +43,14 @@ extends WikiPlugin_WikiAdminSetAcl } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple")) + if ($request->getArg('action') != 'browse') { + if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple")) { return $this->disabled("(action != 'browse')"); - if (!ENABLE_PAGEPERM) + } + } + if (!ENABLE_PAGEPERM) { return $this->disabled("ENABLE_PAGEPERM = false"); + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminSetExternal.php b/lib/plugin/WikiAdminSetExternal.php index 4fa2b1cee..0e11c5fa1 100644 --- a/lib/plugin/WikiAdminSetExternal.php +++ b/lib/plugin/WikiAdminSetExternal.php @@ -91,9 +91,11 @@ extends WikiPlugin_WikiAdminSelect } function run($dbi, $argstr, &$request, $basepage) { - if ($request->getArg('action') != 'browse') - if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal")) + if ($request->getArg('action') != 'browse') { + if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal")) { return $this->disabled("(action != 'browse')"); + } + } $args = $this->getArgs($argstr, $request); $this->_args = $args; diff --git a/lib/plugin/WikiAdminUtils.php b/lib/plugin/WikiAdminUtils.php index 7f496a58c..ebe4fa9d5 100644 --- a/lib/plugin/WikiAdminUtils.php +++ b/lib/plugin/WikiAdminUtils.php @@ -54,13 +54,15 @@ extends WikiPlugin $args['action'] = strtolower($args['action']); extract($args); - if (!$action) + if (!$action) { $this->error("No action specified"); + } if (!($default_label = $this->_getLabel($action))) { return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action)); } - if ($request->getArg('action') != 'browse') + if ($request->getArg('action') != 'browse') { return $this->disabled("(action != 'browse')"); + } $posted = $request->getArg('wikiadminutils'); -- 2.45.0