From: <var...@us...> - 2009-03-05 08:51:17
|
Revision: 6631 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6631&view=rev Author: vargenau Date: 2009-03-05 08:51:02 +0000 (Thu, 05 Mar 2009) Log Message: ----------- Error banner when bad action Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2009-03-04 18:19:01 UTC (rev 6630) +++ trunk/lib/plugin/WikiAdminUtils.php 2009-03-05 08:51:02 UTC (rev 6631) @@ -2,6 +2,7 @@ rcs_id('$Id$'); /** Copyright 2003,2004,2006 $ThePhpWikiProgrammingTeam + Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent This file is part of PhpWiki. @@ -60,8 +61,9 @@ if (!$action) $this->error("No action specified"); - if (!($default_label = $this->_getLabel($action))) - $this->error("Bad action"); + if (!($default_label = $this->_getLabel($action))) { + return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action)); + } if ($request->getArg('action') != 'browse') return $this->disabled("(action != 'browse')"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-06-11 16:01:48
|
Revision: 8886 http://sourceforge.net/p/phpwiki/code/8886 Author: vargenau Date: 2014-06-11 16:01:40 +0000 (Wed, 11 Jun 2014) Log Message: ----------- private function _makeButton --> protected function _makeButton Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2014-06-10 16:43:50 UTC (rev 8885) +++ trunk/lib/plugin/WikiAdminUtils.php 2014-06-11 16:01:40 UTC (rev 8886) @@ -78,7 +78,7 @@ return $this->_makeButton($request, $args, $label); } - private function _makeButton(&$request, $args, $label) + protected function _makeButton(&$request, $args, $label) { $args['return_url'] = $request->getURLtoSelf(); return HTML::form(array('action' => $request->getPostURL(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2020-03-29 15:05:55
|
Revision: 10160 http://sourceforge.net/p/phpwiki/code/10160 Author: vargenau Date: 2020-03-29 15:05:53 +0000 (Sun, 29 Mar 2020) Log Message: ----------- call_user_func passes arguments by value, so callees shouldn't expect by-reference parameter passing -- patches by Christof Meerwald Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2020-03-23 13:08:19 UTC (rev 10159) +++ trunk/lib/plugin/WikiAdminUtils.php 2020-03-29 15:05:53 UTC (rev 10160) @@ -88,7 +88,7 @@ return $this->_makeButton($request, $args, $label); } - protected function _makeButton(&$request, $args, $label) + protected function _makeButton($request, $args, $label) { $args['return_url'] = $request->getURLtoSelf(); return HTML::form(array('action' => $request->getPostURL(), @@ -100,7 +100,7 @@ HiddenInputs($request->getArgs(), false, array('action'))); } - function do_action(&$request, $args) + function do_action($request, $args) { $method = strtolower('_do_' . str_replace('-', '_', $args['action'])); if (!method_exists($this, $method)) @@ -129,7 +129,7 @@ return @$labels[$action]; } - private function _do_purge_cache(&$request, $args) + private function _do_purge_cache($request, $args) { $dbi = $request->getDbh(); $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too? @@ -139,7 +139,7 @@ return _("Markup cache purged!"); } - private function _do_purge_bad_pagenames(&$request, $args) + private function _do_purge_bad_pagenames($request, $args) { // FIXME: this should be moved into WikiDB::normalize() or something... $dbi = $request->getDbh(); @@ -171,7 +171,7 @@ * @param array $args * @return string|XmlContent */ - private function _do_purge_empty_pages(&$request, $args) + private function _do_purge_empty_pages($request, $args) { $dbi = $request->getDbh(); $count = 0; @@ -206,7 +206,7 @@ : '')); } - private function _do_convert_cached_html(&$request, $args) + private function _do_convert_cached_html($request, $args) { require_once 'lib/upgrade.php'; @@ -223,7 +223,7 @@ } } - private function _do_db_check(&$request, $args) + private function _do_db_check($request, $args) { longer_timeout(180); $dbh = $request->getDbh(); @@ -231,7 +231,7 @@ return $dbh->_backend->check($args); } - private function _do_db_rebuild(&$request, $args) + private function _do_db_rebuild($request, $args) { longer_timeout(240); $dbh = $request->getDbh(); @@ -240,7 +240,7 @@ } // pagelist with enable/disable button - private function _do_email_verification(&$request, &$args) + private function _do_email_verification($request, &$args) { $dbi = $request->getDbh(); $pagelist = new PageList('pagename', array(), $args); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-06 09:58:26
|
Revision: 10448 http://sourceforge.net/p/phpwiki/code/10448 Author: vargenau Date: 2021-08-06 09:58:24 +0000 (Fri, 06 Aug 2021) Log Message: ----------- lib/plugin/WikiAdminUtils.php: do not use Alert, use warningmsg Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 08:20:47 UTC (rev 10447) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 09:58:24 UTC (rev 10448) @@ -107,12 +107,11 @@ $message = call_user_func(array(&$this, $method), $request, $args); - // display as separate page or as alert? - $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']), - $message, - array(_("Back") => $args['return_url'])); - $alert->show(); // noreturn - return ''; + $url = WikiURL($args['return_url'], + array('warningmsg' => $message), + 'abs_path'); + + return $request->redirect($url); } private function _getLabel($action) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 10:45:05
|
Revision: 10459 http://sourceforge.net/p/phpwiki/code/10459 Author: vargenau Date: 2021-08-09 10:45:03 +0000 (Mon, 09 Aug 2021) Log Message: ----------- lib/plugin/WikiAdminUtils.php: actions return a string Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-08-09 08:25:48 UTC (rev 10458) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-08-09 10:45:03 UTC (rev 10459) @@ -141,10 +141,9 @@ private function _do_purge_bad_pagenames($request, $args) { - // FIXME: this should be moved into WikiDB::normalize() or something... $dbi = $request->getDbh(); $count = 0; - $list = HTML::ol(array('class' => 'align-left')); + $list = ''; $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too? while (($page = $pages->next())) { $pagename = $page->getName(); @@ -151,7 +150,7 @@ $wpn = new WikiPageName($pagename); if (!$wpn->isValid()) { $dbi->purgePage($pagename); - $list->pushContent(HTML::li($pagename)); + $list .= "\n" . $pagename; $count++; } } @@ -159,8 +158,7 @@ if (!$count) { return _("No pages with bad names had to be deleted."); } else { - return HTML(fmt("Deleted %d pages with invalid names:", $count), - HTML::div(array('class' => 'align-left'), $list)); + return fmt("Deleted %d pages with invalid names:", $count) . $list; } } @@ -176,7 +174,7 @@ $dbi = $request->getDbh(); $count = 0; $notpurgable = 0; - $list = HTML::ol(array('class' => 'align-left')); + $list = ''; $pages = $dbi->getAllPages('include_empty'); while (($page = $pages->next())) { if (!$page->exists() @@ -185,10 +183,10 @@ ) { $pagename = $page->getName(); if ($pagename == 'global_data' or $pagename == '.') continue; - if ($dbi->purgePage($pagename)) - $list->pushContent(HTML::li($pagename . ' ' . _("[purged]"))); - else { - $list->pushContent(HTML::li($pagename . ' ' . _("[not purgable]"))); + if ($dbi->purgePage($pagename)) { + $list .= "\n" . $pagename . ' ' . _("[purged]"); + } else { + $list .= "\n" . $pagename . ' ' . _("[not purgable]"); $notpurgable++; } $count++; @@ -195,15 +193,15 @@ } } $pages->free(); - if (!$count) + if (!$count) { return _("No empty, unreferenced pages were found."); - else - return HTML(fmt("Deleted %d unreferenced pages:", $count), - HTML::div(array('class' => 'align-left'), $list), - ($notpurgable ? + } else { + return fmt("Deleted %d unreferenced pages:", $count) . $list + . ($notpurgable ? fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.", $notpurgable) - : '')); + : ''); + } } private function _do_db_check($request, $args) @@ -296,7 +294,7 @@ Button('cancel', _("Cancel"))) ); } - return HTML::raw(''); + return HTML::raw(''); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 13:47:18
|
Revision: 10464 http://sourceforge.net/p/phpwiki/code/10464 Author: vargenau Date: 2021-08-09 13:47:12 +0000 (Mon, 09 Aug 2021) Log Message: ----------- lib/plugin/WikiAdminUtils.php: revert, use Alert again Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-08-09 13:43:43 UTC (rev 10463) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-08-09 13:47:12 UTC (rev 10464) @@ -107,14 +107,12 @@ $message = call_user_func(array(&$this, $method), $request, $args); - // If needed, clean URL of previous message, remove '?' and after - $return_url = $args['return_url']; - if (strpos($return_url, '?')) { - $return_url = substr($return_url, 0, strpos($return_url, '?')); - } - $url = WikiURL($return_url, array('warningmsg' => $message)); - - return $request->redirect($url); + // display as separate page or as alert? + $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']), + $message, + array(_("Back") => $args['return_url'])); + $alert->show(); // noreturn + return ''; } private function _getLabel($action) @@ -143,7 +141,7 @@ { $dbi = $request->getDbh(); $count = 0; - $list = ''; + $list = HTML::ol(array('class' => 'align-left')); $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too? while (($page = $pages->next())) { $pagename = $page->getName(); @@ -150,7 +148,7 @@ $wpn = new WikiPageName($pagename); if (!$wpn->isValid()) { $dbi->purgePage($pagename); - $list .= "\n" . $pagename; + $list->pushContent(HTML::li($pagename)); $count++; } } @@ -158,7 +156,8 @@ if (!$count) { return _("No pages with bad names had to be deleted."); } else { - return fmt("Deleted %d pages with invalid names:", $count) . $list; + return HTML(fmt("Deleted %d pages with invalid names:", $count), + HTML::div(array('class' => 'align-left'), $list)); } } @@ -174,7 +173,7 @@ $dbi = $request->getDbh(); $count = 0; $notpurgable = 0; - $list = ''; + $list = HTML::ol(array('class' => 'align-left')); $pages = $dbi->getAllPages('include_empty'); while (($page = $pages->next())) { if (!$page->exists() @@ -183,10 +182,10 @@ ) { $pagename = $page->getName(); if ($pagename == 'global_data' or $pagename == '.') continue; - if ($dbi->purgePage($pagename)) { - $list .= "\n" . $pagename . ' ' . _("[purged]"); - } else { - $list .= "\n" . $pagename . ' ' . _("[not purgable]"); + if ($dbi->purgePage($pagename)) + $list->pushContent(HTML::li($pagename . ' ' . _("[purged]"))); + else { + $list->pushContent(HTML::li($pagename . ' ' . _("[not purgable]"))); $notpurgable++; } $count++; @@ -196,11 +195,12 @@ if (!$count) { return _("No empty, unreferenced pages were found."); } else { - return fmt("Deleted %d unreferenced pages:", $count) . $list - . ($notpurgable ? + return HTML(fmt("Deleted %d unreferenced pages:", $count), + HTML::div(array('class' => 'align-left'), $list), + ($notpurgable ? fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.", $notpurgable) - : ''); + : '')); } } @@ -229,7 +229,7 @@ } // pagelist with enable/disable button - private function _do_email_verification($request, &$args) + private function _do_email_verification($request, $args) { $dbi = $request->getDbh(); $pagelist = new PageList('pagename', array(), $args); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-09 14:34:22
|
Revision: 10758 http://sourceforge.net/p/phpwiki/code/10758 Author: vargenau Date: 2021-12-09 14:34:19 +0000 (Thu, 09 Dec 2021) Log Message: ----------- WikiAdminUtils plugin: remove unused argument Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-12-09 14:32:59 UTC (rev 10757) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-12-09 14:34:19 UTC (rev 10758) @@ -127,7 +127,7 @@ return @$labels[$action]; } - private function _do_purge_cache($request, $args) + private function _do_purge_cache($request) { $dbi = $request->getDbh(); $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too? @@ -137,7 +137,7 @@ return _("HTML cache purged!"); } - private function _do_purge_bad_pagenames($request, $args) + private function _do_purge_bad_pagenames($request) { $dbi = $request->getDbh(); $count = 0; @@ -165,10 +165,9 @@ * Purge all non-referenced empty pages. Mainly those created by bad link extraction. * * @param WikiRequest $request - * @param array $args * @return string|XmlContent */ - private function _do_purge_empty_pages($request, $args) + private function _do_purge_empty_pages($request) { $dbi = $request->getDbh(); $count = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-09 18:26:59
|
Revision: 10768 http://sourceforge.net/p/phpwiki/code/10768 Author: vargenau Date: 2021-12-09 18:26:58 +0000 (Thu, 09 Dec 2021) Log Message: ----------- WikiAdminUtils plugin: avoid warning Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-12-09 17:49:44 UTC (rev 10767) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-12-09 18:26:58 UTC (rev 10768) @@ -58,13 +58,14 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - $args['action'] = strtolower($args['action']); extract($args); - if (!$action) { + if (empty($action)) { $this->error("No action specified"); } - if (!($default_label = $this->_getLabel($action))) { + $action = strtolower($action); + + if (!($default_label = $this->getLabel($action))) { return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action)); } if ($request->getArg('action') != 'browse') { @@ -115,16 +116,24 @@ return ''; } - private function _getLabel($action) + private function getLabel($action) { - $labels = array('purge-cache' => _("Purge HTML Cache"), - 'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"), - 'purge-empty-pages' => _("Purge all empty, unreferenced Pages"), - 'email-verification' => _("E-mail Verification"), - 'db-check' => _("Check Wiki Database"), - 'db-rebuild' => _("Rebuild Wiki Database") - ); - return @$labels[$action]; + switch ($action) { + case 'purge-cache': + return _("Purge HTML Cache"); + case 'purge-bad-pagenames': + return _("Purge all Pages With Invalid Names"); + case 'purge-empty-pages': + return _("Purge all empty, unreferenced Pages"); + case 'email-verification': + return _("E-mail Verification"); + case 'db-check': + return _("Check Wiki Database"); + case 'db-rebuild': + return _("Rebuild Wiki Database"); + default: + return ''; + } } private function _do_purge_cache($request) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-06 10:24:33
|
Revision: 10449 http://sourceforge.net/p/phpwiki/code/10449 Author: vargenau Date: 2021-08-06 10:24:32 +0000 (Fri, 06 Aug 2021) Log Message: ----------- lib/plugin/WikiAdminUtils.php: If needed, clean URL of previous message, remove "?" and after Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 09:58:24 UTC (rev 10448) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 10:24:32 UTC (rev 10449) @@ -107,7 +107,12 @@ $message = call_user_func(array(&$this, $method), $request, $args); - $url = WikiURL($args['return_url'], + // If needed, clean URL of previous message, remove '?' and after + $return_url = $args['return_url']; + if (strpos($return_url, '?')) { + $return_url = substr($return_url, 0, strpos($return_url, '?')); + } + $url = WikiURL($return_url, array('warningmsg' => $message), 'abs_path'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-06 14:40:20
|
Revision: 10453 http://sourceforge.net/p/phpwiki/code/10453 Author: vargenau Date: 2021-08-06 14:40:18 +0000 (Fri, 06 Aug 2021) Log Message: ----------- lib/plugin/WikiAdminUtils.php: better labels Modified Paths: -------------- trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 14:36:35 UTC (rev 10452) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 14:40:18 UTC (rev 10453) @@ -122,9 +122,9 @@ $labels = array('purge-cache' => _("Purge Markup Cache"), 'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"), 'purge-empty-pages' => _("Purge all empty, unreferenced Pages"), - 'email-verification' => _("E-mail address confirmation"), - 'db-check' => _("DB Check"), - 'db-rebuild' => _("Db Rebuild") + 'email-verification' => _("E-mail Verification"), + 'db-check' => _("Check Wiki Database"), + 'db-rebuild' => _("Rebuild Wiki Database") ); return @$labels[$action]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |