Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9080] trunk/lib/plugin
|
From: <var...@us...> - 2014-09-16 08:14:37
|
Revision: 9080
http://sourceforge.net/p/phpwiki/code/9080
Author: vargenau
Date: 2014-09-16 08:14:33 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
Add private, remove commented code
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminDeleteAcl.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
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminChown.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -41,7 +41,7 @@
{
return array_merge
(
- WikiPlugin_WikiAdminSelect::getDefaultArguments(),
+ parent::getDefaultArguments(),
array(
'user' => false,
/* Columns to include in listing */
@@ -49,7 +49,7 @@
));
}
- function chownPages(&$dbi, &$request, $pages, $newowner)
+ private function chownPages(&$dbi, &$request, $pages, $newowner)
{
$result = HTML::div();
$ul = HTML::ul();
@@ -92,19 +92,18 @@
} else {
$result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
- $result->pushContent($ul);
- return $result;
} else {
$result->setAttr('class', 'error');
$result->pushContent(HTML::p(_("No pages changed.")));
- return $result;
}
+ $result->pushContent($ul);
+ return $result;
}
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if (!$request->getArg('action') == __("PhpWikiAdministration")."/".__("Chown")) {
+ if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("Chown")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
@@ -113,10 +112,6 @@
$this->_args = $args;
if (empty($args['user']))
$args['user'] = $request->_user->UserName();
- /*if (!empty($args['exclude']))
- $exclude = explodePageList($args['exclude']);
- else
- $exclude = false;*/
$this->preSelectS($args, $request);
$p = $request->getArg('p');
@@ -136,7 +131,6 @@
$request->_notAuthorized(WIKIAUTH_ADMIN);
$this->disabled("! user->isAdmin");
}
- // DONE: error message if not allowed.
if ($post_args['action'] == 'verify') {
// Real action
return $this->chownPages($dbi, $request, array_keys($p),
@@ -152,35 +146,29 @@
}
if ($next_action == 'select' and empty($pages)) {
// List all pages to select from.
- $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'],
- $args['exclude']);
+ $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
}
- /* // let the user decide which info
- if ($next_action == 'verify') {
- $args['info'] = "checkbox,pagename,owner,mtime";
- }
- */
- if ($next_action == 'select') {
- $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args);
- } else {
- $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $args);
- }
- $pagelist->addPageList($pages);
$header = HTML::fieldset();
if ($next_action == 'verify') {
+ $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $args);
+ $pagelist->addPageList($pages);
$button_label = _("Yes");
$header->pushContent(HTML::legend(_("Confirm ownership change")));
- $header->pushContent(
- HTML::p(HTML::strong(
+ $header->pushContent(HTML::p(HTML::strong(
_("Are you sure you want to change the owner of the selected pages?"))));
- $header = $this->chownForm($header, $post_args);
} else {
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args);
+ $pagelist->addPageList($pages);
$button_label = _("Change owner of selected pages.");
$header->pushContent(HTML::legend(_("Select the pages to change the owner")));
- $header = $this->chownForm($header, $post_args);
}
+ $header->pushContent(_("Change owner to: "));
+ $header->pushContent(HTML::input(array('name' => 'admin_chown[user]',
+ 'value' => $post_args['user'],
+ 'size' => 40)));
+
$buttons = HTML::p(Button('submit:admin_chown[chown]', $button_label, 'wikiadmin'),
Button('submit:admin_chown[cancel]', _("Cancel"), 'button'));
$header->pushContent($buttons);
@@ -197,15 +185,6 @@
? ''
: HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
}
-
- function chownForm(&$header, $post_args)
- {
- $header->pushContent(_("Change owner to: "));
- $header->pushContent(HTML::input(array('name' => 'admin_chown[user]',
- 'value' => $post_args['user'],
- 'size' => 40)));
- return $header;
- }
}
// Local Variables:
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -40,7 +40,7 @@
return _("Delete page permissions.");
}
- function deleteaclPages(&$request, $pages)
+ private function deleteaclPages(&$request, $pages)
{
$result = HTML::div();
$count = 0;
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminPurge.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -37,7 +37,7 @@
/* getDefaultArguments() is inherited from WikiAdminSelect class */
- function collectPages(&$list, &$dbi, $sortby, $limit = 0)
+ protected function collectPages(&$list, &$dbi, $sortby, $limit = 0)
{
$allPages = $dbi->getAllPages('include_empty', $sortby, $limit);
@@ -54,7 +54,7 @@
return $list;
}
- function purgePages(&$request, $pages)
+ private function purgePages(&$request, $pages)
{
$result = HTML::div();
$ul = HTML::ul();
@@ -78,13 +78,12 @@
} else {
$result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count)));
}
- $result->pushContent($ul);
- return $result;
} else {
$result->setAttr('class', 'error');
$result->pushContent(HTML::p(_("No pages purged.")));
- return $result;
}
+ $result->pushContent($ul);
+ return $result;
}
function run($dbi, $argstr, &$request, $basepage)
@@ -96,7 +95,7 @@
}
$args = $this->getArgs($argstr, $request);
- $this->_args =& $args;
+ $this->_args = $args;
$this->preSelectS($args, $request);
$p = $request->getArg('p');
@@ -108,8 +107,7 @@
if ($p && $request->isPost() &&
!empty($post_args['purge']) && empty($post_args['cancel'])
) {
-
- // check individual PagePermissions
+ // without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
$this->disabled("! user->isAdmin");
@@ -118,7 +116,6 @@
// Real purge.
return $this->purgePages($request, array_keys($p));
}
-
if ($post_args['action'] == 'select') {
$next_action = 'verify';
foreach ($p as $name => $c) {
@@ -141,12 +138,12 @@
$header = HTML::fieldset();
if ($next_action == 'verify') {
- $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], array());
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
$pagelist->addPageList($pages);
$button_label = _("Yes");
$header->pushContent(HTML::legend(_("Confirm purge")));
$header->pushContent(HTML::p(HTML::strong(
- _("Are you sure you want to permanently purge the following files?"))));
+ _("Are you sure you want to permanently purge the following files?"))));
} else {
$pagelist = new PageList_Selectable($args['info'], $args['exclude'], array());
$pagelist->addPageList($pages);
@@ -158,7 +155,6 @@
Button('submit:admin_purge[cancel]', _("Cancel"), 'button'));
$header->pushContent($buttons);
- // TODO: quick select by regex javascript?
return HTML::form(array('action' => $request->getPostURL(),
'method' => 'post'),
$header,
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminRemove.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -45,7 +45,7 @@
{
return array_merge
(
- WikiPlugin_WikiAdminSelect::getDefaultArguments(),
+ parent::getDefaultArguments(),
array(
/*
* Show only pages which have been 'deleted' this
@@ -68,7 +68,7 @@
));
}
- function collectPages(&$list, &$dbi, $sortby, $limit = 0)
+ protected function collectPages(&$list, &$dbi, $sortby, $limit = 0)
{
extract($this->_args);
@@ -98,7 +98,7 @@
return $list;
}
- function removePages(&$request, $pages)
+ private function removePages(&$request, $pages)
{
$result = HTML::div();
$ul = HTML::ul();
@@ -122,13 +122,12 @@
} else {
$result->pushContent(HTML::p(fmt("%d pages have been removed:", $count)));
}
- $result->pushContent($ul);
- return $result;
} else {
$result->setAttr('class', 'error');
$result->pushContent(HTML::p(_("No pages removed.")));
- return $result;
}
+ $result->pushContent($ul);
+ return $result;
}
function run($dbi, $argstr, &$request, $basepage)
@@ -191,7 +190,7 @@
$header = HTML::fieldset();
if ($next_action == 'verify') {
- $pagelist = new PageList_Unselectable($args['info'], $args['exclude'],
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'],
array('types' =>
array('remove'
=> new _PageList_Column_remove('remove', _("Remove")))));
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminRename.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -41,7 +41,7 @@
{
return array_merge
(
- WikiPlugin_WikiAdminSelect::getDefaultArguments(),
+ parent::getDefaultArguments(),
array(
/* Columns to include in listing */
'info' => 'pagename,mtime',
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -41,7 +41,7 @@
{
return array_merge
(
- WikiPlugin_WikiAdminSelect::getDefaultArguments(),
+ parent::getDefaultArguments(),
array(
/* Columns to include in listing */
'info' => 'some',
@@ -117,7 +117,7 @@
$header->pushContent(HTML::legend(_("Select the pages to search and replace")));
if ($next_action == 'verify') {
$args['info'] = "pagename,mtime,author";
- $pagelist = new PageList_Unselectable($args['info'], $args['exclude'], $columns);
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);
$pagelist->addPageList($pages);
$button_label = _("Replace");
$header->pushContent(
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -46,7 +46,7 @@
{
return array_merge
(
- WikiPlugin_WikiAdminSelect::getDefaultArguments(),
+ parent::getDefaultArguments(),
array(
'p' => "[]", // list of pages
/* Columns to include in listing */
@@ -54,7 +54,7 @@
));
}
- function setaclPages(&$request, $pages, $acl)
+ protected function setaclPages(&$request, $pages, $acl)
{
$result = HTML::div();
$count = 0;
@@ -185,7 +185,7 @@
}
if ($next_action == 'verify') {
- $pagelist = new PageList_Unselectable($args['info'],
+ $pagelist = new PageList_Selectable($args['info'],
$args['exclude'],
array('types' => array(
'perm'
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -115,7 +115,7 @@
* _OWNER: remove purge dump change;
*/
- function liberalPerms()
+ private function liberalPerms()
{
$perm = array('view' => array(ACL_EVERY => true),
@@ -141,7 +141,7 @@
* _EVERY: -view -edit -list -create;
*/
- function restrictedPerms()
+ private function restrictedPerms()
{
$perm = array('view' => array(ACL_AUTHENTICATED => true,
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2014-09-16 08:10:25 UTC (rev 9079)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2014-09-16 08:14:33 UTC (rev 9080)
@@ -40,7 +40,7 @@
{
return array_merge
(
- WikiPlugin_WikiAdminSelect::getDefaultArguments(),
+ parent::getDefaultArguments(),
array(
'external' => 1,
/* Columns to include in listing */
@@ -48,7 +48,7 @@
));
}
- function setExternalPages(&$dbi, &$request, $pages)
+ private function setExternalPages(&$dbi, &$request, $pages)
{
$result = HTML::div();
$ul = HTML::ul();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
