From: <var...@us...> - 2008-09-07 11:15:09
|
Revision: 6243 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6243&view=rev Author: vargenau Date: 2008-09-07 11:15:18 +0000 (Sun, 07 Sep 2008) Log Message: ----------- Removed history Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2008-09-07 11:12:43 UTC (rev 6242) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2008-09-07 11:15:18 UTC (rev 6243) @@ -272,98 +272,6 @@ return $string; } -// $Log: not supported by cvs2svn $ -// Revision 1.19 2004/11/26 18:39:02 rurban -// new regex search parser and SQL backends (90% complete, glob and pcre backends missing) -// -// Revision 1.18 2004/11/23 15:17:20 rurban -// better support for case_exact search (not caseexact for consistency), -// plugin args simplification: -// handle and explode exclude and pages argument in WikiPlugin::getArgs -// and exclude in advance (at the sql level if possible) -// handle sortby and limit from request override in WikiPlugin::getArgs -// ListSubpages: renamed pages to maxpages -// -// Revision 1.17 2004/09/17 14:24:06 rurban -// support exclude=<!plugin-list !>, p not yet -// -// Revision 1.16 2004/06/16 10:38:59 rurban -// Disallow refernces in calls if the declaration is a reference -// ("allow_call_time_pass_reference clean"). -// PhpWiki is now allow_call_time_pass_reference = Off clean, -// but several external libraries may not. -// In detail these libs look to be affected (not tested): -// * Pear_DB odbc -// * adodb oracle -// -// Revision 1.15 2004/06/14 11:31:39 rurban -// renamed global $Theme to $WikiTheme (gforge nameclash) -// inherit PageList default options from PageList -// default sortby=pagename -// use options in PageList_Selectable (limit, sortby, ...) -// added action revert, with button at action=diff -// added option regex to WikiAdminSearchReplace -// -// Revision 1.14 2004/06/13 15:33:20 rurban -// new support for arguments owner, author, creator in most relevant -// PageList plugins. in WikiAdmin* via preSelectS() -// -// Revision 1.13 2004/06/13 14:30:26 rurban -// security fix: check permissions in SearchReplace -// -// Revision 1.12 2004/06/08 10:05:12 rurban -// simplified admin action shortcuts -// -// Revision 1.11 2004/06/04 20:32:54 rurban -// Several locale related improvements suggested by Pierrick Meignen -// LDAP fix by John Cole -// reanable admin check without ENABLE_PAGEPERM in the admin plugins -// -// Revision 1.10 2004/06/03 22:24:48 rurban -// reenable admin check on !ENABLE_PAGEPERM, honor s=Wildcard arg, fix warning after Remove -// -// Revision 1.9 2004/04/07 23:13:19 rurban -// fixed pear/File_Passwd for Windows -// fixed FilePassUser sessions (filehandle revive) and password update -// -// Revision 1.8 2004/03/17 20:23:44 rurban -// fixed p[] pagehash passing from WikiAdminSelect, fixed problem removing pages with [] in the pagename -// -// Revision 1.7 2004/03/12 13:31:43 rurban -// enforce PagePermissions, errormsg if not Admin -// -// Revision 1.6 2004/02/24 15:20:07 rurban -// fixed minor warnings: unchecked args, POST => Get urls for sortby e.g. -// -// Revision 1.5 2004/02/17 12:11:36 rurban -// added missing 4th basepage arg at plugin->run() to almost all plugins. This caused no harm so far, because it was silently dropped on normal usage. However on plugin internal ->run invocations it failed. (InterWikiSearch, IncludeSiteMap, ...) -// -// Revision 1.4 2004/02/15 21:34:37 rurban -// PageList enhanced and improved. -// fixed new WikiAdmin... plugins -// editpage, Theme with exp. htmlarea framework -// (htmlarea yet committed, this is really questionable) -// WikiUser... code with better session handling for prefs -// enhanced UserPreferences (again) -// RecentChanges for show_deleted: how should pages be deleted then? -// -// Revision 1.3 2004/02/12 17:05:39 rurban -// WikiAdminRename: -// added "Change pagename in all linked pages also" -// PageList: -// added javascript toggle for Select -// WikiAdminSearchReplace: -// fixed another typo -// -// Revision 1.2 2004/02/12 11:47:51 rurban -// typo -// -// Revision 1.1 2004/02/12 11:25:53 rurban -// new WikiAdminSearchReplace plugin (requires currently Admin) -// removed dead comments from WikiDB -// -// - // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-02-13 16:17:15
|
Revision: 6495 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6495&view=rev Author: vargenau Date: 2009-02-13 16:17:09 +0000 (Fri, 13 Feb 2009) Log Message: ----------- Set author and modification time Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2009-02-13 16:16:13 UTC (rev 6494) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2009-02-13 16:17:09 UTC (rev 6495) @@ -2,7 +2,7 @@ rcs_id('$Id$'); /* Copyright 2004,2007 $ThePhpWikiProgrammingTeam - Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent + Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent This file is part of PhpWiki. @@ -58,7 +58,7 @@ )); } - function replaceHelper(&$dbi, $pagename, $from, $to, $case_exact=true, $regex=false) { + function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact=true, $regex=false) { $page = $dbi->getPage($pagename); if ($page->exists()) {// don't replace default contents $current = $page->getCurrentRevision(); @@ -80,7 +80,10 @@ } if ($text != $newtext) { $meta = $current->_data; - $meta['summary'] = sprintf(_("WikiAdminSearchReplace %s by %s"),$from,$to); + $meta['summary'] = sprintf(_("Replace '%s' by '%s'"), $from, $to); + $meta['is_minor_edit'] = 0; + $meta['author'] = $request->_user->UserName(); + unset($meta['mtime']); // force new date return $page->save($newtext, $version + 1, $meta); } } @@ -97,7 +100,7 @@ foreach ($pages as $pagename) { if (!mayAccessPage('edit', $pagename)) { $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename))); - } elseif (($result = $this->replaceHelper($dbi, $pagename, $from, $to, + } elseif (($result = $this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex))) { $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", @@ -179,7 +182,7 @@ $pagelist->addPageList($pages); - $header = HTML::p(); + $header = HTML::div(); if (empty($post_args['from'])) $header->pushContent( HTML::p(HTML::em(_("Warning: The search string cannot be empty!")))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-07-31 20:12:19
|
Revision: 7051 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7051&view=rev Author: vargenau Date: 2009-07-31 20:12:11 +0000 (Fri, 31 Jul 2009) Log Message: ----------- No message needed if string not found Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2009-07-29 20:26:26 UTC (rev 7050) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2009-07-31 20:12:11 UTC (rev 7051) @@ -101,14 +101,10 @@ foreach ($pages as $pagename) { if (!mayAccessPage('edit', $pagename)) { $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename))); - } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) - { + } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) { $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", $from, $to, WikiLink($pagename)))); $count++; - } else { - $ul->pushContent(HTML::li(fmt("Search string '%s' not found in content of page '%s'.", - $from, WikiLink($pagename)))); } } if ($count) { @@ -120,12 +116,11 @@ $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); } $result->pushContent($ul); - return $result; } else { $result->setAttr('class', 'error'); $result->pushContent(HTML::p("No pages changed.")); - return $result; } + return $result; } function run($dbi, $argstr, &$request, $basepage) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-08-06 15:18:56
|
Revision: 7063 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7063&view=rev Author: vargenau Date: 2009-08-06 15:18:47 +0000 (Thu, 06 Aug 2009) Log Message: ----------- Do not display content at start; display content if found; put buttons inside fieldset Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2009-08-06 09:46:59 UTC (rev 7062) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2009-08-06 15:18:47 UTC (rev 7063) @@ -169,7 +169,9 @@ } if ($next_action == 'verify') { - $args['info'] = "checkbox,pagename,hi_content"; + $args['info'] = "checkbox,pagename"; + } else { + $args['info'] = "checkbox,pagename,hi_content,mtime,author"; } $pagelist = new PageList_Selectable ($args['info'], $args['exclude'], @@ -191,23 +193,21 @@ $button_label = _("Yes"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to permanently search & replace text in the selected files?")))); + _("Are you sure you want to permanently replace text in the selected files?")))); $this->replaceForm($header, $post_args); - } - else { + } else { $button_label = _("Search & Replace"); $this->replaceForm($header, $post_args); $header->pushContent(HTML::legend(_("Select the pages to search and replace"))); } - - $buttons = HTML::p(Button('submit:admin_replace[rename]', $button_label, 'wikiadmin'), + $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'), Button('submit:admin_replace[cancel]', _("Cancel"), 'button')); + $header->pushContent($buttons); return HTML::form(array('action' => $request->getPostURL(), 'method' => 'post'), $header, - $buttons, $pagelist->getContent(), HiddenInputs($request->getArgs(), false, @@ -245,7 +245,6 @@ $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?"))); $this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?"))); $header->pushContent($table); - $header->pushContent(HTML::br()); return $header; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-29 14:59:50
|
Revision: 8573 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8573&view=rev Author: vargenau Date: 2012-11-29 14:59:43 +0000 (Thu, 29 Nov 2012) Log Message: ----------- Avoid warning about "hi_content" Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2012-11-29 09:52:29 UTC (rev 8572) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2012-11-29 14:59:43 UTC (rev 8573) @@ -172,7 +172,9 @@ if ($next_action == 'verify') { $args['info'] = "checkbox,pagename"; } else { - $args['info'] = "checkbox,pagename,hi_content,mtime,author"; + // Avoid warning about "hi_content" + // $args['info'] = "checkbox,pagename,hi_content,mtime,author"; + $args['info'] = "checkbox,pagename,mtime,author"; } $pagelist = new PageList_Selectable ($args['info'], $args['exclude'], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-26 14:16:53
|
Revision: 8777 http://sourceforge.net/p/phpwiki/code/8777 Author: vargenau Date: 2013-04-26 14:16:50 +0000 (Fri, 26 Apr 2013) Log Message: ----------- Remove stri_replace Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2013-04-26 14:10:54 UTC (rev 8776) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2013-04-26 14:16:50 UTC (rev 8777) @@ -66,12 +66,7 @@ if ($case_exact) { $newtext = str_replace($from, $to, $text); } else { - //not all PHP have this enabled. use a workaround - if (function_exists('str_ireplace')) - $newtext = str_ireplace($from, $to, $text); - else { // see eof - $newtext = stri_replace($from, $to, $text); - } + $newtext = str_ireplace($from, $to, $text); } } if ($text != $newtext) { @@ -254,34 +249,6 @@ } } -function stri_replace($find, $replace, $string) -{ - if (!is_array($find)) $find = array($find); - if (!is_array($replace)) { - if (!is_array($find)) - $replace = array($replace); - else { - // this will duplicate the string into an array the size of $find - $c = count($find); - $rString = $replace; - unset($replace); - for ($i = 0; $i < $c; $i++) { - $replace[$i] = $rString; - } - } - } - foreach ($find as $fKey => $fItem) { - $between = explode(strtolower($fItem), strtolower($string)); - $pos = 0; - foreach ($between as $bKey => $bItem) { - $between[$bKey] = substr($string, $pos, strlen($bItem)); - $pos += strlen($bItem) + strlen($fItem); - } - $string = implode($replace[$fKey], $between); - } - return $string; -} - // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-29 16:34:34
|
Revision: 9136 http://sourceforge.net/p/phpwiki/code/9136 Author: vargenau Date: 2014-09-29 16:34:31 +0000 (Mon, 29 Sep 2014) Log Message: ----------- replaceHelper is public Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-29 15:54:08 UTC (rev 9135) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2014-09-29 16:34:31 UTC (rev 9136) @@ -149,7 +149,7 @@ return $result; } - private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) + public function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) { $page = $dbi->getPage($pagename); if ($page->exists()) { // don't replace default contents This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-09 17:08:11
|
Revision: 10761 http://sourceforge.net/p/phpwiki/code/10761 Author: vargenau Date: 2021-12-09 17:08:08 +0000 (Thu, 09 Dec 2021) Log Message: ----------- WikiAdminSearchReplace plugin: avoid warning, remove & Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2021-12-09 16:53:56 UTC (rev 10760) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2021-12-09 17:08:08 UTC (rev 10761) @@ -133,13 +133,12 @@ $header->pushContent( HTML::p(HTML::strong( _("Are you sure you want to replace text in the selected pages?")))); - $this->replaceForm($header, $post_args); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); $pagelist->addPageList($pages); $button_label = _("Search"); - $this->replaceForm($header, $post_args); } + $this->replaceForm($header, $post_args); $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'), HTML::raw(" "), @@ -160,7 +159,7 @@ return $result; } - public static function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false) + public static function replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact = true, $regex = false) { $page = $dbi->getPage($pagename); if ($page->exists()) { // don't replace default contents @@ -188,7 +187,7 @@ return false; } - private function searchReplacePages(&$dbi, &$request, $pages, $from, $to) + private function searchReplacePages($dbi, $request, $pages, $from, $to) { $result = HTML::div(); $ul = HTML::ul(); @@ -221,7 +220,7 @@ return $result; } - private function checkBox(&$post_args, $name, $msg) + private function checkBox($post_args, $name, $msg) { $id = 'admin_replace-' . $name; $checkbox = HTML::input(array('type' => 'checkbox', @@ -234,8 +233,11 @@ return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg)); } - private function replaceForm(&$header, $post_args) + private function replaceForm($header, $post_args) { + if ($post_args === false) { + $post_args = array('from' => '', 'to' => ''); + } $header->pushContent(HTML::p(array('class' => 'hint'), _("Replace all occurences of the given string in the content of all selected pages."))); $table = HTML::table(); @@ -250,6 +252,5 @@ $this->tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?"))); $this->tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?"))); $header->pushContent($table); - return $header; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-06 09:41:59
|
Revision: 10844 http://sourceforge.net/p/phpwiki/code/10844 Author: vargenau Date: 2022-01-06 09:41:57 +0000 (Thu, 06 Jan 2022) Log Message: ----------- lib/plugin/WikiAdminSearchReplace.php: selected pages --> following pages Modified Paths: -------------- trunk/lib/plugin/WikiAdminSearchReplace.php Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2022-01-06 09:35:41 UTC (rev 10843) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2022-01-06 09:41:57 UTC (rev 10844) @@ -26,7 +26,6 @@ /** * Usage: <<WikiAdminSearchReplace >> or called via WikiAdminSelect * Author: Reini Urban - * */ require_once 'lib/PageList.php'; @@ -110,7 +109,7 @@ // List all pages to select from. //TODO: check for permissions and list only the allowed $pages = $this->collectPages($pages, $dbi, $args['sortby'], - $args['limit'], $args['exclude']); + $args['limit'], $args['exclude']); } $args['info'] = "checkbox,pagename,mtime,author"; @@ -132,7 +131,7 @@ $button_label = _("Replace"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to replace text in the selected pages?")))); + _("Are you sure you want to replace text in the following pages?")))); } else { $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns); $pagelist->addPageList($pages); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |