Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8039] trunk/lib/plugin
|
From: <var...@us...> - 2011-04-13 09:58:59
|
Revision: 8039
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8039&view=rev
Author: vargenau
Date: 2011-04-13 09:58:48 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Use braces
Modified Paths:
--------------
trunk/lib/plugin/FrameInclude.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/FrameInclude.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -73,15 +73,16 @@
}
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')) {
Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/RedirectTo.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -85,8 +85,9 @@
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) {
Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/SyncWiki.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -66,10 +66,12 @@
$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
Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminChmod.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -89,8 +89,9 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminChown.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -102,9 +102,11 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminMarkup.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -105,9 +105,11 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminPurge.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -88,9 +88,11 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminRemove.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -132,9 +132,11 @@
}
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']))
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminRename.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -136,10 +136,11 @@
}
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.
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -116,9 +116,10 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -136,11 +136,14 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -43,11 +43,14 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -91,9 +91,11 @@
}
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;
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminUtils.php 2011-04-13 09:58:48 UTC (rev 8039)
@@ -54,13 +54,15 @@
$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');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
