From: <var...@us...> - 2010-03-04 10:48:15
|
Revision: 7302 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7302&view=rev Author: vargenau Date: 2010-03-04 10:48:07 +0000 (Thu, 04 Mar 2010) Log Message: ----------- Replace tabs by spaces; remove EOL spaces Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/Chart.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AddComment.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -2,7 +2,7 @@ rcs_id('$Id$'); /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam - * + * * This file is part of PhpWiki. * * PhpWiki is free software; you can redistribute it and/or modify @@ -59,7 +59,7 @@ // 'add' - only show entry box for new comment // 'show,add' - show old comments, then entry box // 'add,show' - show entry box followed by list of comments - // jshide - boolean - quick javascript expansion of the comments + // jshide - boolean - quick javascript expansion of the comments // and addcomment box function getDefaultArguments() { @@ -80,7 +80,7 @@ // Get our form args. $comment = $request->getArg("comment"); $request->setArg('comment', false); - + if ($request->isPost() and !empty($comment['addcomment'])) { $this->add($request, $comment, 'comment'); // noreturn } @@ -125,12 +125,12 @@ $div->pushContent($show); break; case 'add': - global $WikiTheme; - if (!$WikiTheme->DUMP_MODE) { - $add = $this->showForm($request, $args, 'addcomment'); - //if ($args['jshide']) $add->setAttr('style','display:none;'); - $div->pushContent($add); - } + global $WikiTheme; + if (!$WikiTheme->DUMP_MODE) { + $add = $this->showForm($request, $args, 'addcomment'); + //if ($args['jshide']) $add->setAttr('style','display:none;'); + $div->pushContent($add); + } break; default: return $this->error(sprintf("Bad mode ('%s')", $show)); @@ -139,7 +139,7 @@ $html->pushContent($div); return $html; } - + }; // For emacs users Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AllPages.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -56,7 +56,7 @@ 'userpages' => false )); } - + // info arg allows multiple columns // info=mtime,hits,summary,version,author,locked,minor,markup or all // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges @@ -72,53 +72,53 @@ $timer = new DebugTimer; } $caption = _("All pages in this wiki ({total} total):"); - + if ( !empty($args['userpages']) ) { $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], '' - ); - $caption = _("List of user-created pages ({total} total):"); - $args['count'] = $request->getArg('count'); + ); + $caption = _("List of user-created pages ({total} total):"); + $args['count'] = $request->getArg('count'); } elseif ( !empty($args['owner']) ) { $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], '' - ); - $caption = fmt("List of pages owned by [%s] ({total} total):", - WikiLink($args['owner'] == '[]' - ? $request->_user->getAuthenticatedId() - : $args['owner'], - 'if_known')); - $args['count'] = $request->getArg('count'); - $pages->_options['count'] = $args['count']; + ); + $caption = fmt("List of pages owned by [%s] ({total} total):", + WikiLink($args['owner'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['owner'], + 'if_known')); + $args['count'] = $request->getArg('count'); + $pages->_options['count'] = $args['count']; } elseif ( !empty($args['author']) ) { $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], - $args['sortby'], '' - ); - $caption = fmt("List of pages last edited by [%s] ({total} total):", - WikiLink($args['author'] == '[]' - ? $request->_user->getAuthenticatedId() - : $args['author'], - 'if_known')); - $args['count'] = $request->getArg('count'); - $pages->_options['count'] = $args['count']; + $args['sortby'], '' + ); + $caption = fmt("List of pages last edited by [%s] ({total} total):", + WikiLink($args['author'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['author'], + 'if_known')); + $args['count'] = $request->getArg('count'); + $pages->_options['count'] = $args['count']; } elseif ( !empty($args['creator']) ) { $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], '' - ); - $caption = fmt("List of pages created by [%s] ({total} total):", - WikiLink($args['creator'] == '[]' - ? $request->_user->getAuthenticatedId() - : $args['creator'], - 'if_known')); - $args['count'] = $request->getArg('count'); - $pages->_options['count'] = $args['count']; + ); + $caption = fmt("List of pages created by [%s] ({total} total):", + WikiLink($args['creator'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['creator'], + 'if_known')); + $args['count'] = $request->getArg('count'); + $pages->_options['count'] = $args['count']; //} elseif ($pages) { // $args['count'] = count($pages); } else { - if (! $request->getArg('count')) + if (! $request->getArg('count')) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); - else - $args['count'] = $request->getArg('count'); + else + $args['count'] = $request->getArg('count'); } if (empty($args['count']) and !empty($pages)) $args['count'] = count($pages); @@ -132,7 +132,7 @@ if ($pages !== false) $pagelist->addPageList($pages); else - $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], + $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], $args['limit']) ); if (defined('DEBUG') && DEBUG && $args['debug']) { return HTML($pagelist, Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AllUsers.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -25,9 +25,9 @@ /** * Based on AllPages and WikiGroup. * - * We list all users, - * either homepage users (prefs stored in a page), - * users with db prefs and + * We list all users, + * either homepage users (prefs stored in a page), + * users with db prefs and * externally authenticated users with a db users table, if auth_user_exists is defined. */ class WikiPlugin_AllUsers Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -66,12 +66,12 @@ $query = ''; $backend_type = $request->_dbi->_backend->backendType(); switch ($backend_type) { - case 'mysql': + case 'mysql': $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))"; break; - case 'pgsql': - case 'postgres7': + case 'pgsql': + case 'postgres7': $Referring_URL = "substr(referer,0,position('?' in referer))"; break; - default: + default: $Referring_URL = "referer"; } switch ($args['mode']) { @@ -101,12 +101,12 @@ if ($where_conditions<>'') $where_conditions = 'WHERE '.$where_conditions.' '; switch ($backend_type) { - case 'mysql': + case 'mysql': $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))"; break; - case 'pgsql': - case 'postgres7': + case 'pgsql': + case 'postgres7': $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')"; break; - default: + default: $Referring_Domain = "referer"; break; } $query = "SELECT " @@ -183,13 +183,13 @@ // If PHPSESSID appears in the URI, just display the URI to the left of this $sessname = session_name(); switch ($backend_type) { - case 'mysql': + case 'mysql': $Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))"; break; - case 'pgsql': - case 'postgres7': + case 'pgsql': + case 'postgres7': $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')"; break; - default: + default: $Request_URI = 'request_uri'; break; } $now = time(); @@ -239,7 +239,7 @@ return array( 'mode' => 'referring_domains', // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits - 'caption' => '', + 'caption' => '', // blank means use the mode as the caption/title for the output 'local_referrers' => 'true', // only show external referring sites 'period' => '', // the type of period to report: @@ -356,19 +356,19 @@ $len = strlen($localhost); $backend_type = $request->_dbi->_backend->backendType(); switch ($backend_type) { - case 'mysql': + case 'mysql': $ref_localhost = "left(referer,$len)<>'$localhost'"; break; - case 'pgsql': - case 'postgres7': + case 'pgsql': + case 'postgres7': $ref_localhost = "substr(referer,0,$len)<>'$localhost'"; break; - default: + default: $ref_localhost = ""; } $where_conditions = $where_conditions.$ref_localhost; } // The assumed contract is that there is a space at the end of the - // conditions string, so that following SQL clauses (such as GROUP BY) + // conditions string, so that following SQL clauses (such as GROUP BY) // will not cause a syntax error if ($where_conditions<>'') $where_conditions = $where_conditions.' '; Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AppendText.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -28,7 +28,7 @@ * See http://sourceforge.net/mailarchive/message.php?msg_id=10141823 * why not to use "text" as parameter. Nasty mozilla bug with mult. radio rows. * - * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !> + * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !> */ class WikiPlugin_AppendText extends WikiPlugin @@ -48,7 +48,7 @@ function getDefaultArguments() { return array('page' => '[pagename]', - 'pages' => false, + 'pages' => false, 's' => '', // Text to append. 'before' => '', // Add before (ignores after if defined) 'after' => '', // Add after line beginning with this @@ -65,17 +65,17 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - if (!$args['pages'] or !$request->isPost()) { - return $this->_work($args['page'], $args, $dbi, $request); - } else { - $html = HTML(); - if ($args['page'] != $basepage) - $html->pushContent("pages argument overrides page argument. ignored.",HTML::br()); - foreach ($args['pages'] as $pagename) { - $html->pushContent($this->_work($pagename, $args, $dbi, $request)); - } - return $html; - } + if (!$args['pages'] or !$request->isPost()) { + return $this->_work($args['page'], $args, $dbi, $request); + } else { + $html = HTML(); + if ($args['page'] != $basepage) + $html->pushContent("pages argument overrides page argument. ignored.",HTML::br()); + foreach ($args['pages'] as $pagename) { + $html->pushContent($this->_work($pagename, $args, $dbi, $request)); + } + return $html; + } } function _work($pagename, $args, $dbi, &$request) { @@ -95,7 +95,7 @@ $pagename)); return $message; } - + $current = $page->getCurrentRevision(); $oldtext = $current->getPackedContent(); $text = $args['s']; @@ -104,15 +104,15 @@ if (!empty($args['before'])) { $before = preg_quote($args['before'], "/"); // Insert before - $newtext = preg_match("/\n${before}/", $oldtext) + $newtext = preg_match("/\n${before}/", $oldtext) ? preg_replace("/(\n${before})/", "\n" . preg_quote($text, "/") . "\\1", - $oldtext) + $oldtext) : $this->_fallback($text, $oldtext, $args['before'], $message); } elseif (!empty($args['after'])) { // Insert after $after = preg_quote($args['after'], "/"); - $newtext = preg_match("/\n${after}/", $oldtext) + $newtext = preg_match("/\n${after}/", $oldtext) ? preg_replace("/(\n${after})/", "\\1\n" . preg_quote($text, "/"), $oldtext) @@ -129,19 +129,19 @@ if ($page->save($newtext, $current->getVersion() + 1, $meta)) { $message->pushContent(_("Page successfully updated."), HTML::br()); } - + // AppendText has been called from the same page that got modified // so we directly show the page. if ( $request->getArg($pagename) == $pagename ) { - // TODO: Just invalidate the cache, if AppendText didn't + // TODO: Just invalidate the cache, if AppendText didn't // change anything before. - // + // return $request->redirect(WikiURL($pagename, false, 'absurl'), false); // The user asked to be redirected to the modified page } elseif ($args['redirect']) { return $request->redirect(WikiURL($pagename, false, 'absurl'), false); - + } else { $link = HTML::em(WikiLink($pagename)); $message->pushContent(HTML::Raw(sprintf(_("Go to %s."), $link->asXml()))); Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AsciiMath.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -27,19 +27,19 @@ require_once("lib/ASCIIMathPHP/ASCIIMathPHP.class.php"); } -/** +/** * Render ASCII math as MathML * Requires ENABLE_XHTML_XML = true * See http://www.jcphysics.com/ASCIIMath/ * Syntax: http://www1.chapman.edu/~jipsen/mathml/asciimathsyntax.xml * Example: "int_-1^1 sqrt(1-x^2)dx = pi/2" * => <math xmlns="http://www.w3.org/1998/Math/MathML"> - <mrow><msubsup><mo>∫</mo><mn>-1</mn><mn>1</mn></msubsup></mrow> - <msqrt><mrow><mn>1</mn><mo>-</mo><msup><mi>x</mi><mn>2</mn></msup></mrow></msqrt> - <mi>d</mi> - <mi>x</mi> - <mo>=</mo> - <mfrac><mi>π</mi><mo>2</mo></mfrac> + <mrow><msubsup><mo>∫</mo><mn>-1</mn><mn>1</mn></msubsup></mrow> + <msqrt><mrow><mn>1</mn><mo>-</mo><msup><mi>x</mi><mn>2</mn></msup></mrow></msqrt> + <mi>d</mi> + <mi>x</mi> + <mo>=</mo> + <mfrac><mi>π</mi><mo>2</mo></mfrac> </math> */ class WikiPlugin_AsciiMath Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/AsciiSVG.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -44,8 +44,8 @@ function getDefaultArguments() { return array('width' => 200, 'height' => 200, - 'script' => false, // one line script. not very likely - 'onmousemove' => false + 'script' => false, // one line script. not very likely + 'onmousemove' => false ); } function handle_plugin_args_cruft(&$argstr, &$args) { @@ -67,21 +67,21 @@ $html->pushContent($js); $WikiTheme->_asciiSVG = 1; // prevent duplicates } - // extract <script> - if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) { - $this->source = $m[1]; - $args['script'] = $m[2]; - } - $embedargs = array('width' => $args['width'], - 'height' => $args['height'], - //'src' => "d.svg", - 'script' => $this->source); - // additional onmousemove argument - if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove']; + // extract <script> + if (preg_match("/^(.*)<script>(.*)<\/script>/ism", $this->source, $m)) { + $this->source = $m[1]; + $args['script'] = $m[2]; + } + $embedargs = array('width' => $args['width'], + 'height' => $args['height'], + //'src' => "d.svg", + 'script' => $this->source); + // additional onmousemove argument + if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove']; // we need script='data' and not script="data" $embed = new AsciiSVG_HTML("embed", $embedargs); $html->pushContent($embed); - if ($args['script']) $html->pushContent(JavaScript($args['script'])); + if ($args['script']) $html->pushContent(JavaScript($args['script'])); return $html; } }; @@ -89,7 +89,7 @@ class AsciiSVG_HTML extends HtmlElement { function startTag() { $start = "<" . $this->_tag; - $this->_setClasses(); + $this->_setClasses(); foreach ($this->_attr as $attr => $val) { if (is_bool($val)) { if (!$val) @@ -98,7 +98,7 @@ } $qval = str_replace("\"", '"', $this->_quote((string)$val)); if ($attr == 'script') - // note the ' not " + // note the ' not " $start .= " $attr='$qval'"; else $start .= " $attr=\"$qval\""; Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/BackLinks.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -30,16 +30,16 @@ function getName() { return _("BackLinks"); } - + function getDescription() { return sprintf(_("List all pages which link to %s."), '[pagename]'); } - + function getVersion() { return preg_replace("/[Revision: $]/", '', "\$Revision$"); } - + function getDefaultArguments() { return array_merge ( @@ -47,8 +47,8 @@ array('include_self' => false, 'noheader' => false, 'page' => '[pagename]', - 'linkmore' => '', // If count>0 and limit>0 display a link with - // the number of all results, linked to the given pagename. + 'linkmore' => '', // If count>0 and limit>0 display a link with + // the number of all results, linked to the given pagename. )); } @@ -70,39 +70,39 @@ if ($info) { $info = explode(",", $info); if (in_array('count',$info)) - $args['types']['count'] = + $args['types']['count'] = new _PageList_Column_BackLinks_count('count', _("#"), 'center'); } - if (!empty($limit)) - $args['limit'] = $limit; + if (!empty($limit)) + $args['limit'] = $limit; $args['dosort'] = !empty($args['sortby']); // override DB sort (??) $pagelist = new PageList($info, $exclude, $args); // support logical AND: page1,page2 - $pages = explodePageList($page); - $count = count($pages); - if (count($pages) > 1) { - // AND: the intersection of all these pages - $bl = array(); - foreach ($pages as $p) { - $dp = $dbi->getPage($p); - $bi = $dp->getBackLinks(false, $sortby, 0, $exclude); - while ($b = $bi->next()) { - $name = $b->getName(); - if (isset($bl[$name])) - $bl[$name]++; - else - $bl[$name] = 1; - } - } - foreach ($bl as $b => $v) - if ($v == $count) - $pagelist->addPage($b); - } else { - $p = $dbi->getPage($page); - $pagelist->addPages($p->getBackLinks(false, $sortby, 0, $exclude)); - } - $total = $pagelist->getTotal(); + $pages = explodePageList($page); + $count = count($pages); + if (count($pages) > 1) { + // AND: the intersection of all these pages + $bl = array(); + foreach ($pages as $p) { + $dp = $dbi->getPage($p); + $bi = $dp->getBackLinks(false, $sortby, 0, $exclude); + while ($b = $bi->next()) { + $name = $b->getName(); + if (isset($bl[$name])) + $bl[$name]++; + else + $bl[$name] = 1; + } + } + foreach ($bl as $b => $v) + if ($v == $count) + $pagelist->addPage($b); + } else { + $p = $dbi->getPage($page); + $pagelist->addPages($p->getBackLinks(false, $sortby, 0, $exclude)); + } + $total = $pagelist->getTotal(); // Localization note: In English, the differences between the // various phrases spit out here may seem subtle or negligible @@ -112,8 +112,8 @@ // distinction as it does with English in this case. :) if (!$noheader) { if ($page == $request->getArg('pagename') - and !$dbi->isWikiPage($page)) - { + and !$dbi->isWikiPage($page)) + { // BackLinks plugin is more than likely being called // upon for an empty page on said page, while either // 'browse'ing, 'create'ing or 'edit'ing. @@ -122,10 +122,10 @@ // the Un~WikiLink~ified (plain) name of the uncreated // page currently being viewed. $pagelink = $page; - + if ($pagelist->isEmpty()) return HTML::p(fmt("No other page links to %s yet.", $pagelink)); - + if ($total == 1) $pagelist->setCaption(fmt("One page would link to %s:", $pagelink)); @@ -140,21 +140,21 @@ $total, $pagelink)); } else { - if ($count) { - $tmp_pages = $pages; - $p = array_shift($tmp_pages); - $pagelink = HTML(WikiLink($p, 'auto')); - foreach ($tmp_pages as $p) - $pagelink->pushContent(" ",_("AND")," ",WikiLink($p, 'auto')); - } else - // BackLinks plugin is being displayed on a normal page. + if ($count) { + $tmp_pages = $pages; + $p = array_shift($tmp_pages); + $pagelink = HTML(WikiLink($p, 'auto')); + foreach ($tmp_pages as $p) + $pagelink->pushContent(" ",_("AND")," ",WikiLink($p, 'auto')); + } else + // BackLinks plugin is being displayed on a normal page. $pagelink = WikiLink($page, 'auto'); - + if ($pagelist->isEmpty()) return HTML::p(fmt("No page links to %s.", $pagelink)); - + //trigger_error("DEBUG: " . $pagelist->getTotal()); - + if ($total == 1) $pagelist->setCaption(fmt("One page links to %s:", $pagelink)); @@ -166,18 +166,18 @@ // $pagelink)); else $pagelist->setCaption(fmt("%s pages link to %s:", - $limit > 0 ? $total : _("Those"), - $pagelink)); + $limit > 0 ? $total : _("Those"), + $pagelink)); } } - if (!empty($args['linkmore']) - and $dbi->isWikiPage($args['linkmore']) - and $limit > 0 and $total > $limit - ) - $pagelist->addCaption(WikiLink($args['linkmore'], "auto", _("More..."))); + if (!empty($args['linkmore']) + and $dbi->isWikiPage($args['linkmore']) + and $limit > 0 and $total > $limit + ) + $pagelist->addCaption(WikiLink($args['linkmore'], "auto", _("More..."))); return $pagelist; } - + }; // how many links from this backLink to other pages Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/BlogArchives.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -2,7 +2,7 @@ rcs_id('$Id$'); /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam - * + * * This file is part of PhpWiki. * * PhpWiki is free software; you can redistribute it and/or modify @@ -23,7 +23,7 @@ require_once('lib/plugin/WikiBlog.php'); /** - * BlogArchives - List monthly links for the current users blog if signed, + * BlogArchives - List monthly links for the current users blog if signed, * or the ADMIN_USER's Blog if not. * On month=... list the blog titles per month. * @@ -51,7 +51,7 @@ function getDefaultArguments() { return //array_merge //( - //PageList::supportedArgs(), + //PageList::supportedArgs(), array('user' => '', 'order' => 'reverse', // latest first 'info' => 'month,numpages', // ignored @@ -77,9 +77,9 @@ } if (!$args['user'] or $args['user'] == ADMIN_USER) { if (BLOG_DEFAULT_EMPTY_PREFIX) - $args['user'] = ''; // "Blogs/day" pages + $args['user'] = ''; // "Blogs/day" pages else - $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages + $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages } $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR); @@ -87,15 +87,15 @@ //$pagelist = new PageList($args['info'], $args['exclude'], $args); //if (!is_array('pagename'), explode(',', $info)) // unset($pagelist->_columns['pagename']); - + $sp = HTML::Raw('· '); if (!empty($args['month'])) { $prefix = $parent . $this->_blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month']; $pages = $dbi->titleSearch(new TextSearchQuery("^".$prefix, true, 'posix')); $html = HTML::ul(); while ($page = $pages->next()) { - $rev = $page->getCurrentRevision(false); - if ($rev->get('pagetype') != 'wikiblog') continue; + $rev = $page->getCurrentRevision(false); + if ($rev->get('pagetype') != 'wikiblog') continue; $blog = $this->_blog($rev); $html->pushContent(HTML::li(WikiLink($page, 'known', $rev->get('summary')))); } @@ -117,13 +117,13 @@ $months = array(); foreach ($blogs as $rev) { $blog = $this->_blog($rev); - $mon = $blog['month']; + $mon = $blog['month']; if (empty($months[$mon])) - $months[$mon] = + $months[$mon] = array('title' => $this->_monthTitle($mon), 'num' => 1, 'month' => $mon, - 'link' => WikiURL($basepage, + 'link' => WikiURL($basepage, $this->_nonDefaultArgs(array('month' => $mon)))); else $months[$mon]['num']++; @@ -137,7 +137,7 @@ return HTML(HTML::h3(_("Blog Archives:")), $html); else return $html; - } else + } else return ''; } Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/BlogJournal.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -2,7 +2,7 @@ rcs_id('$Id$'); /* * Copyright (C) 2005 $ThePhpWikiProgrammingTeam - * + * * This file is part of PhpWiki. * * PhpWiki is free software; you can redistribute it and/or modify @@ -23,10 +23,10 @@ require_once('lib/plugin/WikiBlog.php'); /** - * BlogJournal - Include the latest blog entries for the current users blog if signed, + * BlogJournal - Include the latest blog entries for the current users blog if signed, * or the ADMIN_USER's Blog if not. * UnfoldSubpages for blogs. - * Rui called this plugin "JournalLast", but this was written completely independent, + * Rui called this plugin "JournalLast", but this was written completely independent, * without having seen the src. * * @author: Reini Urban @@ -73,9 +73,9 @@ } if (!$args['user'] or $args['user'] == ADMIN_USER) { if (BLOG_DEFAULT_EMPTY_PREFIX) { - $args['user'] = ''; // "Blogs/day" pages + $args['user'] = ''; // "Blogs/day" pages } else { - $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages + $args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages } } $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR); @@ -96,8 +96,8 @@ } if ($args['user'] == $user->UserName() or $args['user'] == '') $html->pushContent(Button(array('action'=>'WikiBlog', - 'mode'=>'add'), - _("New entry"), $base)); + 'mode'=>'add'), + _("New entry"), $base)); if (!$i) return HTML(HTML::h3(_("No Blog Entries")), $html); if (!$args['noheader']) Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/BoxRight.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -49,13 +49,13 @@ // validators have already been handled by displayPage. return true; } - + function run($dbi, $argstr, &$request, $basepage) { if (!$basepage) { return $this->error("$basepage unset?"); } include_once("lib/BlockParser.php"); - $page = $request->getPage($basepage); + $page = $request->getPage($basepage); return HTML::div(array('class'=>'boxright'), TransformText($argstr)); } Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/CacheTest.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -2,7 +2,7 @@ rcs_id('$Id$'); /* * Copyright (C) 2002 Johannes Große - * + * * This file is part of PhpWiki. * * PhpWiki is free software; you can redistribute it and/or modify Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/Calendar.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -59,21 +59,21 @@ 'month_format' => '%B %Y', 'wday_format' => '%a', 'start_wday' => '1', // start now with Monday - 'display_weeknum' => 0); + 'display_weeknum' => 0); } /** - * return links (static only as of action=edit) + * return links (static only as of action=edit) * * @param string $argstr The plugin argument string. * @param string $basepage The pagename the plugin is invoked from. * @return array List of pagenames linked to (or false). */ function getWikiPageLinks ($argstr, $basepage) { - if (isset($this->_links)) + if (isset($this->_links)) return $this->_links; else { - global $request; + global $request; $this->run($request->_dbi, $argstr, $request, $basepage); return $this->_links; } @@ -126,7 +126,7 @@ $fs = $this->args['wday_format']; $row = HTML::tr(); $row->setattr('class', 'cal-dayname'); - if ($this->args['display_weeknum']) + if ($this->args['display_weeknum']) $row->pushContent(HTML::td(array('class' => 'cal-dayname', 'align' => 'center'), _("Wk"))); @@ -197,7 +197,7 @@ 1, // mday (1-31) $args['year']); - $colnum = $args['display_weeknum'] ? 8 : 7; + $colnum = $args['display_weeknum'] ? 8 : 7; $cal = HTML::table(array('cellspacing' => 0, 'cellpadding' => 2, 'class' => 'cal'), @@ -216,9 +216,9 @@ $tbody = HTML::tbody(); $row = HTML::tr(); - if ($args['display_weeknum']) + if ($args['display_weeknum']) $row->pushContent(HTML::td(array('class' => 'cal-weeknum'), - ((int)strftime("%U", $time))+1)); // %U problem. starts with 0 + ((int)strftime("%U", $time))+1)); // %U problem. starts with 0 $col = (7 + $t['tm_wday'] - $args['start_wday']) % 7; if ($col > 0) $row->pushContent(HTML::td(array('colspan' => $col))); @@ -235,9 +235,9 @@ $time += SECONDS_PER_DAY; $t = localtime($time, 1); $done = $t['tm_mday'] == 1; - if (!$col and !$done and $args['display_weeknum']) - $row->pushContent(HTML::td(array('class' => 'cal-weeknum'), - ((int)strftime("%U", $time))+1)); // starts with 0 + if (!$col and !$done and $args['display_weeknum']) + $row->pushContent(HTML::td(array('class' => 'cal-weeknum'), + ((int)strftime("%U", $time))+1)); // starts with 0 } if ($row->getContent()) { Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/CalendarList.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -22,19 +22,19 @@ */ // if not defined in config.ini -if (!defined('PLUGIN_CALENDARLIST_ORDER')) - define('PLUGIN_CALENDARLIST_ORDER', 'normal'); +if (!defined('PLUGIN_CALENDARLIST_ORDER')) + define('PLUGIN_CALENDARLIST_ORDER', 'normal'); if (!defined('PLUGIN_CALENDARLIST_NEXT_N_DAYS')) define('PLUGIN_CALENDARLIST_NEXT_N_DAYS',''); -if (!defined('PLUGIN_CALENDARLIST_NEXT_N')) - define('PLUGIN_CALENDARLIST_NEXT_N', ''); +if (!defined('PLUGIN_CALENDARLIST_NEXT_N')) + define('PLUGIN_CALENDARLIST_NEXT_N', ''); if (!defined('PLUGIN_CALENDARLIST_LAST_N_DAYS')) define('PLUGIN_CALENDARLIST_LAST_N_DAYS',''); -if (!defined('PLUGIN_CALENDARLIST_LAST_N')) - define('PLUGIN_CALENDARLIST_LAST_N', ''); +if (!defined('PLUGIN_CALENDARLIST_LAST_N')) + define('PLUGIN_CALENDARLIST_LAST_N', ''); /** - * This is a list of calendar appointments. + * This is a list of calendar appointments. * Same arguments as Calendar, so no one is confused * Uses <dl><dd>DATE<dt>page contents... * Derived from Calendar.php by Martin Norbäck <ma...@sa...> @@ -66,16 +66,16 @@ function getDefaultArguments() { return array('prefix' => '[pagename]', 'date_format' => '%Y-%m-%d', - 'order' => PLUGIN_CALENDARLIST_ORDER, // normal or reverse (report sequence) + 'order' => PLUGIN_CALENDARLIST_ORDER, // normal or reverse (report sequence) 'year' => '', 'month' => '', 'month_offset' => 0, //support ranges: next n days/events - 'next_n_days' => PLUGIN_CALENDARLIST_NEXT_N_DAYS, // one or the other, not both - 'next_n' => PLUGIN_CALENDARLIST_NEXT_N, + 'next_n_days' => PLUGIN_CALENDARLIST_NEXT_N_DAYS, // one or the other, not both + 'next_n' => PLUGIN_CALENDARLIST_NEXT_N, // last n days/entries: - 'last_n_days' => PLUGIN_CALENDARLIST_LAST_N_DAYS, // one or the other, not both - 'last_n' => PLUGIN_CALENDARLIST_LAST_N, + 'last_n_days' => PLUGIN_CALENDARLIST_LAST_N_DAYS, // one or the other, not both + 'last_n' => PLUGIN_CALENDARLIST_LAST_N, 'month_format' => '%B %Y', 'wday_format' => '%a', @@ -83,40 +83,40 @@ } /** - * return links (static only as of action=edit) + * return links (static only as of action=edit) * * @param string $argstr The plugin argument string. * @param string $basepage The pagename the plugin is invoked from. * @return array List of pagenames linked to (or false). */ function getWikiPageLinks ($argstr, $basepage) { - if (isset($this->_links)) + if (isset($this->_links)) return $this->_links; else { - global $request; + global $request; $this->run($request->_dbi, $argstr, $request, $basepage); return $this->_links; } } function _count_events($dbi, $n = 7, $direction = 1) { - // This is used by the last_n/next_n options to determine the date that - // accounts for the number of N events in the past/future. - // RETURNS: date of N-th event or the last item found - $args = &$this->args; // gather the args array - $timeTMP = time(); // start with today's date - $t = $timeTMP; // init the control date variable to now - - for ($i=0; $i<=180; $i++) { // loop thru 180 days, past or future + // This is used by the last_n/next_n options to determine the date that + // accounts for the number of N events in the past/future. + // RETURNS: date of N-th event or the last item found + $args = &$this->args; // gather the args array + $timeTMP = time(); // start with today's date + $t = $timeTMP; // init the control date variable to now + + for ($i=0; $i<=180; $i++) { // loop thru 180 days, past or future $date_string = strftime($args['date_format'], $t); $page_for_date = $args['prefix'] . SUBPAGE_SEPARATOR . $date_string; if ($dbi->isWikiPage($page_for_date)) { // if this date has any comments/events - $timeTMP = $t; // capture the date of this event for return - if ($n-- <= 0) break; // if we reached the limit, return the date + $timeTMP = $t; // capture the date of this event for return + if ($n-- <= 0) break; // if we reached the limit, return the date } - $t += 24 * 3600 * $direction; // advance one day back or forward + $t += 24 * 3600 * $direction; // advance one day back or forward } - + // return the date of the N-th or last, most past/future event in the range return $timeTMP; } @@ -168,7 +168,7 @@ } $base = mktime(0, 0, 0, // h, m, s $args['month'], // month 1-12 - $args['mday'], + $args['mday'], $args['year']); // must have base 1900 // *************************************************** @@ -223,7 +223,7 @@ for ($i = $start; ($step > 0) ? $i < $end : $i > $end; $i += $step) { $cal->pushContent($this->_date($dbi, $i)); } - // end of Plugin CalendarList display logic + // end of Plugin CalendarList display logic // *************************************************** return $cal; Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/Chart.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -62,12 +62,12 @@ function getDefaultArguments() { return array('width' => 200, 'height' => 200, - 'type' => 'line', // or 'area', 'bar', 'pie' + 'type' => 'line', // or 'area', 'bar', 'pie' // 'xlabel' => 'x', // TODO // 'ylabel' => 'y', // TODO - 'color' => 'green', - // 'legend' => false, // TODO - 'data' => false // mandatory + 'color' => 'green', + // 'legend' => false, // TODO + 'data' => false // mandatory ); } function handle_plugin_args_cruft(&$argstr, &$args) { @@ -140,9 +140,9 @@ } } - $embedargs = array('width' => $args['width'], - 'height' => $args['height'], - 'script' => $source); + $embedargs = array('width' => $args['width'], + 'height' => $args['height'], + 'script' => $source); $embed = new SVG_HTML("embed", $embedargs); $html->pushContent($embed); return $html; Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/CreateBib.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -23,9 +23,9 @@ /** * CreateBib: Automatically create a BibTex file from page * - * Usage: + * Usage: * <?plugin CreateBib pagename||=whatever ?> - * + * * @author: Lea Viljanen */ @@ -52,18 +52,18 @@ function preg_quote ($heading) { return str_replace(array("/",".","?","*"), - array('\/','\.','\?','\*'), $heading); + array('\/','\.','\?','\*'), $heading); } - + // Have to include the $starttag and $endtag to the regexps... - function extractBibTeX (&$content, $starttag, $endtag) + function extractBibTeX (&$content, $starttag, $endtag) { $bib = array(); $start = false; $stop = false; - for ($i=0; $i<count($content); $i++) + for ($i=0; $i<count($content); $i++) { // $starttag shows when to start if (preg_match('/^@/',$content[$i],$match)) { @@ -87,7 +87,7 @@ $articles = array(); for ($i=0; $i<count($content); $i++) { // Should match "* [WikiPageName] whatever" - //if (preg_match('/^\s*\*\s+(\[.+\])/',$content[$i],$match)) + //if (preg_match('/^\s*\*\s+(\[.+\])/',$content[$i],$match)) if (preg_match('/^\s*\*\s+\[(.+)\]/',$content[$i],$match)) { $articles[] = $match[1]; @@ -95,8 +95,8 @@ } return $articles; } - + function dumpFile(&$thispage, $filename) { include_once("lib/loadsave.php"); $mailified = MailifyPage($thispage); @@ -126,14 +126,14 @@ $current = $page->getCurrentRevision(); $content = $current->getContent(); - // Prepare the button to trigger dumping - $dump_url = $request->getURLtoSelf(array("file" => "tube.bib")); + // Prepare the button to trigger dumping + $dump_url = $request->getURLtoSelf(array("file" => "tube.bib")); global $WikiTheme; - $dump_button = $WikiTheme->makeButton("To File", - $dump_url , 'foo'); + $dump_button = $WikiTheme->makeButton("To File", + $dump_url , 'foo'); $html = HTML::div(array('class' => 'bib','align' => 'left')); - $html->pushContent($dump_button, ' '); + $html->pushContent($dump_button, ' '); $list = HTML::pre(array('id'=>'biblist', 'class' => 'bib')); // Let's find the subpages @@ -162,7 +162,7 @@ $c = $p->getCurrentRevision(); $pagedata = $c->getContent(); $this->dumpFile($pagedata, $request->getArg('file')); - } + } return $html; } Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/CreatePage.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -21,12 +21,12 @@ */ /** - * This allows you to create a page getting the new pagename from a - * forms-based interface, and optionally with the initial content from - * some template, plus expansion of some variables via %%variable%% statements + * This allows you to create a page getting the new pagename from a + * forms-based interface, and optionally with the initial content from + * some template, plus expansion of some variables via %%variable%% statements * in the template. * - * Put <?plugin-form CreatePage ?> at some page, browse this page, + * Put <?plugin-form CreatePage ?> at some page, browse this page, * enter the name of the page to create, then click the button. * * Usage: <?plugin-form CreatePage template=SomeTemplatePage vars="year=2004&name=None" ?> @@ -69,45 +69,45 @@ $s = trim($s); if (!$s) { return $this->error(_("Cannot create page with empty name!")); - } - // TODO: javascript warning if "/" or SUBPAGE_SEPARATOR in s - if ($verify) { - $head = _("CreatePage failed"); - if ($dbi->isWikiPage($verify)) { - $msg = _("Do you really want to create the page '%s'?"); - } else { - $msg = _("Do you really want to create the page '%s'?"); - } - if (isSubPage($s)) { - $main = subPageSlice(0); - if (!$dbi->isWikiPage(subPageSlice(0))) { - $msg .= "\n" . _("The new page you want to create will be a subpage.") - . "\n" . _("Subpages cannot be created unless the parent page exists."); - return alert($head, $msg); - } else { - $msg .= "\n" . _("The new page you want to create will be a subpage."); - } - } - if (strpos($s, " \/")) { - $msg .= "\n" . _("Subpages with ending space are not allowed as directory name on Windows."); - return alert($head, $msg); - } - } + } + // TODO: javascript warning if "/" or SUBPAGE_SEPARATOR in s + if ($verify) { + $head = _("CreatePage failed"); + if ($dbi->isWikiPage($verify)) { + $msg = _("Do you really want to create the page '%s'?"); + } else { + $msg = _("Do you really want to create the page '%s'?"); + } + if (isSubPage($s)) { + $main = subPageSlice(0); + if (!$dbi->isWikiPage(subPageSlice(0))) { + $msg .= "\n" . _("The new page you want to create will be a subpage.") + . "\n" . _("Subpages cannot be created unless the parent page exists."); + return alert($head, $msg); + } else { + $msg .= "\n" . _("The new page you want to create will be a subpage."); + } + } + if (strpos($s, " \/")) { + $msg .= "\n" . _("Subpages with ending space are not allowed as directory name on Windows."); + return alert($head, $msg); + } + } $param = array('action' => 'edit'); if ($template and $dbi->isWikiPage($template)) { $param['template'] = $template; - } elseif (!empty($initial_content)) { + } elseif (!empty($initial_content)) { // Warning! Potential URI overflow here on the GET redirect. Better use template. $param['initial_content'] = $initial_content; } - // If the initial_content is too large, pre-save the content in the page + // If the initial_content is too large, pre-save the content in the page // and redirect without that argument. // URI length limit: // http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.2.1 $url = WikiURL($s, $param, 'absurl'); // FIXME: expand vars in templates here. - if (strlen($url) > 255 + if (strlen($url) > 255 or ($param['template']) or preg_match('/%%\w+%%/', $initial_content)) // need variable expansion { @@ -116,7 +116,7 @@ $page = $dbi->getPage($s); $current = $page->getCurrentRevision(); $version = $current->getVersion(); - // overwrite empty (deleted) pages + // overwrite empty (deleted) pages if ($version and !$current->hasDefaultContents() and !$overwrite) { return $this->error(fmt("%s already exists", WikiLink($s))); } else { @@ -129,15 +129,15 @@ $initial_content = $currenttmpl->getPackedContent(); $meta['markup'] = $currenttmpl->_data['markup']; - if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) { - $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "", - $initial_content); - } + if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) { + $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "", + $initial_content); + } } $meta['summary'] = _("Created by CreatePage"); - $content = $this->doVariableExpansion($initial_content, $vars, $s, $request); + $content = $this->doVariableExpansion($initial_content, $vars, $s, $request); - if ($content !== $initial_content) { + if ($content !== $initial_content) { // need to destroy the template so that editpage doesn't overwrite it. unset($param['template']); $url = WikiURL($s, $param, 'absurl'); Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2010-03-04 10:30:39 UTC (rev 7301) +++ trunk/lib/plugin/CreateToc.php 2010-03-04 10:48:07 UTC (rev 7302) @@ -130,7 +130,7 @@ function preg_quote ($heading) { return str_replace(array("/",".","?","*"), - array('\/','\.','\?','\*'), $heading); + array('\/','\.','\?','\*'), $heading); } // Get HTML header corresponding to current level (level is set of ! or =) @@ -173,55 +173,55 @@ $level, &$hstart, &$hend, $basepage=false) { $hstart = 0; $hend = 0; - $h = $this->_getHeader($level); + $h = $this->_getHeader($level); $qheading = $this->_quote($heading); - for ($j=$start_index; $j < count($content); $j++) { + for ($j=$start_index; $j < count($content); $j++) { if (is_string($content[$j])) { - if (preg_match("/<$h>$qheading<\/$h>/", - $content[$j])) - return $j; + if (preg_match("/<$h>$qheading<\/$h>/", + $content[$j])) + return $j; } elseif (isa($content[$j], 'cached_link')) { - if (method_exists($content[$j],'asXML')) { - $content[$j]->_basepage = $basepage; - $content[$j] = $content[$j]->asXML(); - } else - $content[$j] = $content[$j]->asString(); - // shortcut for single wikiword or link headers - if ($content[$j] == $heading - and substr($content[$j-1],-4,4) == "<$h>" - and substr($content[$j+1],0,5) == "</$h>") - { - $hstart = $j-1; - $hend = $j+1; - retur... [truncated message content] |
From: <var...@us...> - 2010-05-19 09:05:18
|
Revision: 7415 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7415&view=rev Author: vargenau Date: 2010-05-19 09:05:11 +0000 (Wed, 19 May 2010) Log Message: ----------- Remove Revision from svn:keywords Property Changed: ---------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Property changes on: trunk/lib/plugin/AddComment.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AllPages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AllUsers.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AnalyseAccessLogSql.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AppendText.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AsciiMath.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AsciiSVG.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/AuthorHistory.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/BackLinks.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/BlogArchives.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/BlogJournal.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/BoxRight.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CacheTest.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Calendar.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CalendarList.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CategoryPage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Chart.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Comment.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CreateBib.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CreatePage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CreateToc.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/CurrentTime.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/DeadEndPages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Diff.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/DynamicIncludePage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/EditMetaData.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/ExternalSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/FileInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/FoafViewer.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/FrameInclude.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/FullTextSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/FuzzyPages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/GoTo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/GoogleMaps.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/GooglePlugin.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/GraphViz.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/HelloWorld.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/HtmlConverter.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Imdb.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/IncludePage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/IncludePages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/IncludeSiteMap.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/IncludeTree.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/InterWikiSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/JabberPresence.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/LdapSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/LikePages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/LinkDatabase.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/LinkSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/ListPages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/ListRelations.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/ListSubpages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/MediawikiTable.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/ModeratedPage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/MostPopular.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/NewPagesPerUser.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/NoCache.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/OldStyleTable.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/OrphanedPages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PageDump.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PageGroup.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PageHistory.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PageInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PageTrail.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PasswordReset.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PhotoAlbum.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PhpHighlight.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PhpWeather.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Ploticus.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PluginManager.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PopUp.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PopularNearby.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PopularTags.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PreferenceApp.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/PrevNext.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Processing.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RandomPage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RateIt.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RawHtml.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RecentChanges.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RecentChangesCached.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RecentComments.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RecentEdits.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RecentReferrers.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RedirectTo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RelatedChanges.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RichTable.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/RssFeed.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SearchHighlight.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SemanticRelations.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SemanticSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SemanticSearchAdvanced.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SiteMap.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SpellCheck.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SqlResult.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SyncWiki.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SyntaxHighlighter.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/SystemInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/TeX2png.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Template.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/TexToPng.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/TitleSearch.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Transclude.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/TranslateText.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/UnfoldSubpages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/UpLoad.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/UriResolver.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/UserPreferences.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/UserRatings.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/Video.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/VisualWiki.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WantedPages.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WantedPagesOld.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WatchPage.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WhoIsOnline.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminChmod.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminChown.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminMarkup.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminPurge.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminRemove.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminRename.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminSearchReplace.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminSelect.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminSetAcl.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminSetExternal.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiAdminUtils.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiBlog.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiForm.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiFormRich.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiForum.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikiPoll.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/WikicreoleTable.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/YouTube.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/_AuthInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/_BackendInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/_GroupInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/_PreferencesInfo.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/_Retransform.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/_WikiTranslation.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id Property changes on: trunk/lib/plugin/text2png.php ___________________________________________________________________ Modified: svn:keywords - Id Revision + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-19 09:41:25
|
Revision: 7416 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7416&view=rev Author: vargenau Date: 2010-05-19 09:41:19 +0000 (Wed, 19 May 2010) Log Message: ----------- RIP php-4.0.4pl1 Modified Paths: -------------- trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RelatedChanges.php Modified: trunk/lib/plugin/RecentComments.php =================================================================== --- trunk/lib/plugin/RecentComments.php 2010-05-19 09:05:11 UTC (rev 7415) +++ trunk/lib/plugin/RecentComments.php 2010-05-19 09:41:19 UTC (rev 7416) @@ -41,11 +41,7 @@ } function getDefaultArguments() { - //php-4.0.4pl1 breaks at the parent:: line even if the - // code doesn't reach this line - //if (!check_php_version(4,0,6)) - $args = WikiPlugin_RecentChanges::getDefaultArguments(); - //else $args = parent::getDefaultArguments(); + $args = parent::getDefaultArguments(); $args['show_minor'] = false; $args['show_all'] = true; $args['caption'] = _("Recent Comments"); Modified: trunk/lib/plugin/RelatedChanges.php =================================================================== --- trunk/lib/plugin/RelatedChanges.php 2010-05-19 09:05:11 UTC (rev 7415) +++ trunk/lib/plugin/RelatedChanges.php 2010-05-19 09:41:19 UTC (rev 7416) @@ -50,11 +50,7 @@ } function getDefaultArguments() { - //php-4.0.4pl1 breaks at the parent:: line even if the - // code doesn't reach this line - //if (!check_php_version(4,0,6)) - $args = WikiPlugin_RecentChanges::getDefaultArguments(); - //else $args = parent::getDefaultArguments(); + $args = parent::getDefaultArguments(); $args['page'] = '[pagename]'; $args['show_minor'] = true; $args['show_all'] = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-31 11:29:48
|
Revision: 7447 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7447&view=rev Author: vargenau Date: 2010-05-31 11:29:39 +0000 (Mon, 31 May 2010) Log Message: ----------- Use Wikicreole syntax for plugins in comments Modified Paths: -------------- trunk/lib/plugin/CacheTest.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/Template.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/VisualWiki.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/_WikiTranslation.php Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/CacheTest.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -36,7 +36,7 @@ | | You may call this plugin as follows: | - | <?plugin CacheTest text="What a wonderful test!" ?> + | <<CacheTest text="What a wonderful test!" >> | /*----------------------------------------------------------------------- Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/CalendarList.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -40,8 +40,8 @@ * Derived from Calendar.php by Martin Norbäck <ma...@sa...> * * Insert this plugin into your Calendar page, for example in WikiUser/Calendar: - * <?plugin Calendar ?> - * <?plugin CalendarList ?> + * <<Calendar >> + * <<CalendarList >> * * Honors now year + month args as start base - together with Calendar navigation. * The behaviour before 2007 with last/next_n_days was to start now. Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/CreateBib.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,7 +24,7 @@ * CreateBib: Automatically create a BibTex file from page * * Usage: - * <?plugin CreateBib pagename||=whatever ?> + * <<CreateBib pagename||=whatever >> * * @author: Lea Viljanen */ Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/CurrentTime.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -46,8 +46,8 @@ * A simple plugin that displays current time and date. * * Usage: - * <?plugin CurrentTime?> - * <?plugin CurrentTime format=XXX ?> + * <<CurrentTime>> + * <<CurrentTime format=XXX >> */ class WikiPlugin_CurrentTime Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/DynamicIncludePage.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ /** * DynamicIncludePage - Include wikipage asynchronously. Icon to show/hide. - * Usage: <?plugin DynamicIncludePage page=OtherPage state=true ...?> + * Usage: <<DynamicIncludePage page=OtherPage state=true ...>> * Author: Reini Urban */ Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/FileInfo.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,9 +26,9 @@ * Only files relative and below to the uploads path can be handled. * * Usage: - * <?plugin FileInfo file=Upload:setup.exe display=version,date ?> - * <?plugin FileInfo file=Upload:setup.exe display=name,version,date - * format="%s (version: %s, date: %s)" ?> + * <<FileInfo file=Upload:setup.exe display=version,date >> + * <<FileInfo file=Upload:setup.exe display=name,version,date + * format="%s (version: %s, date: %s)" >> * * @author: ReiniUrban */ Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/FrameInclude.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,8 +24,8 @@ * FrameInclude: Displays a url or page in a seperate frame inside our body. * * Usage: - * <?plugin FrameInclude src=http://www.internet-technology.de/fourwins_de.htm ?> - * <?plugin FrameInclude page=OtherPage ?> + * <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >> + * <<FrameInclude page=OtherPage >> * at the VERY BEGINNING in the content! * * Author: Reini Urban <ru...@x-...>, rewrite by Jeff Dairiki <da...@da...> Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/GoTo.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,7 +26,7 @@ * that page; if not, edit (create) that page. * Note: pagenames are absolute, not relative to the actual subpage. * - * Usage: <?plugin GoTo ?> + * Usage: <<GoTo >> * @author: Michael van Dam */ Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/GoogleMaps.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -30,7 +30,7 @@ * Then enter the key in config/config.ini under GOOGLE_LICENSE_KEY= * * Usage: - * <?plugin GoogleMaps + * <<GoogleMaps * Latitude=53.053 * Longitude=7.803 * ZoomFactor=10 @@ -40,7 +40,7 @@ * MapType=Map|Satellite|Hybrid * width=500px * height=400px - * ?> + * >> * * @author Reini Urban * Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/GraphViz.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -31,9 +31,9 @@ * EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested. * * Usage: -<?plugin GraphViz [options...] +<<GraphViz [options...] multiline dot script ... -?> +>> * See also: VisualWiki, which depends on GraphViz and WikiPluginCached. * @@ -176,7 +176,7 @@ $imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES']; $imgtypes = array_merge($imgtypes, array("svg", "svgz", "ps"), $this->_mapTypes()); $helparr = array( - '<?plugin GraphViz ' . + '<<GraphViz ' . 'imgtype' => ' = "' . $def['imgtype'] . "(default)|" . join('|',$imgtypes).'"', 'alt' => ' = "alternate image text"', 'pages' => ' = "pagenames,*" or <!plugin-list !> pagelist as input', Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/HelloWorld.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,13 +24,13 @@ * A simple demonstration WikiPlugin. * * Usage: - * <?plugin HelloWorld?> - * <?plugin HelloWorld + * <<HelloWorld?> + * <<HelloWorld * salutation="Greetings, " * name=Wikimeister - * ?> - * <?plugin HelloWorld salutation=Hi ?> - * <?plugin HelloWorld name=WabiSabi ?> + * >> + * <<HelloWorld salutation=Hi >> + * <<HelloWorld name=WabiSabi >> */ // Constants are defined before the class. Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/HtmlConverter.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,7 +26,7 @@ * copied and pasted into a wiki page. * Credit to an unknown programmer, who has provided the first * version 0.01 on http://www.gpgstudy.com/striphtml.phps - * Usage: <?plugin HtmlConverter ?> + * Usage: <<HtmlConverter >> * Author: HendrikScheider <hen...@wi...> */ Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/Imdb.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,11 +26,11 @@ * "imdb = mysql://user:pass@localhost/imdb" in lib/plugin/SqlResult.ini * * Queries: - * <?plugin Imdb query=movie_main title||="Sample Movie (2002)" ?> - * <?plugin Imdb query=movie_combined title||="Sample Movie (2002)" ?> - * <?plugin Imdb query=movie_full title||="Sample Movie (2002)" ?> - * <?plugin Imdb query=movie_company_credits title||="Sample Movie (2002)" ?> - * <?plugin Imdb query=name name||="Lastname, Firstname (I)" ?> + * <<Imdb query=movie_main title||="Sample Movie (2002)" >> + * <<Imdb query=movie_combined title||="Sample Movie (2002)" >> + * <<Imdb query=movie_full title||="Sample Movie (2002)" >> + * <<Imdb query=movie_company_credits title||="Sample Movie (2002)" >> + * <<Imdb query=name name||="Lastname, Firstname (I)" >> * More title queries: * business, moviebudgets, colorinfo, mpaaratingsreasons, * akatitles, alternateversions, miscellaneouscompanies, moviecountries, Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/IncludePage.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -23,7 +23,7 @@ /** * IncludePage: include text from another wiki page in this one - * usage: <?plugin IncludePage page=OtherPage rev=6 quiet=1 words=50 lines=6?> + * usage: <<IncludePage page=OtherPage rev=6 quiet=1 words=50 lines=6>> * author: Joe Edelman <jo...@or...> */ Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/IncludePages.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ /** * IncludePages: Include a list of multiple pages, based on IncludePage. - * usage: <?plugin IncludePages pages=<!plugin-list BackLinks !> ?> + * usage: <<IncludePages pages=<!plugin-list BackLinks !> >> * author: ReiniUrban */ Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/JabberPresence.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,8 +26,8 @@ * http://edgar.netflint.net/howto.php * * Usage: - * <?plugin JabberPresence scripturl=http://edgar.netflint.net/status.php - * jid=yourid@jabberserver type=html iconset=phpbb ?> + * <<JabberPresence scripturl=http://edgar.netflint.net/status.php + * jid=yourid@jabberserver type=html iconset=phpbb >> * * @author: Arnaud Fontaine */ Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/LdapSearch.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -28,21 +28,21 @@ * TODO: Return a pagelist on certain attributes * * Usage Samples: - <?plugin LdapSearch?> - <?plugin LdapSearch + <<LdapSearch>> + <<LdapSearch host="localhost" port=389 basedn="" filter="(cn=*)" attributes="" - ?> - <?plugin LdapSearch host=ldap.example.com filter="(ou=web-team)" - attributes="sn cn telephonenumber" ?> - <?plugin LdapSearch host="ldap.itd.umich.edu" basedn="" filter="(sn=jensen)" attributes="cn drink" ?> - <?plugin LdapSearch host=ldap.example.com attributes="cn sn telephonenumber" ?> - <?plugin LdapSearch host=bugs.debian.org port=10101 basedn="dc=current,dc=bugs,dc=debian,dc=org" + >> + <<LdapSearch host=ldap.example.com filter="(ou=web-team)" + attributes="sn cn telephonenumber" >> + <<LdapSearch host="ldap.itd.umich.edu" basedn="" filter="(sn=jensen)" attributes="cn drink" >> + <<LdapSearch host=ldap.example.com attributes="cn sn telephonenumber" >> + <<LdapSearch host=bugs.debian.org port=10101 basedn="dc=current,dc=bugs,dc=debian,dc=org" filter="(debbugsPackage=phpwiki)" - attributes="debbugsSeverity debbugsState debbugsTitle" ?> + attributes="debbugsSeverity debbugsState debbugsTitle" >> * @author John Lines */ Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/ListSubpages.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -23,7 +23,7 @@ /** * ListSubpages: Lists the names of all SubPages of the current page. * Based on UnfoldSubpages. - * Usage: <?plugin ListSubpages noheader=1 info=pagename,hits,mtime ?> + * Usage: <<ListSubpages noheader=1 info=pagename,hits,mtime >> */ require_once('lib/PageList.php'); Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/ModeratedPage.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -429,14 +429,14 @@ if ($parsed = $loader->parsePI($pi)) { $plugin =& $parsed[1]; if ($plugin->getName() != _("ModeratedPage")) - return $this->error(sprintf(_("<?plugin ModeratedPage ... ?> not found in first line of %s"), + return $this->error(sprintf(_("<<ModeratedPage ... >> not found in first line of %s"), $action_page->getName())); if (!$action_page->get('locked')) return $this->error(sprintf(_("%s is not locked!"), $action_page->getName())); return $plugin->resolve_argstr($request, $parsed[2]); } else { - return $this->error(sprintf(_("<?plugin ModeratedPage ... ?> not found in first line of %s"), + return $this->error(sprintf(_("<<ModeratedPage ... >> not found in first line of %s"), $action_page->getName())); } } Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/NoCache.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,9 +26,9 @@ * display dynamic content. * * Usage: - * <?plugin NoCache ?> + * <<NoCache >> * or to delete the whole cache for this page: - * <?plugin NoCache nocache||=purge ?> + * <<NoCache nocache||=purge >> * * Author: Reini Urban <ru...@x-...> * Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/OldStyleTable.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,12 +26,12 @@ * * Usage: * <pre> - * <?plugin OldStyleTable border||=0 summary="" + * <<OldStyleTable border||=0 summary="" * || __Name__ |v __Cost__ |v __Notes__ * | __First__ | __Last__ * |> Jeff |< Dairiki |^ Cheap |< Not worth it * |> Marco |< Polo | Cheaper |< Not available - * ?> + * >> * </pre> * * Note that multiple <code>|</code>'s lead to spanned columns, Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PageDump.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -40,9 +40,9 @@ * http://...phpwiki/index.php?PageDump&page=HomePage * http://...phpwiki/index.php?PageDump&page=HomePage&download=1 * Static: - * <?plugin PageDump page=HomePage?> + * <<PageDump page=HomePage>> * Dynamic form (put both on the page): - * <?plugin PageDump?> + * <<PageDump>> * <?plugin-form PageDump?> * Typical usage: as actionbar button */ Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PageGroup.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,16 +24,16 @@ /** * Usage: * - * <?plugin PageGroup parent=MyTableOfContents ?> + * <<PageGroup parent=MyTableOfContents >> * - * <?plugin PageGroup + * <<PageGroup * parent=MyTableOfContents * label="Visit more pages in MyTableOfContents" - * ?> + * >> * - * <?plugin PageGroup parent=MyTableOfContents section=PartTwo loop=true ?> + * <<PageGroup parent=MyTableOfContents section=PartTwo loop=true >> * - * <?plugin PageGroup parent=MyTableOfContents loop=1 ?> + * <<PageGroup parent=MyTableOfContents loop=1 >> * * * Updated to use new HTML(). It mostly works, but it's still a giant hackish mess. Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PageTrail.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -27,9 +27,9 @@ * But Cache should be turned off then. * * Usage: - * <?plugin PageTrail?> - * <?plugin PageTrail numberlinks=5?> - * <?plugin PageTrail invisible=1?> + * <<PageTrail>> + * <<PageTrail numberlinks=5>> + * <<PageTrail invisible=1>> */ if (!defined('PAGETRAIL_ARROW')) Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PhotoAlbum.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -29,7 +29,7 @@ * Thomas Harding (slides mode, real thumbnails) * * Usage: - * <?plugin PhotoAlbum + * <<PhotoAlbum * src="http://server/textfile" or localfile or localdir * mode=[normal|column|row|thumbs|tiles|list|slide] * desc=true @@ -39,7 +39,7 @@ * thumbswidth=80 * align=[center|left|right] * duration=6 - * ?> + * >> * * "src": textfile of images or directory of images or a single image (local or remote) * Local or remote e.g. http://myserver/images/MyPhotos.txt or http://myserver/images/ Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PhpHighlight.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,9 +26,9 @@ * arguments to pretty-print PHP code. * * Usage: - * <?plugin PhpHighlight default='#FF0000' comment='#0000CC' + * <<PhpHighlight default='#FF0000' comment='#0000CC' * code that should be highlighted - * ?> + * >> * * You do not have to add '<?php' and '?>' to the code - the plugin * does this automatically if you do not set wrap to 0. @@ -46,10 +46,10 @@ * Added ability to override colors defined in php.ini --Carsten Klapp * * Known Problems: - * <?plugin PhpHighlight + * <<PhpHighlight * testing[somearray]; * testing~[badworkaround~]; - * ?> + * >> * will swallow "[somearray]" */ Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PhpWeather.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -28,12 +28,12 @@ * * Usage: * - * <?plugin PhpWeather ?> - * <?plugin PhpWeather menu=true ?> - * <?plugin PhpWeather icao=KJFK ?> - * <?plugin PhpWeather language=en ?> - * <?plugin PhpWeather units=only_metric ?> - * <?plugin PhpWeather icao||=CYYZ cc||=CA language||=en menu=true ?> + * <<PhpWeather >> + * <<PhpWeather menu=true >> + * <<PhpWeather icao=KJFK >> + * <<PhpWeather language=en >> + * <<PhpWeather units=only_metric >> + * <<PhpWeather icao||=CYYZ cc||=CA language||=en menu=true >> * * If you want a menu, and you also want to change the default station * or language, then you have to use the ||= form, or else the user Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/Ploticus.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -37,11 +37,11 @@ * This will be fixed soon. * * Usage: -<?plugin Ploticus device=png [ploticus options...] +<<Ploticus device=png [ploticus options...] multiline ploticus script ... -?> +>> * or without any script: (not tested) -<?plugin Ploticus -prefab vbars data=myfile.dat delim=tab y=1 clickmapurl="http://mywiki.url/wiki/?pagename=@2" clickmaplabel="@3" -csmap ?> +<<Ploticus -prefab vbars data=myfile.dat delim=tab y=1 clickmapurl="http://mywiki.url/wiki/?pagename=@2" clickmaplabel="@3" -csmap >> * * TODO: PloticusSql - create intermediate data from SQL. Similar to SqlResult, just in graphic form. * For example to produce nice looking pagehit statistics or ratings statistics. @@ -156,7 +156,7 @@ //$other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES']; //unset ($other_imgtypes[$def['imgtype']]); $helparr = array( - '<?plugin Ploticus ' . + '<<Ploticus ' . 'device' => ' = "' . $def['device'] . "(default)|" . join('|',$GLOBALS['PLUGIN_CACHED_IMGTYPES']).'"', 'data' => ' <!plugin-list !>: pagelist as input', @@ -165,7 +165,7 @@ 'help' => ' bool: displays this screen', '...' => ' all further lines below the first plugin line ', '' => ' and inside the tags are the ploticus script.', - "\n ?>" + "\n >>" ); $length = 0; foreach($helparr as $alignright => $alignleft) { Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PopUp.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -25,7 +25,7 @@ * Display a page in a clickable popup link. * * Usage: - * <?plugin PopUp + * <<PopUp * link="HomePage" * title="PopUpped HomePage" * text="Click here to popup the HomePage" @@ -39,8 +39,8 @@ * status=no * menubar=no * copyhistory=no - * ?> - * <?plugin PopUp close=yes ?> + * >> + * <<PopUp close=yes >> */ class WikiPlugin_PopUp Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PopularNearby.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -28,9 +28,9 @@ */ /* Usage: -* <small><?plugin PopularNearby mode=incoming ?></small> -* <small><?plugin PopularNearby mode=outgoing ?></small> -* <small><?plugin PopularNearby mode=nearby ?></small> +* <<PopularNearby mode=incoming >> +* <<PopularNearby mode=outgoing >> +* <<PopularNearby mode=nearby >> */ Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PopularTags.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -21,8 +21,7 @@ */ /* Usage: - * template tags.tmpl: - * <?plugin PopularTags ?> + * <<PopularTags >> */ require_once('lib/PageList.php'); Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/PrevNext.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin PrevNext prev=PrevLink next=NextLink ?> + * Usage: <<PrevNext prev=PrevLink next=NextLink >> * See also PageGroup which automatically tries to extract the various links * */ Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/RateIt.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -64,13 +64,13 @@ * - Autoclass: simple public domain C library * - MLC++: C++ library http://www.sgi.com/tech/mlc/ * - * Usage: <?plugin RateIt ?> just the widget without text + * Usage: <<RateIt >> just the widget without text * Note: The wikilens theme or any derivate must be enabled, to enable this plugin! - * <?plugin RateIt show=top ?> text plus widget below - * <?plugin RateIt show=ratings ?> to show my ratings - * TODO: <?plugin RateIt show=buddies ?> to show my buddies - * <?plugin RateIt show=ratings dimension=1 ?> - * TODO: <?plugin RateIt show=text ?> just text, no widget, for dumps + * <<RateIt show=top >> text plus widget below + * <<RateIt show=ratings >> to show my ratings + * TODO: <<RateIt show=buddies >> to show my buddies + * <<RateIt show=ratings dimension=1 >> + * TODO: <<RateIt show=text >> just text, no widget, for dumps * * @author: Dan Frankowski (wikilens author), Reini Urban (as plugin) * Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/RedirectTo.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -23,8 +23,8 @@ /** * Redirect to another page or external uri. Kind of PageAlias. * Usage: - * <?plugin RedirectTo href="http://www.internet-technology.de/fourwins_de.htm" ?> - * or <?plugin RedirectTo page=AnotherPage ?> + * <<RedirectTo href="http://www.internet-technology.de/fourwins_de.htm" >> + * or <<RedirectTo page=AnotherPage >> * at the VERY FIRST LINE in the content! Otherwise it will be ignored. * * Author: Reini Urban <ru...@x-...> @@ -65,7 +65,7 @@ if ($href) { /* * Use quotes on the href argument value, like: - * <?plugin RedirectTo href="http://funky.com/a b \" c.htm" ?> + * <<RedirectTo href="http://funky.com/a b \" c.htm" ?> * * Do we want some checking on href to avoid malicious * uses of the plugin? Like stripping tags or hexcode. Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/SqlResult.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -32,17 +32,17 @@ * TODO: paging * * Usage: - * <?plugin SqlResult alias=mysql + * <<SqlResult alias=mysql * SELECT 'mysql password for string "xx":', * PASSWORD('xx') - * ?> - * <?plugin SqlResult alias=videos template=videos + * >> + * <<SqlResult alias=videos template=videos * SELECT rating,title,date * FROM video * ORDER BY rating DESC * LIMIT 5 - * ?> - * <?plugin SqlResult alias=imdb template=imdbmovies where||="Davies, Jeremy%" + * >> + * <<SqlResult alias=imdb template=imdbmovies where||="Davies, Jeremy%" * SELECT m.title, m.date, n.name, c.role * FROM movies as m, names as n, jobs as j, characters as c * WHERE n.name LIKE "%%where%%" @@ -51,7 +51,7 @@ * AND c.job_id = j.job_id * AND j.description = 'Actor' * ORDER BY m.date DESC - * ?> + * >> * * @author: ReiniUrban */ Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/SyntaxHighlighter.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -29,13 +29,13 @@ * syntax: See http://www.andre-simon.de/doku/highlight/highlight.html * style = ["ansi", "gnu", "kr", "java", "linux"] -<?plugin SyntaxHighlighter syntax=c style=kr color=emacs +<<SyntaxHighlighter syntax=c style=kr color=emacs #include <stdio.h> int main() { printf("Lalala\n"); } -?> +>> I did not use beautifier, because it used up more than 8M of memory on my system and PHP killed it. I'm not sure whether this is a problem Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/SystemInfo.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,11 +22,11 @@ */ /** - * Usage: <?plugin SystemInfo all ?> - * or <?plugin SystemInfo pagestats cachestats discspace hitstats ?> - * or <?plugin SystemInfo version ?> - * or <?plugin SystemInfo current_theme ?> - * or <?plugin SystemInfo PHPWIKI_DIR ?> + * Usage: <<SystemInfo all >> + * or <<SystemInfo pagestats cachestats discspace hitstats >> + * or <<SystemInfo version >> + * or <<SystemInfo current_theme >> + * or <<SystemInfo PHPWIKI_DIR >> * * Provide access to phpwiki's lower level system information. * @@ -70,7 +70,7 @@ } function getHtml($dbi, $argarray, $request, $basepage) { $loader = new WikiPluginLoader; - return $loader->expandPI('<?plugin SystemInfo ' + return $loader->expandPI('<<SystemInfo ' . WikiPluginCached::glueArgs($argarray) // all . ' ?>', $request, $this, $basepage); } Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/Template.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,7 +26,7 @@ * Include text from a wiki page and replace certain placeholders by parameters. * Similiar to CreatePage with the template argument, but at run-time. * Similiar to the mediawiki templates but not with the "|" parameter seperator. - * Usage: <?plugin Template page=TemplateFilm vars="title=rurban&year=1999" ?> + * Usage: <<Template page=TemplateFilm vars="title=rurban&year=1999" >> * Author: Reini Urban * See also: http://meta.wikimedia.org/wiki/Help:Template * @@ -51,7 +51,7 @@ * We support a mediawiki-style syntax extension which maps * {{TemplateFilm|title=Some Good Film|year=1999}} * to - * <?plugin Template page=TemplateFilm vars="title=Some Good Film&year=1999" ?> + * <<Template page=TemplateFilm vars="title=Some Good Film&year=1999" >> */ class WikiPlugin_Template Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/Transclude.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,9 +24,9 @@ * Transclude: Include an external web page within the body of a wiki page. * * Usage: - * <?plugin Transclude + * <<Transclude * src=http://www.internet-technology.de/fourwins_de.htm - * ?> + * >> * * @author Geoffrey T. Dairiki * Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/TranslateText.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,9 +24,9 @@ * TranslateText: Translation helper * The (bogus) pagename is the text to be translated. * One required argument: lang - * Requires that an action page with the <?plugin TranslateText ?> line exists. + * Requires that an action page with the <<TranslateText >> line exists. * - * Usually called from <?plugin _WikiTranslation ?> + * Usually called from <<_WikiTranslation >> * Contributed translation are stored in UsersPage/ContributedTranslations * * Examples: Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/UnfoldSubpages.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -25,7 +25,7 @@ * This is e.g. useful for the CalendarPlugin, to see all entries at once. * Warning: Better don't use it with non-existant sections! * The section extractor is currently quite unstable. - * Usage: <?plugin UnfoldSubpages sortby=-mtime words=50 maxpages=5 ?> + * Usage: <<UnfoldSubpages sortby=-mtime words=50 maxpages=5 >> * Author: Reini Urban <ru...@x-...> */ Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/UpLoad.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -25,7 +25,7 @@ /** * UpLoad: Allow Administrator to upload files to a special directory, * which should preferably be added to the InterWikiMap - * Usage: <?plugin UpLoad ?> + * Usage: <<UpLoad >> * Author: NathanGass <ga...@io...> * Changes: ReiniUrban <ru...@x-...>, * qubit <rt...@da...> Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/UserRatings.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -32,7 +32,7 @@ /** * Show a user's ratings in a table, using PageList. * Usage: - * <?plugin UserRatings ?> + * <<UserRatings >> * * This only works with the "wikilens" theme. */ Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/VisualWiki.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -176,7 +176,7 @@ $other_imgtypes = $GLOBALS['PLUGIN_CACHED_IMGTYPES']; unset ($other_imgtypes[$def['imgtype']]); $helparr = array( - '<?plugin '.$this->getName() . + '<<'.$this->getName() . ' img' => ' = "' . $def['imgtype'] . "(default)|" . join('|',$GLOBALS['PLUGIN_CACHED_IMGTYPES']).'"', 'width' => ' = "width in inches"', 'height' => ' = "height in inches"', @@ -192,7 +192,7 @@ 'backlink_nb' => ' = "number of pages with most backlinks"', 'neighbour_list' => ' = "find pages linked from and to these pages"', 'exclude_list' => ' = "colon separated list of pages to be excluded"', - 'include_list' => ' = "colon separated list" ?>' + 'include_list' => ' = "colon separated list" >>' ); $length = 0; foreach($helparr as $alignright => $alignleft) { Modified: trunk/lib/plugin/WikiAdminChmod.php =================================================================== --- trunk/lib/plugin/WikiAdminChmod.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminChmod.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -25,7 +25,7 @@ * Set individual PagePermissions, simplifying effective ACLs to * unix-like rwxr--r--+ permissions. (as in cygwin) * - * Usage: <?plugin WikiAdminChmod ?> or called via WikiAdminSelect + * Usage: <<WikiAdminChmod >> or called via WikiAdminSelect * Author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminChown.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin WikiAdminChown s||=* ?> or called via WikiAdminSelect + * Usage: <<WikiAdminChown s||=* >> or called via WikiAdminSelect * @author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminMarkup.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin WikiAdminMarkup s||=* ?> or called via WikiAdminSelect + * Usage: <<WikiAdminMarkup s||=* >> or called via WikiAdminSelect * @author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminPurge.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin WikiAdminPurge?> + * Usage: <<WikiAdminPurge>> */ require_once('lib/PageList.php'); require_once('lib/plugin/WikiAdminSelect.php'); Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminRemove.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin WikiAdminRemove?> + * Usage: <<WikiAdminRemove>> * Author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminRename.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin WikiAdminRename ?> or called via WikiAdminSelect + * Usage: <<WikiAdminRename >> or called via WikiAdminSelect * @author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -22,7 +22,7 @@ */ /** - * Usage: <?plugin WikiAdminSearchReplace ?> or called via WikiAdminSelect + * Usage: <<WikiAdminSearchReplace >> or called via WikiAdminSelect * Author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiAdminSelect.php =================================================================== --- trunk/lib/plugin/WikiAdminSelect.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminSelect.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -25,7 +25,7 @@ * Allows selection of multiple pages which get passed to other * WikiAdmin plugins then. Then do Rename, Remove, Chmod, Chown, ... * - * Usage: <?plugin WikiAdminSelect?> + * Usage: <<WikiAdminSelect>> * Author: Reini Urban <ru...@x-...> * * This is the base class for most WikiAdmin* classes, using Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,7 +24,7 @@ /** * Set individual PagePermissions * - * Usage: <?plugin WikiAdminSetAcl ?> or called via WikiAdminSelect + * Usage: <<WikiAdminSetAcl >> or called via WikiAdminSelect * Author: Reini Urban <ru...@x-...> * * KNOWN ISSUES: Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiBlog.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -31,7 +31,7 @@ * particular page and provides an input form for adding a new blog. * * USAGE: - * Add <?plugin WikiBlog ?> at your PersonalPage and BlogArchive and + * Add <<WikiBlog >> at your PersonalPage and BlogArchive and * BlogJournal will find the Blog entries automatically. * * Now it is also the base class for all attachable pagetypes: @@ -41,9 +41,9 @@ * * To have the blog show up on a seperate page: * On TopPage, use - * <?plugin WikiBlog mode=add?> + * <<WikiBlog mode=add>> * Create TopPage/Blog with this page as actionpage: - * <?plugin WikiBlog pagename=TopPage mode=show?> + * <<WikiBlog pagename=TopPage mode=show>> * * To have the main ADMIN_USER Blog appear under Blog and not under WikiBlog/Blog * or UserName/Blog as for other users blogs, Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiFormRich.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -52,46 +52,46 @@ * some allow values as list from from <!plugin-list !> Samples: - <?plugin WikiFormRich action=dumpserial method=get + <<WikiFormRich action=dumpserial method=get checkbox[] name=include value="all" editbox[] name=directory value=DEFAULT_DUMP_DIR editbox[] name=pages value=* - editbox[] name=exclude value="" ?> - <?plugin WikiFormRich action=dumphtml method=get + editbox[] name=exclude value="" >> + <<WikiFormRich action=dumphtml method=get editbox[] name=directory value=HTML_DUMP_DIR editbox[] name=pages value="*" - editbox[] name=exclude value="" ?> - <?plugin WikiFormRich action=loadfile method=get + editbox[] name=exclude value="" >> + <<WikiFormRich action=loadfile method=get editbox[] name=source value=DEFAULT_WIKI_PGSRC checkbox[] name=overwrite value=1 - editbox[] name=exclude value="" ?> - <?plugin WikiFormRich action=TitleSearch method=get class=wikiadmin nobr=1 + editbox[] name=exclude value="" >> + <<WikiFormRich action=TitleSearch method=get class=wikiadmin nobr=1 editbox[] name=s text="" submit[] checkbox[] name=case_exact - checkbox[] name=regex ?> - <?plugin WikiFormRich action=FullTextSearch method=get class=wikiadmin nobr=1 + checkbox[] name=regex >> + <<WikiFormRich action=FullTextSearch method=get class=wikiadmin nobr=1 editbox[] name=s text="" submit[] checkbox[] name=case_exact - checkbox[] name=regex ?> - <?plugin WikiFormRich action=FuzzyPages method=get class=wikiadmin nobr=1 + checkbox[] name=regex >> + <<WikiFormRich action=FuzzyPages method=get class=wikiadmin nobr=1 editbox[] name=s text="" submit[] checkbox[] name=case_exact ?> - <?plugin WikiFormRich action=AppendText buttontext="AddPlugin" + <<WikiFormRich action=AppendText buttontext="AddPlugin" radio[] name=s value=<!plugin-list BackLinks page=WikiPlugin limit=10 !> ?> - <?plugin WikiFormRich action=AppendText buttontext="AddPlugin" + <<WikiFormRich action=AppendText buttontext="AddPlugin" pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !> ?> - <?plugin WikiFormRich action=AppendText buttontext="AddCategory" + <<WikiFormRich action=AppendText buttontext="AddCategory" pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !> ?> - <?plugin WikiFormRich action=SemanticSearch buttontext="AddRelation" + <<WikiFormRich action=SemanticSearch buttontext="AddRelation" combobox[] name=relation text="Relation: " method=listRelations ?> - <?plugin WikiFormRich action=AppendText buttontext="InsertTemplate" + <<WikiFormRich action=AppendText buttontext="InsertTemplate" combobox[] name=s text="Template: " method=titleSearch args="Template/" ?> */ Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiForum.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -25,13 +25,13 @@ * particular page (one page per topic) and provides an input form for * adding a new message. * - * <?plugin WikiForum ?> + * <<WikiForum>> * * To provide information for the MainForum page (CategoryForum) * summary output mode is possible. * - * <?plugin WikiForum page=SubTopic1 mode=summary info=title,numposts,ctime,author ?> - * <?plugin WikiForum page=SubTopic2 mode=summary info=title,numposts,ctime,author ?> + * <<WikiForum page=SubTopic1 mode=summary info=title,numposts,ctime,author >> + * <<WikiForum page=SubTopic2 mode=summary info=title,numposts,ctime,author >> * * TODO: For admin user, put checkboxes beside comments to allow for bulk removal. * threaded identation for level of reply Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/WikiPoll.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -24,7 +24,7 @@ * This plugin provides configurable polls. * * Usage: -<?plugin WikiPoll require_all=0 require_least=2 +<<WikiPoll require_all=0 require_least=2 question[1]="Do you like PhpWiki?" answer[1][1]="Yes" answer[1][2]="Do not know" answer[1][3]="No" question[2]="Do you have PhpWiki installed by your own?" @@ -38,10 +38,10 @@ question[5]="Which PhpWiki version do you use?" answer[5][1]="1.2.x" answer[5][2]="1.3.1-12" answer[5][3]="1.3.13" answer[5][4]="1.3.14" -?> +>> * * Administration: - * <?plugin WikiPoll page=PhpWikiPoll admin=1 ?> + * <<WikiPoll page=PhpWikiPoll admin=1 >> * and protect this page properly (e.g. PhpWikiPoll/Admin) * * TODO: Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2010-05-26 12:10:14 UTC (rev 7446) +++ trunk/lib/plugin/_WikiTranslation.php 2010-05-31 11:29:39 UTC (rev 7447) @@ -26,17 +26,17 @@ * Current favorite: translate.google.com if from_lang = en or fr * * Examples: - * <?plugin _WikiTranslation page=HomePage languages=fr ?> + * <<_WikiTranslation page=HomePage languages=fr >> * Translation service for HomePage into french (redirect to translate.google.com) - * <?plugin _WikiTranslation what=pages ?> + * <<_WikiTranslation what=pages >> * Translation matrix of all pages with proper translations (all in pgsrc) - * <?plugin _WikiTranslation what=wikiwords match="W*" limit=20 ?> + * <<_WikiTranslation what=wikiwords match="W*" limit=20 >> * Translation matrix of the first 20 wikiwords matching "W*" - * <?plugin _WikiTranslation string=HomePage languages=fr,de,sv ?> + * <<_WikiTranslation string=HomePage languages=fr,de,sv >> * Translation matrix for all given languages - * <?plugin _WikiTranslation string=HomePage ?> + * <<_WikiTranslation string=HomePage >> * Translation matrix for all supported languages - * <?plugin _WikiTranslation string=HomePage languages=fr ?> + * <<_WikiTranslation string=HomePage languages=fr >> * Just return the translated string for this language. * * @author: Reini Urban This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-09-20 16:03:32
|
Revision: 7700 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7700&view=rev Author: vargenau Date: 2010-09-20 16:03:26 +0000 (Mon, 20 Sep 2010) Log Message: ----------- Better test that a given revision exists Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2010-09-20 14:45:28 UTC (rev 7699) +++ trunk/lib/plugin/IncludePage.php 2010-09-20 16:03:26 UTC (rev 7700) @@ -107,8 +107,8 @@ $p = $dbi->getPage($page); if ($rev) { $r = $p->getRevision($rev); - if (!$r) { - return $this->error(sprintf(_("%s(%d): no such revision"), + if ((!$r) || ($r->hasDefaultContents())) { + return $this->error(sprintf(_("%s: no such revision %d."), $page, $rev)); } } else { Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2010-09-20 14:45:28 UTC (rev 7699) +++ trunk/lib/plugin/PageGroup.php 2010-09-20 16:03:26 UTC (rev 7700) @@ -120,10 +120,9 @@ $p = $dbi->getPage($parent); if ($rev) { $r = $p->getRevision($rev); - if (!$r) { - $this->error(sprintf(_("%s(%d): no such revision"), $parent, - $rev)); - return ''; + if ((!$r) || ($r->hasDefaultContents())) { + return $this->error(sprintf(_("%s: no such revision %d."), + $parent, $rev)); } } else { $r = $p->getCurrentRevision(); Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2010-09-20 14:45:28 UTC (rev 7699) +++ trunk/lib/plugin/Template.php 2010-09-20 16:03:26 UTC (rev 7700) @@ -145,8 +145,8 @@ $p = $dbi->getPage($page); if ($args['rev']) { $r = $p->getRevision($args['rev']); - if (!$r) { - return $this->error(sprintf(_("%s(%d): no such revision."), + if ((!$r) || ($r->hasDefaultContents())) { + return $this->error(sprintf(_("%s: no such revision %d."), $page, $args['rev'])); } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-01-04 17:50:40
|
Revision: 7805 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7805&view=rev Author: vargenau Date: 2011-01-04 17:50:32 +0000 (Tue, 04 Jan 2011) Log Message: ----------- Typography Modified Paths: -------------- trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/UnfoldSubpages.php Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2011-01-04 14:21:32 UTC (rev 7804) +++ trunk/lib/plugin/FrameInclude.php 2011-01-04 17:50:32 UTC (rev 7805) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002 $ThePhpWikiProgrammingTeam * @@ -85,7 +85,7 @@ if (!$src and $page) { if ($page == $request->get('pagename')) { - return $this->error(sprintf(_("recursive inclusion of page %s"), + return $this->error(sprintf(_("Recursive inclusion of page %s"), $page)); } $src = WikiURL($page); @@ -97,7 +97,7 @@ // FIXME: How to normalize url's to compare against recursion? if ($src == $request->getURLtoSelf() ) { - return $this->error(sprintf(_("recursive inclusion of url %s"), + return $this->error(sprintf(_("Recursive inclusion of url %s"), $src)); } Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2011-01-04 14:21:32 UTC (rev 7804) +++ trunk/lib/plugin/ListSubpages.php 2011-01-04 17:50:32 UTC (rev 7805) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002 $ThePhpWikiProgrammingTeam * @@ -91,7 +91,7 @@ // A page cannot include itself. Avoid doublettes. static $included_pages = array(); if (in_array($page, $included_pages)) { - $content->pushContent(HTML::p(sprintf(_("recursive inclusion of page %s ignored"), + $content->pushContent(HTML::p(sprintf(_("Recursive inclusion of page %s ignored"), $page))); continue; } Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2011-01-04 14:21:32 UTC (rev 7804) +++ trunk/lib/plugin/Transclude.php 2011-01-04 17:50:32 UTC (rev 7805) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * @@ -85,7 +85,7 @@ // FIXME: Better recursion detection. // FIXME: Currently this doesnt work at all. if ($src == $request->getURLtoSelf() ) { - return $this->error(fmt("recursive inclusion of url %s", $src)); + return $this->error(fmt("Recursive inclusion of url %s", $src)); } if (! IsSafeURL($src)) { return $this->error(_("Bad url in src: remove all of <, >, \"")); Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2011-01-04 14:21:32 UTC (rev 7804) +++ trunk/lib/plugin/UnfoldSubpages.php 2011-01-04 17:50:32 UTC (rev 7805) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002,2004,2005 $ThePhpWikiProgrammingTeam * @@ -97,7 +97,7 @@ continue; // A page cannot include itself. Avoid doublettes. if (in_array($cpagename, $included_pages)) { - $content->pushContent(HTML::p(sprintf(_("recursive inclusion of page %s ignored"), + $content->pushContent(HTML::p(sprintf(_("Recursive inclusion of page %s ignored"), $cpagename))); continue; } @@ -127,7 +127,7 @@ if (in_array($m[1], $included_pages)) { if (!$quiet) $content->pushContent( - HTML::p(sprintf(_("recursive inclusion of page %s ignored"), + HTML::p(sprintf(_("Recursive inclusion of page %s ignored"), $cpagename.' => '.$m[1]))); continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-01-04 17:55:50
|
Revision: 7806 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7806&view=rev Author: vargenau Date: 2011-01-04 17:55:44 +0000 (Tue, 04 Jan 2011) Log Message: ----------- Make trapping of recursive inclusion work. Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011-01-04 17:50:32 UTC (rev 7805) +++ trunk/lib/plugin/IncludePage.php 2011-01-04 17:55:44 UTC (rev 7806) @@ -1,8 +1,8 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam - * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -89,7 +89,7 @@ // TextFormattingRules). static $included_pages = array(); if (in_array($page, $included_pages)) { - return $this->error(sprintf(_("recursive inclusion of page %s ignored"), + return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page)); } @@ -129,7 +129,7 @@ } // trap recursive redirects if (in_array($m[1], $included_pages)) { - return $this->error(sprintf(_("recursive inclusion of page %s ignored"), + return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page.' => '.$m[1])); } $page = $m[1]; @@ -152,8 +152,6 @@ include_once('lib/BlockParser.php'); $content = TransformText($ct, $r->get('markup'), $page); - array_pop($included_pages); - if ($quiet) return $content; Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011-01-04 17:50:32 UTC (rev 7805) +++ trunk/lib/plugin/Template.php 2011-01-04 17:55:44 UTC (rev 7806) @@ -1,8 +1,8 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005,2007 $ThePhpWikiProgrammingTeam - * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. * @@ -127,7 +127,7 @@ // Protect from recursive inclusion. A page can include itself once static $included_pages = array(); if (in_array($page, $included_pages)) { - return $this->error(sprintf(_("recursive inclusion of page %s"), + return $this->error(sprintf(_("Recursive inclusion of page %s"), $page)); } @@ -168,7 +168,7 @@ } // trap recursive redirects if (in_array($m[1], $included_pages)) { - return $this->error(sprintf(_("recursive inclusion of page %s ignored"), + return $this->error(sprintf(_("Recursive inclusion of page %s ignored"), $page.' => '.$m[1])); } $page = $m[1]; @@ -204,8 +204,6 @@ $content = TransformInline($initial_content, $r->get('markup'), $page); } - array_pop($included_pages); - return $content; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-01-17 14:47:38
|
Revision: 7838 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7838&view=rev Author: vargenau Date: 2011-01-17 14:47:32 +0000 (Mon, 17 Jan 2011) Log Message: ----------- Revert r7806; correction prevented to include a page twice in the same page Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011-01-14 11:12:00 UTC (rev 7837) +++ trunk/lib/plugin/IncludePage.php 2011-01-17 14:47:32 UTC (rev 7838) @@ -152,6 +152,8 @@ include_once('lib/BlockParser.php'); $content = TransformText($ct, $r->get('markup'), $page); + array_pop($included_pages); + if ($quiet) return $content; Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011-01-14 11:12:00 UTC (rev 7837) +++ trunk/lib/plugin/Template.php 2011-01-17 14:47:32 UTC (rev 7838) @@ -204,6 +204,8 @@ $content = TransformInline($initial_content, $r->get('markup'), $page); } + array_pop($included_pages); + return $content; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-01-21 08:58:01
|
Revision: 7849 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7849&view=rev Author: vargenau Date: 2011-01-21 08:57:55 +0000 (Fri, 21 Jan 2011) Log Message: ----------- Strings easier to translate Modified Paths: -------------- trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminMarkup.php Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011-01-20 13:19:57 UTC (rev 7848) +++ trunk/lib/plugin/WikiAdminChown.php 2011-01-21 08:57:55 UTC (rev 7849) @@ -195,8 +195,7 @@ } function chownForm(&$header, $post_args) { - $header->pushContent(_("Change owner")." "); - $header->pushContent(' '._("to").': '); + $header->pushContent(_("Change owner to: ")); $header->pushContent(HTML::input(array('name' => 'admin_chown[user]', 'value' => $post_args['user'], 'size' => 40))); Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011-01-20 13:19:57 UTC (rev 7848) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011-01-21 08:57:55 UTC (rev 7849) @@ -187,8 +187,7 @@ } function chmarkupForm(&$header, $post_args) { - $header->pushContent(_("Change markup")." "); - $header->pushContent(' '._("to").': '); + $header->pushContent(_("Change markup to: ")); $header->pushContent(HTML::input(array('name' => 'admin_markup[markup]', 'value' => $post_args['markup']))); return $header; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-02-01 10:08:58
|
Revision: 7925 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7925&view=rev Author: vargenau Date: 2011-02-01 10:08:52 +0000 (Tue, 01 Feb 2011) Log Message: ----------- Translate strings Modified Paths: -------------- trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminMarkup.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSetExternal.php Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011-01-31 16:57:48 UTC (rev 7924) +++ trunk/lib/plugin/WikiAdminChown.php 2011-02-01 10:08:52 UTC (rev 7925) @@ -88,7 +88,7 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been permanently changed:")); + $result->pushContent(HTML::p(_("One page has been permanently changed:"))); } else { $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); } @@ -96,7 +96,7 @@ return $result; } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p("No pages changed.")); + $result->pushContent(HTML::p(_("No pages changed."))); return $result; } } Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011-01-31 16:57:48 UTC (rev 7924) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011-02-01 10:08:52 UTC (rev 7925) @@ -91,7 +91,7 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been permanently changed:")); + $result->pushContent(HTML::p(_("One page has been permanently changed:"))); } else { $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); } @@ -99,7 +99,7 @@ return $result; } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p("No pages changed.")); + $result->pushContent(HTML::p(_("No pages changed."))); return $result; } } Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-01-31 16:57:48 UTC (rev 7924) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-02-01 10:08:52 UTC (rev 7925) @@ -103,14 +103,14 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been permanently changed:")); + $result->pushContent(HTML::p(_("One page has been permanently changed:"))); } else { $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); } $result->pushContent($ul); } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p("No pages changed.")); + $result->pushContent(HTML::p(_("No pages changed."))); } return $result; } Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2011-01-31 16:57:48 UTC (rev 7924) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-02-01 10:08:52 UTC (rev 7925) @@ -77,7 +77,7 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been permanently changed:")); + $result->pushContent(HTML::p(_("One page has been permanently changed:"))); } else { $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); } @@ -85,7 +85,7 @@ return $result; } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p("No pages changed.")); + $result->pushContent(HTML::p_(("No pages changed."))); return $result; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-02 15:15:55
|
Revision: 7947 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7947&view=rev Author: vargenau Date: 2011-03-02 15:15:48 +0000 (Wed, 02 Mar 2011) Log Message: ----------- Better use "%d" for numbers; remove unneeded "permanently" Modified Paths: -------------- 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/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/WikiAdminChmod.php =================================================================== --- trunk/lib/plugin/WikiAdminChmod.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminChmod.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -76,15 +76,15 @@ } } } else { - $ul->pushContent(HTML::li(fmt("Invalid chmod string"))); + $ul->pushContent(HTML::li(_("Invalid chmod string"))); } if ($count) { $dbi->touch(); return HTML($ul, - HTML::p(fmt("%s pages have been changed.",$count))); + HTML::p(fmt("%d pages have been changed.", $count))); } else { return HTML($ul, - HTML::p(fmt("No pages changed."))); + HTML::p(_("No pages changed."))); } } Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminChown.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -88,9 +88,9 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p(_("One page has been permanently changed:"))); + $result->pushContent(HTML::p(_("One page has been changed:"))); } else { - $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); + $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count))); } $result->pushContent($ul); return $result; @@ -168,7 +168,7 @@ $button_label = _("Yes"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to permanently change the owner of the selected pages?")))); + _("Are you sure you want to change the owner of the selected pages?")))); $header = $this->chownForm($header, $post_args); } else { Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -91,9 +91,9 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p(_("One page has been permanently changed:"))); + $result->pushContent(HTML::p(_("One page has been changed:"))); } else { - $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); + $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count))); } $result->pushContent($ul); return $result; @@ -160,7 +160,7 @@ $button_label = _("Yes"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to permanently change the markup type of the selected files?")))); + _("Are you sure you want to change the markup type of the selected files?")))); $header = $this->chmarkupForm($header, $post_args); } else { Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminPurge.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -76,7 +76,7 @@ if ($count == 1) { $result->pushContent(HTML::p("One page has been permanently purged:")); } else { - $result->pushContent(HTML::p(fmt("%s pages have been permanently purged:", $count))); + $result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count))); } $result->pushContent($ul); return $result; Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminRemove.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -118,9 +118,9 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been permanently removed:")); + $result->pushContent(HTML::p("One page has been removed:")); } else { - $result->pushContent(HTML::p(fmt("%s pages have been permanently removed:", $count))); + $result->pushContent(HTML::p(fmt("%d pages have been removed:", $count))); } $result->pushContent($ul); return $result; @@ -194,7 +194,7 @@ if ($next_action == 'verify') { $button_label = _("Yes"); $header->pushContent(HTML::p(HTML::strong( - _("Are you sure you want to permanently remove the selected files?")))); + _("Are you sure you want to remove the selected files?")))); } else { $button_label = _("Remove selected pages"); Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminRename.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -120,10 +120,10 @@ $result->setAttr('class', 'feedback'); if ($count == 1) { $result->pushContent(HTML::p( - "One page has been permanently renamed:")); + "One page has been renamed:")); } else { $result->pushContent(HTML::p( - fmt("%s pages have been permanently renamed:", $count))); + fmt("%d pages have been renamed:", $count))); } $result->pushContent($ul); return $result; @@ -206,7 +206,7 @@ $button_label = _("Yes"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to permanently rename the selected pages?")))); + _("Are you sure you want to rename the selected pages?")))); $header = $this->renameForm($header, $post_args, $singlepage); } else { if ($singlepage === true) { Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -103,9 +103,9 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p(_("One page has been permanently changed:"))); + $result->pushContent(HTML::p(_("One page has been changed:"))); } else { - $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); + $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count))); } $result->pushContent($ul); } else { @@ -186,7 +186,7 @@ $button_label = _("Yes"); $header->pushContent( HTML::p(HTML::strong( - _("Are you sure you want to permanently replace text in the selected files?")))); + _("Are you sure you want to replace text in the selected files?")))); $this->replaceForm($header, $post_args); } else { $button_label = _("Search & Replace"); Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -120,17 +120,17 @@ } } } else { - $result->pushContent(HTML::p(fmt("Invalid ACL"))); + $result->pushContent(HTML::p(_("Invalid ACL"))); } if ($count) { $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count > 1) { - $result->pushContent(HTML::p(fmt("%s pages have been changed.",$count))); + $result->pushContent(HTML::p(fmt("%d pages have been changed.", $count))); } } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p(fmt("No pages changed."))); + $result->pushContent(HTML::p(_("No pages changed."))); } return $result; } Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -77,15 +77,15 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p(_("One page has been permanently changed:"))); + $result->pushContent(HTML::p(_("One page has been changed:"))); } else { - $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count))); + $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."))); + $result->pushContent(HTML::p(_("No pages changed."))); return $result; } } Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2011-03-02 10:51:08 UTC (rev 7946) +++ trunk/lib/plugin/WikiAdminUtils.php 2011-03-02 15:15:48 UTC (rev 7947) @@ -144,7 +144,7 @@ if (!$count) return _("No pages with bad names had to be deleted."); else { - return HTML(fmt("Deleted %s pages with invalid names:", $count), + return HTML(fmt("Deleted %d pages with invalid names:", $count), HTML::div(array('align'=>'left'), $list)); } } @@ -177,7 +177,7 @@ if (!$count) return _("No empty, unreferenced pages were found."); else - return HTML(fmt("Deleted %s unreferenced pages:", $count), + return HTML(fmt("Deleted %d unreferenced pages:", $count), HTML::div(array('align'=>'left'), $list), ($notpurgable ? fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-03 16:41:44
|
Revision: 7955 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7955&view=rev Author: vargenau Date: 2011-03-03 16:41:35 +0000 (Thu, 03 Mar 2011) Log Message: ----------- Remove rcs_id Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AddComment.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AllPages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AllUsers.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AppendText.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AsciiMath.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AsciiSVG.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/AuthorHistory.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/BackLinks.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/BlogArchives.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/BlogJournal.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2005 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/BoxRight.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2006 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CacheTest.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2002 Johannes Große * Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Calendar.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CalendarList.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * * Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CategoryPage.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Chart.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Comment.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2003 Martin Geisler Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CreateBib.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CreatePage.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CreateToc.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/CurrentTime.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent * Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/DeadEndPages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * This file is part of PhpWiki. * Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Diff.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/DynamicIncludePage.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/EditMetaData.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/ExternalSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/FacebookLike.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2010 Reini Urban * Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/FileInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005,2007 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/FoafViewer.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/FullTextSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/FuzzyPages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/GoTo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/GoogleMaps.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2005 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/GooglePlugin.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/GraphViz.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/HelloWorld.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/HtmlConverter.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005 Wincor Nixdorf International GmbH * Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Imdb.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/IncludePages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/IncludeSiteMap.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2003,2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/IncludeTree.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2003,2004,2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/InterWikiSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/JabberPresence.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/LdapSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,4 +1,4 @@ -<?php // -*-php-*- // rcs_id('$Id$'); +<?php // -*-php-*- // $Id$ /** * Copyright 2004 John Lines * Copyright 2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/LikePages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/LinkDatabase.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/LinkSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 Reini Urban * Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/ListPages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/ListRelations.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2006 Reini Urban * Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/MediawikiTable.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2003 Sameer D. Sahasrabuddhe * Copyright (C) 2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/ModeratedPage.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/MostPopular.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/NewPagesPerUser.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2007 AVL * Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/NoCache.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/OldStyleTable.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/OrphanedPages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * This file is part of PhpWiki. * Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PageDump.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2003 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PageGroup.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PageHistory.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002, 2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PageInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PageTrail.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PasswordReset.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright (C) 2006 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PhotoAlbum.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2003,2004,2005,2007 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PhpHighlight.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PhpWeather.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id PhpWeather.php 2002-08-26 15:30:13 rurban$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Ploticus.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PluginManager.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PopUp.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004 Nicolas Noble <pi...@us...> * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PopularNearby.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PopularTags.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 Reini Urban * Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PreferenceApp.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/PrevNext.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Processing.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RandomPage.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RateIt.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2007,2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RawHtml.php =================================================================== --- trunk/lib/plugin/RawHtml.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RawHtml.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RecentChanges.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RecentChangesCached.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright (C) 2002 Johannes Große | Modified: trunk/lib/plugin/RecentComments.php =================================================================== --- trunk/lib/plugin/RecentComments.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RecentComments.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RecentEdits.php =================================================================== --- trunk/lib/plugin/RecentEdits.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RecentEdits.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RecentReferrers.php =================================================================== --- trunk/lib/plugin/RecentReferrers.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RecentReferrers.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RedirectTo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RelatedChanges.php =================================================================== --- trunk/lib/plugin/RelatedChanges.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RelatedChanges.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RichTable.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2003 Sameer D. Sahasrabuddhe * Copyright (C) 2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/RssFeed.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2003 Arnaud Fontaine * Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SearchHighlight.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SemanticRelations.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005 Reini Urban * Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SemanticSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 Reini Urban * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 Reini Urban * Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SiteMap.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SpellCheck.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2006,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SqlResult.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SyncWiki.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2006 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SyntaxHighlighter.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/SystemInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright (C) 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/TeX2png.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) Copyright 2004 Pierrick Meignen * Modified: trunk/lib/plugin/TexToPng.php =================================================================== --- trunk/lib/plugin/TexToPng.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/TexToPng.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright (C) 2002 Johannes Große Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/TitleSearch.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2004,2005,2010 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/TranslateText.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/UpLoad.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/UriResolver.php =================================================================== --- trunk/lib/plugin/UriResolver.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/UriResolver.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/UserPreferences.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/UserRatings.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004 Dan Frankowski * Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/Video.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, Alcatel-Lucent * Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/VisualWiki.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2002 Johannes Große (Johannes Große) * Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WantedPages.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright (C) 2002, 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WantedPagesOld.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * This file is part of PhpWiki. * Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WatchPage.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright (C) 2006 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WhoIsOnline.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/WikiAdminChmod.php =================================================================== --- trunk/lib/plugin/WikiAdminChmod.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminChmod.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminChown.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminPurge.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminRemove.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminRename.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2005,2007 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminSelect.php =================================================================== --- trunk/lib/plugin/WikiAdminSelect.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminSelect.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2005 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiAdminUtils.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2003,2004,2006 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiBlog.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2002,2003,2007,2009 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/WikiForm.php =================================================================== --- trunk/lib/plugin/WikiForm.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiForm.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiFormRich.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004,2006,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiForum.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/WikiPoll.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2008 Marc-Etienne Vargenau, Alcatel-lucent Modified: trunk/lib/plugin/YouTube.php =================================================================== --- trunk/lib/plugin/YouTube.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/YouTube.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2007 Reini Urban * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/_AuthInfo.php =================================================================== --- trunk/lib/plugin/_AuthInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/_AuthInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/_BackendInfo.php =================================================================== --- trunk/lib/plugin/_BackendInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/_BackendInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/_GroupInfo.php =================================================================== --- trunk/lib/plugin/_GroupInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/_GroupInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php -// rcs_id('$Id$'); +// $Id$ /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/_PreferencesInfo.php =================================================================== --- trunk/lib/plugin/_PreferencesInfo.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/_PreferencesInfo.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/_Retransform.php =================================================================== --- trunk/lib/plugin/_Retransform.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/_Retransform.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /** * Copyright 2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2011-03-03 16:34:56 UTC (rev 7954) +++ trunk/lib/plugin/text2png.php 2011-03-03 16:41:35 UTC (rev 7955) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// rcs_id('$Id$'); +// $Id$ /* * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-31 08:45:26
|
Revision: 8005 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8005&view=rev Author: vargenau Date: 2011-03-31 08:45:20 +0000 (Thu, 31 Mar 2011) Log Message: ----------- Translate strings Modified Paths: -------------- trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2011-03-31 07:51:51 UTC (rev 8004) +++ trunk/lib/plugin/WikiAdminPurge.php 2011-03-31 08:45:20 UTC (rev 8005) @@ -74,7 +74,7 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been permanently purged:")); + $result->pushContent(HTML::p(_("One page has been permanently purged:"))); } else { $result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count))); } @@ -82,7 +82,7 @@ return $result; } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p("No pages purged.")); + $result->pushContent(HTML::p(_("No pages purged."))); return $result; } } Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2011-03-31 07:51:51 UTC (rev 8004) +++ trunk/lib/plugin/WikiAdminRemove.php 2011-03-31 08:45:20 UTC (rev 8005) @@ -118,7 +118,7 @@ $dbi->touch(); $result->setAttr('class', 'feedback'); if ($count == 1) { - $result->pushContent(HTML::p("One page has been removed:")); + $result->pushContent(HTML::p(_("One page has been removed:"))); } else { $result->pushContent(HTML::p(fmt("%d pages have been removed:", $count))); } @@ -126,7 +126,7 @@ return $result; } else { $result->setAttr('class', 'error'); - $result->pushContent(HTML::p("No pages removed.")); + $result->pushContent(HTML::p(_("No pages removed."))); return $result; } } Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2011-03-31 07:51:51 UTC (rev 8004) +++ trunk/lib/plugin/WikiAdminRename.php 2011-03-31 08:45:20 UTC (rev 8005) @@ -120,7 +120,7 @@ $result->setAttr('class', 'feedback'); if ($count == 1) { $result->pushContent(HTML::p( - "One page has been renamed:")); + _("One page has been renamed:"))); } else { $result->pushContent(HTML::p( fmt("%d pages have been renamed:", $count))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <var...@us...> - 2011-04-14 09:37:48
|
Revision: 8051 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8051&view=rev Author: vargenau Date: 2011-04-14 09:37:41 +0000 (Thu, 14 Apr 2011) Log Message: ----------- More user-friendly message; translate message Modified Paths: -------------- trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/SyncWiki.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 trunk/lib/plugin/WikiFormRich.php Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/FrameInclude.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -78,7 +78,7 @@ extract($args); if ($request->getArg('action') != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } if (! $request->isGetOrHead()) { return $this->disabled("(method != 'GET')"); Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/RandomPage.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -56,7 +56,7 @@ // Redirect would break HTML dump if ($request->getArg('action') != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } // fix deprecated arg Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/RedirectTo.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -86,7 +86,7 @@ } if ($request->getArg('action') != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } $redirectfrom = $request->getArg('redirectfrom'); Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/SyncWiki.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -70,7 +70,7 @@ return $this->error(fmt("A required argument '%s' is missing.", "url")); } if ($request->getArg('action') != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } $posted = $request->getArg('wikiadminutils'); if ($request->isPost() Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminChown.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -104,7 +104,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if (!$request->getArg('action') == _("PhpWikiAdministration/Chown")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -107,7 +107,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if (!$request->getArg('action') == _("PhpWikiAdministration/Markup")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminPurge.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -90,7 +90,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if ($request->getArg('action') != _("PhpWikiAdministration/Purge")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminRemove.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -134,7 +134,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if ($request->getArg('action') != _("PhpWikiAdministration/Remove")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminRename.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -140,7 +140,7 @@ $action = $request->getArg('action'); if ($action != 'browse' and $action != 'rename' and $action != _("PhpWikiAdministration")."/"._("Rename")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } if ($action == 'rename') { Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -118,7 +118,7 @@ function run($dbi, $argstr, &$request, $basepage) { // no action=replace support yet if ($request->getArg('action') != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -138,7 +138,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } if (!ENABLE_PAGEPERM) { Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -45,7 +45,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } if (!ENABLE_PAGEPERM) { Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -93,7 +93,7 @@ function run($dbi, $argstr, &$request, $basepage) { if ($request->getArg('action') != 'browse') { if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal")) { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } } Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiAdminUtils.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -61,7 +61,7 @@ return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action)); } if ($request->getArg('action') != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } $posted = $request->getArg('wikiadminutils'); Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2011-04-14 09:02:55 UTC (rev 8050) +++ trunk/lib/plugin/WikiFormRich.php 2011-04-14 09:37:41 UTC (rev 8051) @@ -173,7 +173,7 @@ return $this->error(fmt("A required argument '%s' is missing.", "action")); } if ($action != 'browse') { - return $this->disabled("(action != 'browse')"); + return $this->disabled(_("Plugin not run: not in browse mode")); } $form = 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...> - 2011-05-04 19:12:23
|
Revision: 8070 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8070&view=rev Author: vargenau Date: 2011-05-04 19:12:16 +0000 (Wed, 04 May 2011) Log Message: ----------- Check "rev" is a positive integer Modified Paths: -------------- trunk/lib/plugin/IncludePage.php trunk/lib/plugin/Template.php Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011-05-04 15:54:09 UTC (rev 8069) +++ trunk/lib/plugin/IncludePage.php 2011-05-04 19:12:16 UTC (rev 8070) @@ -99,6 +99,9 @@ $p = $dbi->getPage($page); if ($rev) { + if (!is_whole_number($rev) or !($rev>0)) { + return $this->error(_("Error: rev must be a positive integer.")); + } $r = $p->getRevision($rev); if ((!$r) || ($r->hasDefaultContents())) { return $this->error(sprintf(_("%s: no such revision %d."), Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011-05-04 15:54:09 UTC (rev 8069) +++ trunk/lib/plugin/Template.php 2011-05-04 19:12:16 UTC (rev 8070) @@ -137,6 +137,9 @@ $p = $dbi->getPage($page); if ($args['rev']) { + if (!is_whole_number($args['rev']) or !($args['rev']>0)) { + return $this->error(_("Error: rev must be a positive integer.")); + } $r = $p->getRevision($args['rev']); if ((!$r) || ($r->hasDefaultContents())) { return $this->error(sprintf(_("%s: no such revision %d."), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-11-28 14:04:43
|
Revision: 8184 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8184&view=rev Author: vargenau Date: 2011-11-28 14:04:37 +0000 (Mon, 28 Nov 2011) Log Message: ----------- Add <legend> to <fieldset> Modified Paths: -------------- trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminMarkup.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2011-11-24 15:15:12 UTC (rev 8183) +++ trunk/lib/plugin/WikiAdminChown.php 2011-11-28 14:04:37 UTC (rev 8184) @@ -168,6 +168,7 @@ $header = HTML::fieldset(); if ($next_action == 'verify') { $button_label = _("Yes"); + $header->pushContent(HTML::legend(_("Confirm ownership change"))); $header->pushContent( HTML::p(HTML::strong( _("Are you sure you want to change the owner of the selected pages?")))); Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2011-11-24 15:15:12 UTC (rev 8183) +++ trunk/lib/plugin/WikiAdminMarkup.php 2011-11-28 14:04:37 UTC (rev 8184) @@ -160,6 +160,7 @@ $header = HTML::fieldset(); if ($next_action == 'verify') { $button_label = _("Yes"); + $header->pushContent(HTML::legend(_("Confirm markup change"))); $header->pushContent( HTML::p(HTML::strong( _("Are you sure you want to change the markup type of the selected files?")))); Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2011-11-24 15:15:12 UTC (rev 8183) +++ trunk/lib/plugin/WikiAdminPurge.php 2011-11-28 14:04:37 UTC (rev 8184) @@ -142,6 +142,7 @@ $header = HTML::fieldset(); if ($next_action == 'verify') { $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?")))); } Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2011-11-24 15:15:12 UTC (rev 8183) +++ trunk/lib/plugin/WikiAdminRemove.php 2011-11-28 14:04:37 UTC (rev 8184) @@ -195,6 +195,7 @@ $header = HTML::fieldset(); if ($next_action == 'verify') { $button_label = _("Yes"); + $header->pushContent(HTML::legend(_("Confirm removal"))); $header->pushContent(HTML::p(HTML::strong( _("Are you sure you want to remove the selected files?")))); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-12-16 13:26:24
|
Revision: 8212 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8212&view=rev Author: vargenau Date: 2011-12-16 13:26:15 +0000 (Fri, 16 Dec 2011) Log Message: ----------- Consistent messages for missing required arguments Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/Chart.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/Template.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/AddComment.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -69,8 +69,9 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - if (!$args['pagename']) - return $this->error(_("No pagename specified")); + if (!$args['pagename']) { + return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); + } // Get our form args. $comment = $request->getArg("comment"); Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/Chart.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -62,7 +62,7 @@ // 'ylabel' => 'y', // TODO 'color' => 'green', // 'legend' => false, // TODO - 'data' => false // mandatory + 'data' => false // required ); } function handle_plugin_args_cruft(&$argstr, &$args) { @@ -74,7 +74,7 @@ global $WikiTheme; $args = $this->getArgs($argstr, $request); if (!$args['data']) { - return $this->error(sprintf(_("No mandatory '%s' argument provided."), 'data')); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'data')); } extract($args); Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/CreateBib.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -108,7 +108,7 @@ $pagename = $page->name; } if (!$pagename) { - return $this->error(_("no page specified")); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); } // Get the links page contents Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/CreateToc.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -375,7 +375,7 @@ $pagename = $page->name; } if (!$pagename) { - return $this->error(_("No page specified.")); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); } if (isBrowserIE() and browserDetect("Mac")) { $jshide = 0; Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/FileInfo.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -50,17 +50,19 @@ 'display' => false, // version,phonysize,size,date,mtime,owner,name,path,dirname,link. (required) 'format' => false, // printf format string with %s only, all display modes 'quiet' => false // print no error if file not found - // from above vars return strings (optional) + // from above vars return strings (optional) ); } function run($dbi, $argstr, &$request, $basepage) { - $args = $this->getArgs($argstr, $request); + $args = $this->getArgs($argstr, $request); extract($args); - if (!$file) + if (!$file) { return $this->error(sprintf(_("A required argument '%s' is missing."), 'file')); - if (!$display) + } + if (!$display) { return $this->error(sprintf(_("A required argument '%s' is missing."), 'display')); + } if (string_starts_with($file, "Upload:")) { $file = preg_replace("/^Upload:(.*)$/", getUploadFilePath()."\\1", $file); $is_Upload = 1; Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/GoogleMaps.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -88,10 +88,10 @@ extract($args); if ($Longitude === '') { - return $this->error(fmt("%s parameter missing", "'Longitude'")); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'Longitude')); } if ($Latitude === '') { - return $this->error(fmt("%s parameter missing", "'Latitude'")); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'Latitude')); } $maps = JavaScript('',array('src'=>"http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY)); Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/IncludePage.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -75,7 +75,7 @@ $page = $page->name; } if (!$page) { - return $this->error(_("no page specified")); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); } // A page can include itself once (this is needed, e.g., when editing Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/ModeratedPage.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -59,8 +59,9 @@ // Handle moderation request from urls sent by email if (!empty($args['id']) and !empty($args['pass'])) { - if (!$args['page']) - return $this->error("No page specified"); + if (!$args['page']) { + return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); + } $page = $dbi->getPage($args['page']); if ($moderated = $page->get("moderated")) { if (array_key_exists($args['id'], $moderated['data'])) { Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/PageGroup.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -92,11 +92,7 @@ $args = $this->getArgs($argstr, $request); extract($args); if (empty($parent)) { - // FIXME: WikiPlugin has no way to report when - // required args are missing? - $error_text = sprintf("%s: ", "WikiPlugin_" .$this->getName()); - $error_text .= sprintf(_("A required argument '%s' is missing."), 'parent'); - return HTML::div(array('class' => "error"), $error_text); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'parent')); } $directions = array ('next' => _("Next"), 'previous' => _("Previous"), Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/SyntaxHighlighter.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -122,7 +122,9 @@ function run($dbi, $argstr, &$request, $basepage) { extract($this->getArgs($argstr, $request)); $source =& $this->source; - if (empty($syntax)) return $this->error(_("Syntax language not specified.")); + if (empty($syntax)) { + return $this->error(sprintf(_("A required argument '%s' is missing."), 'syntax')); + } if (!empty($source)) { $args = ""; if (defined('HIGHLIGHT_DATA_DIR')) Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/Template.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -105,7 +105,7 @@ $page = $page->name; } if (!$page) { - return $this->error(_("No page specified.")); + return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); } // If "Template:$page" exists, use it Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/WikiForum.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -67,8 +67,9 @@ function run($dbi, $argstr, &$request, $basepage) { $args = $this->getArgs($argstr, $request); - if (!$args['pagename']) - return $this->error(_("No pagename specified")); + if (!$args['pagename']) { + return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); + } // Get our form args. $forum = $request->getArg('forum'); Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2011-12-16 11:54:21 UTC (rev 8211) +++ trunk/lib/plugin/WikiPoll.php 2011-12-16 13:26:15 UTC (rev 8212) @@ -139,8 +139,9 @@ $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; $request->setArg('nocache','purge'); $args = $this->getArgs($argstr, $request); - if (!$args['page']) - return $this->error("No page specified"); + if (!$args['page']) { + return $this->error(sprintf(_("A required argument '%s' is missing."), 'page')); + } if (!empty($args['admin']) and $request->_user->isAdmin()) { // reset statistics return $this->doPollAdmin($dbi, $request, $page); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-03-15 13:08:49
|
Revision: 8248 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8248&view=rev Author: vargenau Date: 2012-03-15 13:08:39 +0000 (Thu, 15 Mar 2012) Log Message: ----------- Remove unused global Modified Paths: -------------- trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WikicreoleTable.php Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-03-14 17:23:33 UTC (rev 8247) +++ trunk/lib/plugin/GoogleMaps.php 2012-03-15 13:08:39 UTC (rev 8248) @@ -82,7 +82,6 @@ } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; $args = $this->getArgs($argstr, $request); extract($args); Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2012-03-14 17:23:33 UTC (rev 8247) +++ trunk/lib/plugin/OldStyleTable.php 2012-03-15 13:08:39 UTC (rev 8248) @@ -69,7 +69,6 @@ } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; include_once('lib/InlineParser.php'); $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2012-03-14 17:23:33 UTC (rev 8247) +++ trunk/lib/plugin/RichTable.php 2012-03-15 13:08:39 UTC (rev 8248) @@ -43,7 +43,6 @@ } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; include_once("lib/BlockParser.php"); // RichTablePlugin markup is new. $markup = 2.0; Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2012-03-14 17:23:33 UTC (rev 8247) +++ trunk/lib/plugin/Transclude.php 2012-03-15 13:08:39 UTC (rev 8248) @@ -64,7 +64,6 @@ } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; $args = ($this->getArgs($argstr, $request)); extract($args); Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2012-03-14 17:23:33 UTC (rev 8247) +++ trunk/lib/plugin/WatchPage.php 2012-03-15 13:08:39 UTC (rev 8248) @@ -94,7 +94,6 @@ } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; $args = $this->getArgs($argstr, $request); if (isa($request,'MockRequest')) Modified: trunk/lib/plugin/WikicreoleTable.php =================================================================== --- trunk/lib/plugin/WikicreoleTable.php 2012-03-14 17:23:33 UTC (rev 8247) +++ trunk/lib/plugin/WikicreoleTable.php 2012-03-15 13:08:39 UTC (rev 8248) @@ -68,7 +68,6 @@ } function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; include_once('lib/InlineParser.php'); $table = array(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-09-28 10:08:28
|
Revision: 8285 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8285&view=rev Author: vargenau Date: 2012-09-28 10:08:17 +0000 (Fri, 28 Sep 2012) Log Message: ----------- php_closing_tag [PSR-2] The closing ?> tag MUST be omitted from files containing only PHP. Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Property Changed: ---------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AddComment.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * @@ -145,4 +144,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AddComment.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AllPages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /** * Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam * @@ -150,4 +149,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AllPages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AllUsers.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam * @@ -113,4 +112,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AllUsers.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php -// $Id$ /* * Copyright 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam * @@ -390,4 +389,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AnalyseAccessLogSql.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AppendText.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * @@ -154,4 +153,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AppendText.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AsciiMath.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /* * Copyright 2005 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -84,4 +83,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AsciiMath.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AsciiSVG.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /* * Copyright 2007 $ThePhpWikiProgrammingTeam * @@ -110,4 +109,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AsciiSVG.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AtomFeed.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /* * Copyright 2010 Sébastien Le Callonnec * @@ -82,4 +81,3 @@ return $html; } } -?> Property changes on: trunk/lib/plugin/AtomFeed.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/AuthorHistory.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,4 @@ <?php // -*-php-*- -// $Id$ /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -224,4 +223,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/AuthorHistory.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/BackLinks.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * @@ -189,4 +189,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/BackLinks.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/BlogArchives.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * @@ -152,4 +152,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/BlogArchives.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/BlogJournal.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2005 $ThePhpWikiProgrammingTeam * @@ -110,4 +110,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/BlogJournal.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/BoxRight.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2006 $ThePhpWikiProgrammingTeam * @@ -63,4 +63,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/BoxRight.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CacheTest.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2002 Johannes Große * @@ -168,4 +168,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CacheTest.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Calendar.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * @@ -249,4 +249,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Calendar.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CalendarList.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,6 +1,6 @@ <?php // -*-php-*- -// $Id$ + /** * * Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam * @@ -232,4 +232,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CalendarList.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CategoryPage.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * @@ -85,4 +85,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CategoryPage.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Chart.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2007 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -177,4 +177,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Chart.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Comment.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,6 +1,6 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2003 Martin Geisler * Copyright (C) 2003-2004 $ThePhpWikiProgrammingTeam @@ -64,4 +64,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Comment.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CreateBib.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -162,4 +162,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CreateBib.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CreatePage.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * @@ -152,4 +152,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CreatePage.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CreateToc.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent @@ -512,4 +512,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CreateToc.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/CurrentTime.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent * @@ -88,4 +88,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/CurrentTime.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/DeadEndPages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * This file is part of PhpWiki. * @@ -39,4 +39,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/DeadEndPages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Diff.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam * @@ -205,4 +205,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Diff.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/DynamicIncludePage.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2009 $ThePhpWikiProgrammingTeam * @@ -100,4 +100,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/DynamicIncludePage.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/EditMetaData.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam * @@ -197,4 +197,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/EditMetaData.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/ExternalSearch.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam * @@ -156,4 +156,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/ExternalSearch.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/FacebookLike.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2010 Reini Urban * @@ -80,4 +80,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/FacebookLike.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/FileInfo.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2005,2007 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -317,4 +317,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/FileInfo.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/FoafViewer.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php -// $Id$ + /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * @@ -235,4 +235,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/FoafViewer.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/FrameInclude.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2002 $ThePhpWikiProgrammingTeam * @@ -151,4 +151,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/FrameInclude.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/FullTextSearch.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam * @@ -171,4 +171,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/FullTextSearch.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/FuzzyPages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -192,4 +192,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/FuzzyPages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/GoTo.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * @@ -91,4 +91,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/GoTo.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/GoogleMaps.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2005 $ThePhpWikiProgrammingTeam * @@ -154,4 +154,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/GoogleMaps.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/GooglePlugin.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -124,4 +124,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/GooglePlugin.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/GraphViz.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -447,4 +447,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/GraphViz.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/HelloWorld.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * @@ -75,4 +75,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/HelloWorld.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/HtmlConverter.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2005 Wincor Nixdorf International GmbH * @@ -189,4 +189,3 @@ return $result; } } -?> Property changes on: trunk/lib/plugin/HtmlConverter.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Imdb.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -112,4 +112,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Imdb.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/IncludePage.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent @@ -205,4 +205,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/IncludePage.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/IncludePages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -89,4 +89,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/IncludePages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/IncludeSiteMap.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2003,2004 $ThePhpWikiProgrammingTeam * @@ -84,4 +84,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/IncludeSiteMap.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/IncludeTree.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2003,2004,2009 $ThePhpWikiProgrammingTeam * @@ -72,4 +72,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/IncludeTree.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/InterWikiSearch.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * @@ -122,4 +122,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/InterWikiSearch.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/JabberPresence.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * @@ -77,4 +77,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/JabberPresence.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/LdapSearch.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,4 +1,4 @@ -<?php // -*-php-*- // $Id$ +<?php // -*-php-*- /** * Copyright 2004 John Lines * Copyright 2007 $ThePhpWikiProgrammingTeam @@ -202,4 +202,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/LdapSearch.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/LikePages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * @@ -119,4 +119,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/LikePages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/LinkDatabase.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * @@ -190,4 +190,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/LinkDatabase.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/LinkSearch.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2007 Reini Urban * @@ -184,4 +184,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/LinkSearch.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/ListPages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -148,4 +148,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/ListPages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/ListRelations.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2006 Reini Urban * @@ -62,4 +62,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/ListRelations.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/ListSubpages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2002 $ThePhpWikiProgrammingTeam * @@ -124,4 +124,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/ListSubpages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/MediawikiTable.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2003 Sameer D. Sahasrabuddhe * Copyright (C) 2005 $ThePhpWikiProgrammingTeam @@ -288,4 +288,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/MediawikiTable.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/ModeratedPage.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -451,4 +451,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/ModeratedPage.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/MostPopular.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -105,4 +105,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/MostPopular.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/NewPagesPerUser.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2007 AVL * @@ -139,4 +139,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/NewPagesPerUser.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/NoCache.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -64,4 +64,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/NoCache.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/OldStyleTable.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -154,4 +154,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/OldStyleTable.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/OrphanedPages.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * This file is part of PhpWiki. * @@ -99,4 +99,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/OrphanedPages.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PageDump.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright (C) 2003 $ThePhpWikiProgrammingTeam * @@ -318,4 +318,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PageDump.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PageGroup.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -204,4 +204,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PageGroup.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PageHistory.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002, 2007 $ThePhpWikiProgrammingTeam * @@ -337,4 +337,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PageHistory.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PageInfo.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * @@ -75,4 +75,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PageInfo.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PageTrail.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam * @@ -96,4 +96,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PageTrail.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PasswordReset.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright (C) 2006 $ThePhpWikiProgrammingTeam * @@ -194,4 +194,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PasswordReset.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PhotoAlbum.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2003,2004,2005,2007 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -664,4 +664,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PhotoAlbum.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PhpHighlight.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -181,4 +181,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PhpHighlight.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PhpWeather.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * @@ -200,4 +200,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PhpWeather.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Ploticus.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -286,4 +286,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Ploticus.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PluginManager.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -188,4 +188,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PluginManager.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PopUp.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2004 Nicolas Noble <pi...@us...> * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent @@ -101,4 +101,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PopUp.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PopularNearby.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004 $ThePhpWikiProgrammingTeam * @@ -156,4 +156,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PopularNearby.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PopularTags.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2007 Reini Urban * @@ -91,4 +91,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PopularTags.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PreferenceApp.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php //-*-php-*- -// $Id$ + /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * @@ -312,4 +312,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PreferenceApp.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/PrevNext.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent @@ -204,4 +204,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/PrevNext.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/Processing.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 2009 $ThePhpWikiProgrammingTeam * @@ -109,4 +109,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/Processing.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/RandomPage.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /** * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam * @@ -115,4 +115,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/RandomPage.php ___________________________________________________________________ Deleted: svn:keywords - Id Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2012-09-28 09:47:57 UTC (rev 8284) +++ trunk/lib/plugin/RateIt.php 2012-09-28 10:08:17 UTC (rev 8285) @@ -1,5 +1,5 @@ <?php // -*-php-*- -// $Id$ + /* * Copyright 2004,2007,2009 $ThePhpWikiProgrammingTeam * @@ -443,4 +443,3 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> Property changes on: trunk/lib/plugin/RateIt.php ___________________________________________________________________ Deleted: svn:keywords - Id Modi... [truncated message content] |
From: <var...@us...> - 2012-10-01 12:50:47
|
Revision: 8355 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8355&view=rev Author: vargenau Date: 2012-10-01 12:50:37 +0000 (Mon, 01 Oct 2012) Log Message: ----------- Whitespace only Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AddComment.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AllPages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /** * Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AllUsers.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AppendText.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AsciiMath.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AsciiSVG.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /* * Copyright 2007 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AtomFeed.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /* * Copyright 2010 Sébastien Le Callonnec * Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/AuthorHistory.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/BlogArchives.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/BlogJournal.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/BoxRight.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CacheTest.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2002 Johannes Große Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Calendar.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam @@ -32,8 +32,6 @@ // pages back to the calendar page. (Subpage support might make this // easier.) -/** - */ class WikiPlugin_Calendar extends WikiPlugin { @@ -94,6 +92,7 @@ 'title' => _("Next Month")), '>'); + $row = HTML::tr(HTML::td(array('align' => 'left'), $prev), HTML::td(array('align' => 'center'), HTML::strong(array('class' => 'cal-header'), @@ -105,7 +104,6 @@ 'align' => 'center'), HTML::table(array('width' => '100%', 'class' => 'cal-header'), - $row))); } function __daynames($start_wday) { Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CalendarList.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CategoryPage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Chart.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Comment.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CreateBib.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CreatePage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CreateToc.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/CurrentTime.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/DeadEndPages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * This file is part of PhpWiki. Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Diff.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/DynamicIncludePage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2009 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/EditMetaData.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/ExternalSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/FacebookLike.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2010 Reini Urban Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/FileInfo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/FrameInclude.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/FullTextSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/FuzzyPages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/GoTo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/GoogleMaps.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/GooglePlugin.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/GraphViz.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/HelloWorld.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/HtmlConverter.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005 Wincor Nixdorf International GmbH Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Imdb.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/IncludePage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/IncludePages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/IncludeSiteMap.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2003,2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/IncludeTree.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2003,2004,2009 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/InterWikiSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/JabberPresence.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/LdapSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004 John Lines * Copyright 2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/LikePages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/LinkDatabase.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/LinkSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 Reini Urban Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/ListPages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/ListRelations.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2006 Reini Urban Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/ListSubpages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/MediawikiTable.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2003 Sameer D. Sahasrabuddhe Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/ModeratedPage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/MostPopular.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/NewPagesPerUser.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2007 AVL Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/NoCache.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/OldStyleTable.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/OrphanedPages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * This file is part of PhpWiki. Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PageDump.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2003 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PageGroup.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PageHistory.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002, 2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PageInfo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PageTrail.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PasswordReset.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright (C) 2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PhotoAlbum.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2003,2004,2005,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PhpHighlight.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PhpWeather.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Ploticus.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PluginManager.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PopUp.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004 Nicolas Noble <pi...@us...> Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PopularNearby.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PopularTags.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 Reini Urban Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PreferenceApp.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php //-*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/PrevNext.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Processing.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2009 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RandomPage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RawHtml.php =================================================================== --- trunk/lib/plugin/RawHtml.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RawHtml.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RecentChanges.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RecentChangesCached.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RecentComments.php =================================================================== --- trunk/lib/plugin/RecentComments.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RecentComments.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RecentEdits.php =================================================================== --- trunk/lib/plugin/RecentEdits.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RecentEdits.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RecentReferrers.php =================================================================== --- trunk/lib/plugin/RecentReferrers.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RecentReferrers.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RedirectTo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RelatedChanges.php =================================================================== --- trunk/lib/plugin/RelatedChanges.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RelatedChanges.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RichTable.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2003 Sameer D. Sahasrabuddhe Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/RssFeed.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2003 Arnaud Fontaine Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SearchHighlight.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SemanticRelations.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005 Reini Urban Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SemanticSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 Reini Urban Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 Reini Urban Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SiteMap.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SpellCheck.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2006,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SqlResult.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SyncWiki.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SyntaxHighlighter.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/SystemInfo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright (C) 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/TeX2png.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) Copyright 2004 Pierrick Meignen Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Template.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/TexToPng.php =================================================================== --- trunk/lib/plugin/TexToPng.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/TexToPng.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/TitleSearch.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2004,2005,2010 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Transclude.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/TranslateText.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/UnfoldSubpages.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002,2004,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/UpLoad.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/UriResolver.php =================================================================== --- trunk/lib/plugin/UriResolver.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/UriResolver.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/UserPreferences.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/UserRatings.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2004 Dan Frankowski @@ -121,7 +121,6 @@ $ratings = $current_user_ratings; } - $i = 0; foreach($ratings as $pagename => $page_ratings) { @@ -204,7 +203,6 @@ } - $columns = $info ? explode(",", $info) : array(); // build our table... $pagelist = new PageList($columns, $exclude, array('dimension' => $dimension, 'users' => $allowed_users_toshow)); Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/Video.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/VisualWiki.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2002 Johannes Große (Johannes Große) Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WatchPage.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright (C) 2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WhoIsOnline.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminChmod.php =================================================================== --- trunk/lib/plugin/WikiAdminChmod.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminChmod.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminChown.php =================================================================== --- trunk/lib/plugin/WikiAdminChown.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminChown.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminMarkup.php =================================================================== --- trunk/lib/plugin/WikiAdminMarkup.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminMarkup.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminPurge.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminRemove.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002,2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminRename.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2005,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminSelect.php =================================================================== --- trunk/lib/plugin/WikiAdminSelect.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminSelect.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminSetExternal.php =================================================================== --- trunk/lib/plugin/WikiAdminSetExternal.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminSetExternal.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiAdminUtils.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2003,2004,2006 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiBlog.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2002,2003,2007,2009 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiForm.php =================================================================== --- trunk/lib/plugin/WikiForm.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiForm.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiFormRich.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2006,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiForum.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikiPoll.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/WikicreoleTable.php =================================================================== --- trunk/lib/plugin/WikicreoleTable.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/WikicreoleTable.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright (C) 2008-2009, 2011 Marc-Etienne Vargenau, Alcatel-Lucent Modified: trunk/lib/plugin/YouTube.php =================================================================== --- trunk/lib/plugin/YouTube.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/YouTube.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2007 Reini Urban Modified: trunk/lib/plugin/_AuthInfo.php =================================================================== --- trunk/lib/plugin/_AuthInfo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/_AuthInfo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,5 @@ -<?php // -*-php-*- +<?php + /** * Copyright 2004 $ThePhpWikiProgrammingTeam * Modified: trunk/lib/plugin/_BackendInfo.php =================================================================== --- trunk/lib/plugin/_BackendInfo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/_BackendInfo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/_PreferencesInfo.php =================================================================== --- trunk/lib/plugin/_PreferencesInfo.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/_PreferencesInfo.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/_Retransform.php =================================================================== --- trunk/lib/plugin/_Retransform.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/_Retransform.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /** * Copyright 2007 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/_WikiTranslation.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 2004,2005 $ThePhpWikiProgrammingTeam Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2012-10-01 12:14:07 UTC (rev 8354) +++ trunk/lib/plugin/text2png.php 2012-10-01 12:50:37 UTC (rev 8355) @@ -1,4 +1,4 @@ -<?php // -*-php-*- +<?php /* * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-10-05 16:47:49
|
Revision: 8397 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8397&view=rev Author: vargenau Date: 2012-10-05 16:47:39 +0000 (Fri, 05 Oct 2012) Log Message: ----------- Reformat code Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.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/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AddComment.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -33,14 +33,16 @@ include_once 'lib/plugin/WikiBlog.php'; class WikiPlugin_AddComment -extends WikiPlugin_WikiBlog + extends WikiPlugin_WikiBlog { - function getName () { + function getName() + { return _("AddComment"); } - function getDescription () { - return sprintf(_("Show and add comments for %s"),'[pagename]'); + function getDescription() + { + return sprintf(_("Show and add comments for %s"), '[pagename]'); } // Arguments: @@ -57,17 +59,19 @@ // jshide - boolean - quick javascript expansion of the comments // and addcomment box - function getDefaultArguments() { - return array('pagename' => '[pagename]', - 'order' => 'normal', - 'mode' => 'add,show', - 'jshide' => '0', - 'noheader' => false, - //'sortby' => '-pagename' // oldest first. reverse by order=reverse - ); + function getDefaultArguments() + { + return array('pagename' => '[pagename]', + 'order' => 'normal', + 'mode' => 'add,show', + 'jshide' => '0', + 'noheader' => false, + //'sortby' => '-pagename' // oldest first. reverse by order=reverse + ); } - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { $args = $this->getArgs($argstr, $request); if (!$args['pagename']) { return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename')); @@ -89,55 +93,57 @@ // for new comments $html = HTML(); if ($args['jshide']) { - $div = HTML::div(array('id'=>'comments','style'=>'display:none;')); + $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;')); //$list->setAttr('style','display:none;'); $div->pushContent(Javascript(" function togglecomments(a) { comments=document.getElementById('comments'); if (comments.style.display=='none') { comments.style.display='block'; - a.title='"._("Click to hide the comments")."'; + a.title='" . _("Click to hide the comments") . "'; } else { comments.style.display='none'; - a.title='"._("Click to display all comments")."'; + a.title='" . _("Click to display all comments") . "'; } }")); - $html->pushContent(HTML::h4(HTML::a(array('name'=>'comment-header', - 'class'=>'wikiaction', - 'title'=>_("Click to display"), - 'onclick'=>"togglecomments(this)"), - _("Comments")))); + $html->pushContent(HTML::h4(HTML::a(array('name' => 'comment-header', + 'class' => 'wikiaction', + 'title' => _("Click to display"), + 'onclick' => "togglecomments(this)"), + _("Comments")))); } else { - $div = HTML::div(array('id'=>'comments')); + $div = HTML::div(array('id' => 'comments')); } foreach (explode(',', $args['mode']) as $show) { if (!empty($seen[$show])) continue; $seen[$show] = 1; switch ($show) { - case 'show': - $show = $this->showAll($request, $args, 'comment'); - //if ($args['jshide']) $show->setAttr('style','display:none;'); - $div->pushContent($show); - break; - case 'add': - global $WikiTheme; - if (!$WikiTheme->DUMP_MODE) { - $add = $this->showForm($request, $args, 'addcomment'); - //if ($args['jshide']) $add->setAttr('style','display:none;'); - $div->pushContent($add); - } - break; - default: - return $this->error(sprintf("Bad mode ('%s')", $show)); + case 'show': + $show = $this->showAll($request, $args, 'comment'); + //if ($args['jshide']) $show->setAttr('style','display:none;'); + $div->pushContent($show); + break; + case 'add': + global $WikiTheme; + if (!$WikiTheme->DUMP_MODE) { + $add = $this->showForm($request, $args, 'addcomment'); + //if ($args['jshide']) $add->setAttr('style','display:none;'); + $div->pushContent($add); + } + break; + default: + return $this->error(sprintf("Bad mode ('%s')", $show)); } } $html->pushContent($div); return $html; } -}; +} +; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AllPages.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -28,27 +28,30 @@ * AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastAuthoredByMe */ class WikiPlugin_AllPages -extends WikiPlugin + extends WikiPlugin { - function getName () { + function getName() + { return _("AllPages"); } - function getDescription () { + function getDescription() + { return _("List all pages in this wiki."); } - function getDefaultArguments() { + function getDefaultArguments() + { return array_merge - ( - PageList::supportedArgs(), - array( - 'noheader' => false, - 'include_empty' => false, - 'info' => '', - 'debug' => false, - 'userpages' => false - )); + ( + PageList::supportedArgs(), + array( + 'noheader' => false, + 'include_empty' => false, + 'info' => '', + 'debug' => false, + 'userpages' => false + )); } // info arg allows multiple columns @@ -57,7 +60,8 @@ // sortby: [+|-] pagename|mtime|hits // 2004-07-08 22:05:35 rurban: turned off &$request to prevent from strange bug below - function run($dbi, $argstr, $request, $basepage) { + function run($dbi, $argstr, $request, $basepage) + { $args = $this->getArgs($argstr, $request); $pages = false; @@ -67,55 +71,55 @@ } $caption = _("All pages in this wiki (%d total):"); - if ( !empty($args['userpages']) ) { + if (!empty($args['userpages'])) { $pages = PageList::allUserPages($args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '' + ); $caption = _("List of user-created pages (%d total):"); $args['count'] = $request->getArg('count'); - } elseif ( !empty($args['owner']) ) { + } elseif (!empty($args['owner'])) { $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '' + ); $args['count'] = $request->getArg('count'); if (!$args['count']) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); $caption = fmt("List of pages owned by [%s] (%d total):", - WikiLink($args['owner'] == '[]' - ? $request->_user->getAuthenticatedId() - : $args['owner'], - 'if_known'), $args['count']); + WikiLink($args['owner'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['owner'], + 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; - } elseif ( !empty($args['author']) ) { + } elseif (!empty($args['author'])) { $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '' + ); $args['count'] = $request->getArg('count'); if (!$args['count']) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); $caption = fmt("List of pages last edited by [%s] (%d total):", - WikiLink($args['author'] == '[]' - ? $request->_user->getAuthenticatedId() - : $args['author'], - 'if_known'), $args['count']); + WikiLink($args['author'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['author'], + 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; - } elseif ( !empty($args['creator']) ) { + } elseif (!empty($args['creator'])) { $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], - $args['sortby'], '' - ); + $args['sortby'], '' + ); $args['count'] = $request->getArg('count'); if (!$args['count']) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); $caption = fmt("List of pages created by [%s] (%d total):", - WikiLink($args['creator'] == '[]' - ? $request->_user->getAuthenticatedId() - : $args['creator'], - 'if_known'), $args['count']); + WikiLink($args['creator'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['creator'], + 'if_known'), $args['count']); $pages->_options['count'] = $args['count']; - //} elseif ($pages) { - // $args['count'] = count($pages); + //} elseif ($pages) { + // $args['count'] = count($pages); } else { - if (! $request->getArg('count')) + if (!$request->getArg('count')) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); else $args['count'] = $request->getArg('count'); @@ -132,17 +136,19 @@ if ($pages !== false) $pagelist->addPageList($pages); else - $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], - $args['limit']) ); + $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'], + $args['limit'])); if (DEBUG && $args['debug']) { return HTML($pagelist, - HTML::p(fmt("Elapsed time: %s s", $timer->getStats()))); + HTML::p(fmt("Elapsed time: %s s", $timer->getStats()))); } else { return $pagelist; } } -}; +} +; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AllUsers.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -31,25 +31,29 @@ * externally authenticated users with a db users table, if auth_user_exists is defined. */ class WikiPlugin_AllUsers -extends WikiPlugin + extends WikiPlugin { - function getName () { + function getName() + { return _("AllUsers"); } - function getDescription() { + function getDescription() + { return _("List all once authenticated users."); } - function getDefaultArguments() { + function getDefaultArguments() + { return array_merge - ( - PageList::supportedArgs(), - array('noheader' => false, - 'include_empty' => true, - 'debug' => false - )); + ( + PageList::supportedArgs(), + array('noheader' => false, + 'include_empty' => true, + 'debug' => false + )); } + // info arg allows multiple columns // info=mtime,hits,summary,version,author,locked,minor,markup or all // exclude arg allows multiple pagenames exclude=WikiAdmin,.SecretUser @@ -59,7 +63,8 @@ // // sortby: [+|-] pagename|mtime|hits - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { $args = $this->getArgs($argstr, $request); extract($args); @@ -68,7 +73,7 @@ } $group = $request->getGroup(); - if (method_exists($group,'_allUsers')) { + if (method_exists($group, '_allUsers')) { $allusers = $group->_allUsers(); } else { $allusers = array(); @@ -84,7 +89,7 @@ if (!$pagesize) { $pagelist->addPageList($allusers); } else { - for ($i=$offset; $i < $offset + $pagesize - 1; $i++) { + for ($i = $offset; $i < $offset + $pagesize - 1; $i++) { if ($i >= $args['count']) break; $pagelist->addPage(trim($allusers[$i])); } @@ -99,13 +104,15 @@ if (defined('DEBUG') && DEBUG and $debug) { return HTML($pagelist, - HTML::p(fmt("Elapsed time: %s s", $timer->getStats()))); + HTML::p(fmt("Elapsed time: %s s", $timer->getStats()))); } else { return $pagelist; } } -}; +} +; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -27,7 +27,7 @@ * To add a new query, see _getQueryString() */ class WikiPlugin_AnalyseAccessLogSql -extends WikiPlugin + extends WikiPlugin { /** * Build the query string @@ -53,7 +53,8 @@ * ."WHERE referer IS NOT NULL " * .$where_conditions */ - function _getQueryString(&$args) { + function _getQueryString(&$args) + { // extract any parametrised conditions from the arguments, // in particular, how much history to select $where_conditions = $this->_getWhereConditions($args); @@ -61,202 +62,214 @@ // get the correct name for the table //FIXME is there a more correct way to do this? global $DBParams, $request; - $accesslog = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '')."accesslog"; + $accesslog = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog"; $query = ''; $backend_type = $request->_dbi->_backend->backendType(); switch ($backend_type) { - case 'mysql': - $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))"; break; - case 'pgsql': - case 'postgres7': - $Referring_URL = "substr(referer,0,position('?' in referer))"; break; - default: - $Referring_URL = "referer"; - } - switch ($args['mode']) { - case 'referring_urls': - if ($where_conditions<>'') - $where_conditions = 'WHERE '.$where_conditions.' '; - $query = "SELECT " - . "$Referring_URL AS Referring_URL, " - . "count(*) AS Referral_Count " - . "FROM $accesslog " - . $where_conditions - . "GROUP BY Referring_URL"; - break; - case 'external_referers': - $args['local_referrers'] = 'false'; - $where_conditions = $this->_getWhereConditions($args); - if ($where_conditions<>'') - $where_conditions = 'WHERE '.$where_conditions.' '; - $query = "SELECT " - . "$Referring_URL AS Referring_URL, " - . "count(*) AS Referral_Count " - . "FROM $accesslog " - . $where_conditions - . "GROUP BY Referring_URL"; - break; - case 'referring_domains': - if ($where_conditions<>'') - $where_conditions = 'WHERE '.$where_conditions.' '; - switch ($backend_type) { case 'mysql': - $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))"; break; + $Referring_URL = "left(referer,length(referer)-instr(reverse(referer),'?'))"; + break; case 'pgsql': case 'postgres7': - $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')"; break; - default: - $Referring_Domain = "referer"; break; - } - $query = "SELECT " - . "$Referring_Domain AS Referring_Domain, " - . "count(*) AS Referral_Count " - . "FROM $accesslog " - . $where_conditions - . "GROUP BY Referring_Domain"; - break; - case 'remote_hosts': - if ($where_conditions<>'') - $where_conditions = 'WHERE '.$where_conditions.' '; - $query = "SELECT " - ."remote_host AS Remote_Host, " - ."count(*) AS Access_Count " - ."FROM $accesslog " - .$where_conditions - ."GROUP BY Remote_Host"; - break; - case 'users': - if ($where_conditions<>'') - $where_conditions = 'WHERE '.$where_conditions.' '; - $query = "SELECT " - ."remote_user AS User, " - ."count(*) AS Access_Count " - ."FROM $accesslog " - .$where_conditions - ."GROUP BY remote_user"; - break; - case 'host_users': - if ($where_conditions<>'') - $where_conditions = 'WHERE '.$where_conditions.' '; - $query = "SELECT " - ."remote_host AS Remote_Host, " - ."remote_user AS User, " - ."count(*) AS Access_Count " - ."FROM $accesslog " - .$where_conditions - ."GROUP BY remote_host, remote_user"; - break; - case "search_bots": - // This queries for all entries in the SQL access log table that - // have a dns name that I know to be a web search engine crawler and - // categorises the results into time buckets as per the list below - // 0 - 1 minute - 60 - // 1 - 1 hour - 3600 = 60 * 60 - // 2 - 1 day - 86400 = 60 * 60 * 24 - // 3 - 1 week - 604800 = 60 * 60 * 24 * 7 - // 4 - 1 month - 2629800 = 60 * 60 * 24 * 365.25 / 12 - // 5 - 1 year - 31557600 = 60 * 60 * 24 * 365.25 - $now = time(); - $query = "SELECT " - ."CASE WHEN $now-time_stamp<60 THEN '"._("0 - last minute")."' ELSE " - ."CASE WHEN $now-time_stamp<3600 THEN '"._("1 - 1 minute to 1 hour")."' ELSE " - ."CASE WHEN $now-time_stamp<86400 THEN '"._("2 - 1 hour to 1 day")."' ELSE " - ."CASE WHEN $now-time_stamp<604800 THEN '"._("3 - 1 day to 1 week")."' ELSE " - ."CASE WHEN $now-time_stamp<2629800 THEN '"._("4 - 1 week to 1 month")."' ELSE " - ."CASE WHEN $now-time_stamp<31557600 THEN '"._("5 - 1 month to 1 year")."' ELSE " - ."'"._("6 - more than 1 year")."' END END END END END END AS Time_Scale, " - ."remote_host AS Remote_Host, " - ."count(*) AS Access_Count " - ."FROM $accesslog " - ."WHERE (remote_host LIKE '%googlebot.com' " - ."OR remote_host LIKE '%alexa.com' " - ."OR remote_host LIKE '%inktomisearch.com' " - ."OR remote_host LIKE '%msnbot.msn.com') " - .($where_conditions ? 'AND '.$where_conditions : '') - ."GROUP BY Time_Scale, remote_host"; - break; - case "search_bots_hits": - // This queries for all entries in the SQL access log table that - // have a dns name that I know to be a web search engine crawler and - // displays the URI that was hit. - // If PHPSESSID appears in the URI, just display the URI to the left of this - $sessname = session_name(); - switch ($backend_type) { - case 'mysql': - $Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))"; + $Referring_URL = "substr(referer,0,position('?' in referer))"; break; - case 'pgsql': - case 'postgres7': - $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')"; break; default: - $Request_URI = 'request_uri'; break; - } - $now = time(); - $query = "SELECT " - ."CASE WHEN $now-time_stamp<60 THEN '"._("0 - last minute")."' ELSE " - ."CASE WHEN $now-time_stamp<3600 THEN '"._("1 - 1 minute to 1 hour")."' ELSE " - ."CASE WHEN $now-time_stamp<86400 THEN '"._("2 - 1 hour to 1 day")."' ELSE " - ."CASE WHEN $now-time_stamp<604800 THEN '"._("3 - 1 day to 1 week")."' ELSE " - ."CASE WHEN $now-time_stamp<2629800 THEN '"._("4 - 1 week to 1 month")."' ELSE " - ."CASE WHEN $now-time_stamp<31557600 THEN '"._("5 - 1 month to 1 year")."' ELSE " - ."'"._("6 - more than 1 year")."' END END END END END END AS Time_Scale, " - ."remote_host AS Remote_Host, " - ."$Request_URI AS Request_URI " - ."FROM $accesslog " - ."WHERE (remote_host LIKE '%googlebot.com' " - ."OR remote_host LIKE '%alexa.com' " - ."OR remote_host LIKE '%inktomisearch.com' " - ."OR remote_host LIKE '%msnbot.msn.com') " - .($where_conditions ? 'AND '.$where_conditions : '') - ."ORDER BY time_stamp"; + $Referring_URL = "referer"; } + switch ($args['mode']) { + case 'referring_urls': + if ($where_conditions <> '') + $where_conditions = 'WHERE ' . $where_conditions . ' '; + $query = "SELECT " + . "$Referring_URL AS Referring_URL, " + . "count(*) AS Referral_Count " + . "FROM $accesslog " + . $where_conditions + . "GROUP BY Referring_URL"; + break; + case 'external_referers': + $args['local_referrers'] = 'false'; + $where_conditions = $this->_getWhereConditions($args); + if ($where_conditions <> '') + $where_conditions = 'WHERE ' . $where_conditions . ' '; + $query = "SELECT " + . "$Referring_URL AS Referring_URL, " + . "count(*) AS Referral_Count " + . "FROM $accesslog " + . $where_conditions + . "GROUP BY Referring_URL"; + break; + case 'referring_domains': + if ($where_conditions <> '') + $where_conditions = 'WHERE ' . $where_conditions . ' '; + switch ($backend_type) { + case 'mysql': + $Referring_Domain = "left(referer, if(locate('/', referer, 8) > 0,locate('/', referer, 8) -1, length(referer)))"; + break; + case 'pgsql': + case 'postgres7': + $Referring_Domain = "substr(referer,0,8) || regexp_replace(substr(referer,8), '/.*', '')"; + break; + default: + $Referring_Domain = "referer"; + break; + } + $query = "SELECT " + . "$Referring_Domain AS Referring_Domain, " + . "count(*) AS Referral_Count " + . "FROM $accesslog " + . $where_conditions + . "GROUP BY Referring_Domain"; + break; + case 'remote_hosts': + if ($where_conditions <> '') + $where_conditions = 'WHERE ' . $where_conditions . ' '; + $query = "SELECT " + . "remote_host AS Remote_Host, " + . "count(*) AS Access_Count " + . "FROM $accesslog " + . $where_conditions + . "GROUP BY Remote_Host"; + break; + case 'users': + if ($where_conditions <> '') + $where_conditions = 'WHERE ' . $where_conditions . ' '; + $query = "SELECT " + . "remote_user AS User, " + . "count(*) AS Access_Count " + . "FROM $accesslog " + . $where_conditions + . "GROUP BY remote_user"; + break; + case 'host_users': + if ($where_conditions <> '') + $where_conditions = 'WHERE ' . $where_conditions . ' '; + $query = "SELECT " + . "remote_host AS Remote_Host, " + . "remote_user AS User, " + . "count(*) AS Access_Count " + . "FROM $accesslog " + . $where_conditions + . "GROUP BY remote_host, remote_user"; + break; + case "search_bots": + // This queries for all entries in the SQL access log table that + // have a dns name that I know to be a web search engine crawler and + // categorises the results into time buckets as per the list below + // 0 - 1 minute - 60 + // 1 - 1 hour - 3600 = 60 * 60 + // 2 - 1 day - 86400 = 60 * 60 * 24 + // 3 - 1 week - 604800 = 60 * 60 * 24 * 7 + // 4 - 1 month - 2629800 = 60 * 60 * 24 * 365.25 / 12 + // 5 - 1 year - 31557600 = 60 * 60 * 24 * 365.25 + $now = time(); + $query = "SELECT " + . "CASE WHEN $now-time_stamp<60 THEN '" . _("0 - last minute") . "' ELSE " + . "CASE WHEN $now-time_stamp<3600 THEN '" . _("1 - 1 minute to 1 hour") . "' ELSE " + . "CASE WHEN $now-time_stamp<86400 THEN '" . _("2 - 1 hour to 1 day") . "' ELSE " + . "CASE WHEN $now-time_stamp<604800 THEN '" . _("3 - 1 day to 1 week") . "' ELSE " + . "CASE WHEN $now-time_stamp<2629800 THEN '" . _("4 - 1 week to 1 month") . "' ELSE " + . "CASE WHEN $now-time_stamp<31557600 THEN '" . _("5 - 1 month to 1 year") . "' ELSE " + . "'" . _("6 - more than 1 year") . "' END END END END END END AS Time_Scale, " + . "remote_host AS Remote_Host, " + . "count(*) AS Access_Count " + . "FROM $accesslog " + . "WHERE (remote_host LIKE '%googlebot.com' " + . "OR remote_host LIKE '%alexa.com' " + . "OR remote_host LIKE '%inktomisearch.com' " + . "OR remote_host LIKE '%msnbot.msn.com') " + . ($where_conditions ? 'AND ' . $where_conditions : '') + . "GROUP BY Time_Scale, remote_host"; + break; + case "search_bots_hits": + // This queries for all entries in the SQL access log table that + // have a dns name that I know to be a web search engine crawler and + // displays the URI that was hit. + // If PHPSESSID appears in the URI, just display the URI to the left of this + $sessname = session_name(); + switch ($backend_type) { + case 'mysql': + $Request_URI = "IF(instr(request_uri, '$sessname')=0, request_uri,left(request_uri, instr(request_uri, '$sessname')-2))"; + break; + case 'pgsql': + case 'postgres7': + $Request_URI = "regexp_replace(request_uri, '$sessname.*', '')"; + break; + default: + $Request_URI = 'request_uri'; + break; + } + $now = time(); + $query = "SELECT " + . "CASE WHEN $now-time_stamp<60 THEN '" . _("0 - last minute") . "' ELSE " + . "CASE WHEN $now-time_stamp<3600 THEN '" . _("1 - 1 minute to 1 hour") . "' ELSE " + . "CASE WHEN $now-time_stamp<86400 THEN '" . _("2 - 1 hour to 1 day") . "' ELSE " + . "CASE WHEN $now-time_stamp<604800 THEN '" . _("3 - 1 day to 1 week") . "' ELSE " + . "CASE WHEN $now-time_stamp<2629800 THEN '" . _("4 - 1 week to 1 month") . "' ELSE " + . "CASE WHEN $now-time_stamp<31557600 THEN '" . _("5 - 1 month to 1 year") . "' ELSE " + . "'" . _("6 - more than 1 year") . "' END END END END END END AS Time_Scale, " + . "remote_host AS Remote_Host, " + . "$Request_URI AS Request_URI " + . "FROM $accesslog " + . "WHERE (remote_host LIKE '%googlebot.com' " + . "OR remote_host LIKE '%alexa.com' " + . "OR remote_host LIKE '%inktomisearch.com' " + . "OR remote_host LIKE '%msnbot.msn.com') " + . ($where_conditions ? 'AND ' . $where_conditions : '') + . "ORDER BY time_stamp"; + } return $query; } /** Honeypot for xgettext. Those strings are translated dynamically. */ - function _locale_dummy() { + function _locale_dummy() + { $dummy = array( - // mode caption - _("referring_urls"), - _("external_referers"), - _("referring_domains"), - _("remote_hosts"), - _("users"), - _("host_users"), - _("search_bots"), - _("search_bots_hits"), - // period header - _("minutes"), - _("hours"), - _("days"), - _("weeks"), - ); + // mode caption + _("referring_urls"), + _("external_referers"), + _("referring_domains"), + _("remote_hosts"), + _("users"), + _("host_users"), + _("search_bots"), + _("search_bots_hits"), + // period header + _("minutes"), + _("hours"), + _("days"), + _("weeks"), + ); } - function getDefaultArguments() { + function getDefaultArguments() + { return array( - 'mode' => 'referring_domains', - // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits - 'caption' => '', - // blank means use the mode as the caption/title for the output - 'local_referrers' => 'true', // only show external referring sites - 'period' => '', // the type of period to report: - // may be weeks, days, hours, minutes, or blank for all - 'count' => '0' // the number of periods to report - ); + 'mode' => 'referring_domains', + // referring_domains, referring_urls, remote_hosts, users, host_users, search_bots, search_bots_hits + 'caption' => '', + // blank means use the mode as the caption/title for the output + 'local_referrers' => 'true', // only show external referring sites + 'period' => '', // the type of period to report: + // may be weeks, days, hours, minutes, or blank for all + 'count' => '0' // the number of periods to report + ); } - function getName () { + function getName() + { return _("AnalyseAccessLogSql"); } - function getDescription () { + function getDescription() + { return _("Show summary information from the access log table."); } - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { // flag that the output may not be cached - i.e. it is dynamic $request->setArg('nocache', 1); @@ -274,24 +287,25 @@ $query = $this->_getQueryString($args); - if ($query=='') - return HTML::p(sprintf( _("Unrecognised parameter 'mode=%s'"), - $args['mode'])); + if ($query == '') + return HTML::p(sprintf(_("Unrecognised parameter 'mode=%s'"), + $args['mode'])); // get the data back. // Note that this must be done before the final generation ofthe table, // otherwise the headers will not be ready $tbody = $this->_getQueryResults($query, $dbi); - return HTML::table(array('border' => 1, - 'cellspacing' => 1, - 'cellpadding' => 1), - HTML::caption(HTML::h1(HTML::br(),$this->_getCaption($args))), - HTML::thead($this->_theadrow), - $tbody); + return HTML::table(array('border' => 1, + 'cellspacing' => 1, + 'cellpadding' => 1), + HTML::caption(HTML::h1(HTML::br(), $this->_getCaption($args))), + HTML::thead($this->_theadrow), + $tbody); } - function _getQueryResults($query, &$dbi) { + function _getQueryResults($query, &$dbi) + { $queryResult = $dbi->genericSqlIter($query); if (!$queryResult) { $tbody = HTML::tbody(HTML::tr(HTML::td(_("<empty>")))); @@ -302,7 +316,7 @@ $tr = HTML::tr(); foreach ($row as $value) { // output a '-' for empty values, otherwise the table looks strange - $tr->pushContent(HTML::td( empty($value) ? '-' : $value )); + $tr->pushContent(HTML::td(empty($value) ? '-' : $value)); } $tbody->pushContent($tr); } @@ -311,7 +325,8 @@ return $tbody; } - function _setHeaders($row) { + function _setHeaders($row) + { if (!$this->_headerSet) { foreach ($row as $key => $value) { $this->_theadrow->pushContent(HTML::th(_($key))); @@ -320,63 +335,67 @@ } } - function _getWhereConditions(&$args) { + function _getWhereConditions(&$args) + { $where_conditions = ''; - if ($args['period']<>'') { + if ($args['period'] <> '') { $since = 0; - if ($args['period']=='minutes') { + if ($args['period'] == 'minutes') { $since = 60; - } elseif ($args['period']=='hours') { + } elseif ($args['period'] == 'hours') { $since = 60 * 60; - } elseif ($args['period']=='days') { + } elseif ($args['period'] == 'days') { $since = 60 * 60 * 24; - } elseif ($args['period']=='weeks') { + } elseif ($args['period'] == 'weeks') { $since = 60 * 60 * 24 * 7; } $since = $since * $args['count']; - if ($since>0) { - if ($where_conditions<>'') - $where_conditions = $where_conditions.' AND '; + if ($since > 0) { + if ($where_conditions <> '') + $where_conditions = $where_conditions . ' AND '; $since = time() - $since; - $where_conditions = $where_conditions."time_stamp > $since"; + $where_conditions = $where_conditions . "time_stamp > $since"; } } - if ($args['local_referrers']<>'true') { + if ($args['local_referrers'] <> 'true') { global $request; - if ($where_conditions<>'') - $where_conditions = $where_conditions.' AND '; + if ($where_conditions <> '') + $where_conditions = $where_conditions . ' AND '; $localhost = SERVER_URL; $len = strlen($localhost); $backend_type = $request->_dbi->_backend->backendType(); switch ($backend_type) { - case 'mysql': - $ref_localhost = "left(referer,$len)<>'$localhost'"; break; - case 'pgsql': - case 'postgres7': - $ref_localhost = "substr(referer,0,$len)<>'$localhost'"; break; - default: - $ref_localhost = ""; + case 'mysql': + $ref_localhost = "left(referer,$len)<>'$localhost'"; + break; + case 'pgsql': + case 'postgres7': + $ref_localhost = "substr(referer,0,$len)<>'$localhost'"; + break; + default: + $ref_localhost = ""; } - $where_conditions = $where_conditions.$ref_localhost; + $where_conditions = $where_conditions . $ref_localhost; } // The assumed contract is that there is a space at the end of the // conditions string, so that following SQL clauses (such as GROUP BY) // will not cause a syntax error - if ($where_conditions<>'') - $where_conditions = $where_conditions.' '; + if ($where_conditions <> '') + $where_conditions = $where_conditions . ' '; return $where_conditions; } - function _getCaption(&$args) { + function _getCaption(&$args) + { $caption = $args['caption']; - if ($caption=='') + if ($caption == '') $caption = gettext($args['mode']); - if ($args['period']<>'' && $args['count']) - $caption = $caption." - ".$args['count']." ". gettext($args['period']); + if ($args['period'] <> '' && $args['count']) + $caption = $caption . " - " . $args['count'] . " " . gettext($args['period']); return $caption; } Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AppendText.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -31,33 +31,38 @@ * Todo: multiple pages. e.g. AppendText s=~[CategoryINtime~] page=<!plugin TitleSearch intime !> */ class WikiPlugin_AppendText -extends WikiPlugin + extends WikiPlugin { - function getName() { + function getName() + { return _("AppendText"); } - function getDescription() { + function getDescription() + { return _("Append text to any page in this wiki."); } - function getDefaultArguments() { - return array('page' => '[pagename]', - 'pages' => false, - 's' => '', // Text to append. - 'before' => '', // Add before (ignores after if defined) - 'after' => '', // Add after line beginning with this - 'redirect' => false // Redirect to modified page - ); + function getDefaultArguments() + { + return array('page' => '[pagename]', + 'pages' => false, + 's' => '', // Text to append. + 'before' => '', // Add before (ignores after if defined) + 'after' => '', // Add after line beginning with this + 'redirect' => false // Redirect to modified page + ); } - function _fallback($addtext, $oldtext, $notfound, &$message) { - $message->pushContent(sprintf(_("%s not found"), $notfound).". ". - _("Appending at the end.")."\n"); + function _fallback($addtext, $oldtext, $notfound, &$message) + { + $message->pushContent(sprintf(_("%s not found"), $notfound) . ". " . + _("Appending at the end.") . "\n"); return $oldtext . "\n" . $addtext; } - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { $args = $this->getArgs($argstr, $request); if (!$args['pages'] or !$request->isPost()) { @@ -65,7 +70,7 @@ } else { $html = HTML(); if ($args['page'] != $basepage) - $html->pushContent("pages argument overrides page argument. ignored.",HTML::br()); + $html->pushContent("pages argument overrides page argument. ignored.", HTML::br()); foreach ($args['pages'] as $pagename) { $html->pushContent($this->_work($pagename, $args, $dbi, $request)); } @@ -73,7 +78,8 @@ } } - function _work($pagename, $args, $dbi, &$request) { + function _work($pagename, $args, $dbi, &$request) + { if (empty($args['s'])) { if ($request->isPost()) { if ($pagename != _("AppendText")) @@ -87,7 +93,7 @@ if (!$page->exists()) { // We might want to create it? $message->pushContent(sprintf(_("Page could not be updated. %s doesn't exist!"), - $pagename)); + $pagename)); return $message; } @@ -101,16 +107,16 @@ // Insert before $newtext = preg_match("/\n${before}/", $oldtext) ? preg_replace("/(\n${before})/", - "\n" . preg_quote($text, "/") . "\\1", - $oldtext) + "\n" . preg_quote($text, "/") . "\\1", + $oldtext) : $this->_fallback($text, $oldtext, $args['before'], $message); } elseif (!empty($args['after'])) { // Insert after $after = preg_quote($args['after'], "/"); $newtext = preg_match("/\n${after}/", $oldtext) ? preg_replace("/(\n${after})/", - "\\1\n" . preg_quote($text, "/"), - $oldtext) + "\\1\n" . preg_quote($text, "/"), + $oldtext) : $this->_fallback($text, $oldtext, $args['after'], $message); } else { // Append at the end @@ -123,18 +129,18 @@ $meta['summary'] = sprintf(_("AppendText to %s"), $pagename); if ($page->save($newtext, $current->getVersion() + 1, $meta)) { $message->pushContent(HTML::p(array('class' => 'feedback'), - _("Page successfully updated."))); + _("Page successfully updated."))); } // AppendText has been called from the same page that got modified // so we directly show the page. - if ( $request->getArg($pagename) == $pagename ) { + if ($request->getArg($pagename) == $pagename) { // TODO: Just invalidate the cache, if AppendText didn't // change anything before. // return $request->redirect(WikiURL($pagename, false, 'absurl'), false); - // The user asked to be redirected to the modified page + // The user asked to be redirected to the modified page } elseif ($args['redirect']) { return $request->redirect(WikiURL($pagename, false, 'absurl'), false); @@ -145,8 +151,10 @@ return $message; } -}; +} +; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AsciiMath.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -33,33 +33,39 @@ * Syntax: http://www1.chapman.edu/~jipsen/mathml/asciimathsyntax.xml * Example: "int_-1^1 sqrt(1-x^2)dx = pi/2" * => <math xmlns="http://www.w3.org/1998/Math/MathML"> - <mrow><msubsup><mo>∫</mo><mn>-1</mn><mn>1</mn></msubsup></mrow> - <msqrt><mrow><mn>1</mn><mo>-</mo><msup><mi>x</mi><mn>2</mn></msup></mrow></msqrt> - <mi>d</mi> - <mi>x</mi> - <mo>=</mo> - <mfrac><mi>π</mi><mo>2</mo></mfrac> - </math> +<mrow><msubsup><mo>∫</mo><mn>-1</mn><mn>1</mn></msubsup></mrow> +<msqrt><mrow><mn>1</mn><mo>-</mo><msup><mi>x</mi><mn>2</mn></msup></mrow></msqrt> +<mi>d</mi> +<mi>x</mi> +<mo>=</mo> +<mfrac><mi>π</mi><mo>2</mo></mfrac> +</math> */ class WikiPlugin_AsciiMath -extends WikiPlugin + extends WikiPlugin { - function getName() { + function getName() + { return _("AsciiMath"); } - function getDescription() { + function getDescription() + { return _("Render ASCII Math as MathML"); } - function getDefaultArguments() { + function getDefaultArguments() + { return array(); } - function handle_plugin_args_cruft(&$argstr, &$args) { + + function handle_plugin_args_cruft(&$argstr, &$args) + { $this->source = $argstr; } - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { $args = $this->getArgs($argstr, $request); if (empty($this->source)) { return HTML::div(array('class' => "error"), "Please provide a formula to AsciiMath plugin"); @@ -74,8 +80,10 @@ $ascii_math->genMathML(); return HTML::raw($ascii_math->getMathML()); } -}; +} +; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AsciiSVG.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -26,28 +26,34 @@ * Syntax: http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html */ class WikiPlugin_AsciiSVG -extends WikiPlugin + extends WikiPlugin { - function getName() { + function getName() + { return _("AsciiSVG"); } - function getDescription() { + function getDescription() + { return _("Render inline ASCII SVG"); } - function getDefaultArguments() { - return array('width' => 200, - 'height' => 200, - 'script' => false, // one line script. not very likely - 'onmousemove' => false - ); + function getDefaultArguments() + { + return array('width' => 200, + 'height' => 200, + 'script' => false, // one line script. not very likely + 'onmousemove' => false + ); } - function handle_plugin_args_cruft(&$argstr, &$args) { + + function handle_plugin_args_cruft(&$argstr, &$args) + { $this->source = $argstr; } - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { global $WikiTheme; $args = $this->getArgs($argstr, $request); if (empty($this->source)) @@ -55,7 +61,7 @@ $html = HTML(); if (empty($WikiTheme->_asciiSVG)) { $js = JavaScript('', array - ('src' => $WikiTheme->_findData('ASCIIsvg.js'))); + ('src' => $WikiTheme->_findData('ASCIIsvg.js'))); if (empty($WikiTheme->_headers_printed)) $WikiTheme->addMoreHeaders($js); else @@ -67,10 +73,10 @@ $this->source = $m[1]; $args['script'] = $m[2]; } - $embedargs = array('width' => $args['width'], - 'height' => $args['height'], - //'src' => "d.svg", - 'script' => $this->source); + $embedargs = array('width' => $args['width'], + 'height' => $args['height'], + //'src' => "d.svg", + 'script' => $this->source); // additional onmousemove argument if ($args['onmousemove']) $embedargs['onmousemove'] = $args['onmousemove']; // we need script='data' and not script="data" @@ -79,10 +85,14 @@ if ($args['script']) $html->pushContent(JavaScript($args['script'])); return $html; } -}; +} -class AsciiSVG_HTML extends HtmlElement { - function startTag() { +; + +class AsciiSVG_HTML extends HtmlElement +{ + function startTag() + { $start = "<" . $this->_tag; $this->_setClasses(); foreach ($this->_attr as $attr => $val) { Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AtomFeed.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -26,27 +26,31 @@ require_once 'lib/AtomParser.php'; class WikiPlugin_AtomFeed -extends WikiPlugin + extends WikiPlugin { - function getName() { + function getName() + { return _('AtomFeed'); } - function getDescription() { + function getDescription() + { return _('Atom Aggregator Plugin'); } - function getDefaultArguments() { + function getDefaultArguments() + { return array( - 'feed' => "", - 'description' => "", - 'url' => "", - 'maxitem' => 0, - 'titleonly' => false + 'feed' => "", + 'description' => "", + 'url' => "", + 'maxitem' => 0, + 'titleonly' => false ); } - function run($dbi, $argstr, &$request, $basepage) { + function run($dbi, $argstr, &$request, $basepage) + { extract($this->getArgs($argstr, $request)); $parser = new AtomParser(); @@ -59,7 +63,7 @@ foreach ($parser->feed as $feed) { $title = HTML::h3(HTML::a(array('href' => $feed["links"]["0"]["href"]), $feed["title"])); $counter = 1; - foreach($parser->entries as $entry) { + foreach ($parser->entries as $entry) { $item = HTML::dt(HTML::a(array('href' => $entry["links"]["0"]["href"]), $entry["title"])); $items->pushContent($item); @@ -75,7 +79,7 @@ } $counter++; } - $html = HTML::div(array('class'=> 'rss'), $title); + $html = HTML::div(array('class' => 'rss'), $title); $html->pushContent($items); } Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2012-10-05 14:17:00 UTC (rev 8396) +++ trunk/lib/plugin/AuthorHistory.php 2012-10-05 16:47:39 UTC (rev 8397) @@ -57,32 +57,37 @@ require_once 'lib/PageList.php'; class WikiPlugin_AuthorHistory -extends WikiPlugin + extends WikiPlugin { - function getName() { + function getName() + { return _("AuthorHistory"); } - function getDescription() { + function getDescription() + { return sprintf(_("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user.")); } - function getDefaultArguments() { + function getDefaultArguments() + { global $request; - return array('exclude' => '', - 'noheader' => false, - 'includeminor' => false, - 'includedeleted' => false, - 'author' => $request->_user->UserName(), - 'page' => '[pagename]', - 'info' => 'version,minor,author,summary,mtime' - ); + return array('exclude' => '', + 'noheader' => false, + 'includeminor' => false, + 'includedeleted' => false, + 'author' => $request->_user->UserName(), + 'page' => '[pagename]', + 'info' => 'version,minor,author,summary,mtime' + ); } + // info arg allows multiple columns // info=mtime,hits,summary,version,author,locked,minor // exclude arg allows multiple pagenames exclude=HomePage,RecentChanges - ... [truncated message content] |
From: <var...@us...> - 2012-10-08 23:19:17
|
Revision: 8401 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8401&view=rev Author: vargenau Date: 2012-10-08 23:19:11 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Fix Phpdoc Modified Paths: -------------- trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/VisualWiki.php Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/FoafViewer.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -194,6 +194,8 @@ * * @param $array Source array * @param $index Element Index to use. + * @param null $dc + * @return \RawXml * @todo Make sure it can look more than 1 layer deep * @todo Pass in dublincore metadata */ Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/GraphViz.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -159,6 +159,9 @@ * Sets the imagetype according to user wishes and * relies on WikiPluginCached to catch illegal image * formats. + * @param WikiDB $dbi + * @param array $argarray + * @param Request $request * @return string 'png', 'jpeg', 'gif' */ function getImageType($dbi, $argarray, $request) @@ -352,6 +355,7 @@ * 'none') * @param shape string node shape; 'ellipse', 'box', 'circle', 'point' * @param label string not used anymore + * @return array */ function invokeDot($argarray) { Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/PhotoAlbum.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -555,6 +555,7 @@ * * @param string $src path to dir or textfile (local or remote) * @param array $photos + * @param string $webpath * @return string Error when bad url or file couldn't be opened */ function fromFile($src, &$photos, $webpath = '') Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/Ploticus.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -142,6 +142,9 @@ * this case, because png will definitely have the * best results.) * + * @param WikiDB $dbi + * @param array $argarray + * @param Request $request * @return string 'png', 'jpeg', 'gif' */ function getImageType($dbi, $argarray, $request) Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/PopularNearby.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -105,6 +105,7 @@ * @param $pages array of WikiDB_Page's or a Page_iterator * @param $direction boolean: true if incoming links * + * @param int $limit * @return Array of sorted links */ function sortedLinks($pages, $direction = false, $limit = 5) Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/RateIt.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -309,13 +309,18 @@ * * This needs to be put in the <body> section of the page. * - * @param pagename Name of the page to rate + * @param Name $pagename * @param version Version of the page to rate (may be "" for current) - * @param imgPrefix Prefix of the names of the images that display the rating + * @param Prefix $imgPrefix + * @param Id $dimension + * @param bool|Makes $small + * @return \HtmlElement + * @internal param \Name $pagename of the page to rate + * @internal param \Prefix $imgPrefix of the names of the images that display the rating * You can have two widgets for the same page displayed at * once iff the imgPrefix-s are different. - * @param dimension Id of the dimension to rate - * @param small Makes a smaller ratings widget if non-false + * @internal param \Id $dimension of the dimension to rate + * @internal param \Makes $small a smaller ratings widget if non-false * * Limitations: Currently this can only print the current users ratings. * And only the widget, but no value (for buddies) also. Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/RecentChanges.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -1108,6 +1108,8 @@ /** Constructor * * @param $revisions object a WikiDB_PageRevisionIterator. + * @param bool $check_current_revision + * @return void */ function NonDeletedRevisionIterator($revisions, $check_current_revision = true) { Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2012-10-08 09:07:20 UTC (rev 8400) +++ trunk/lib/plugin/VisualWiki.php 2012-10-08 23:19:11 UTC (rev 8401) @@ -150,6 +150,9 @@ /** * Checks options, creates help page if necessary, calls both * database access and image map production functions. + * @param WikiDB $dbi + * @param array $argarray + * @param Request $request * @return array($map,$html) */ function getMap($dbi, $argarray, $request) @@ -221,10 +224,13 @@ * Selects the first (smallest or biggest) WikiPages in * a given category. * - * @param number integer number of page names to be found - * @param category string attribute of the pages which is used + * @param int $number + * @param string $category + * @param bool $minimum + * @internal param int $number number of page names to be found + * @internal param string $category attribute of the pages which is used * to compare them - * @param minimum boolean true finds smallest, false finds biggest + * @internal param bool $minimum true finds smallest, false finds biggest * @return array list of page names found to be the best */ function findbest($number, $category, $minimum) @@ -273,20 +279,22 @@ * like size, age, revision number which are used to find the * most attractive pages. * - * @param dbi WikiDB database handle to access all Wiki pages - * @param LARGE integer number of largest pages which should + * @param WikiDB $dbi + * @param $argarray + * @internal param \WikiDB $dbi database handle to access all Wiki pages + * @internal param int $LARGE number of largest pages which should * be included - * @param RECENT integer number of the youngest pages to be included - * @param REFINED integer number of the pages with shortes revision + * @internal param int $RECENT number of the youngest pages to be included + * @internal param int $REFINED number of the pages with shortes revision * interval - * @param BACKLINK integer number of the pages with most backlinks - * @param EXCLUDELIST string colon ':' separated list of page names which + * @internal param int $BACKLINK number of the pages with most backlinks + * @internal param string $EXCLUDELIST colon ':' separated list of page names which * should not be displayed (like PhpWiki, for * example) - * @param INCLUDELIST string colon separated list of pages which are + * @internal param string $INCLUDELIST colon separated list of pages which are * always included (for example your own * page :) - * @param COLOR string 'age', 'revtime' or 'none'; Selects which + * @internal param string $COLOR 'age', 'revtime' or 'none'; Selects which * page feature is used to determine the * filling color of the nodes in the graph. * @return void @@ -417,13 +425,15 @@ * Creates the text file description of the graph needed to invoke * <code>dot</code>. * - * @param filename string name of the dot file to be created - * @param width float width of the output graph in inches - * @param height float height of the graph in inches - * @param colorby string color sceme beeing used ('age', 'revtime', + * @param string $filename + * @param bool $argarray + * @internal param string $filename name of the dot file to be created + * @internal param float $width width of the output graph in inches + * @internal param float $height height of the graph in inches + * @internal param string $colorby color sceme beeing used ('age', 'revtime', * 'none') - * @param shape string node shape; 'ellipse', 'box', 'circle', 'point' - * @param label string 'name': label by name, + * @internal param string $shape node shape; 'ellipse', 'box', 'circle', 'point' + * @internal param string $label 'name': label by name, * 'number': label by unique number * @return boolean error status; true=ok; false=error */ @@ -534,14 +544,17 @@ * called only if debug=static. * * @access private - * @param url string url pointing to the image part of the map - * @param map string <area> tags defining active + * @param string $url + * @param WikiDB $dbi + * @param array $argarray + * @param request Request ??? + * @internal param string $url url pointing to the image part of the map + * @internal param string $map <area> tags defining active * regions in the map - * @param dbi WikiDB database abstraction class - * @param argarray array complete (!) arguments to produce + * @internal param \WikiDB $dbi database abstraction class + * @internal param array $argarray complete (!) arguments to produce * image. It is not necessary to call * WikiPlugin->getArgs anymore. - * @param request Request ??? * @return string html output */ function embedImg($url, &$dbi, $argarray, &$request) @@ -606,7 +619,8 @@ * Translates a value from 0.0 to 1.0 into rainbow color. * red -> orange -> green -> blue -> gray * - * @param promille float value between 0.0 and 1.0 + * @param float $promille + * @internal param float $promille value between 0.0 and 1.0 * @return array(red,green,blue) */ function getColor($promille) @@ -623,6 +637,9 @@ /** * Linear interpolates a value between two point a and b * at a value pos. + * @param $a + * @param $b + * @param $pos * @return float interpolated value */ function interpolate($a, $b, $pos) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-10-11 09:25:03
|
Revision: 8409 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8409&view=rev Author: vargenau Date: 2012-10-11 09:24:50 +0000 (Thu, 11 Oct 2012) Log Message: ----------- Remove useless semicolon Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AddComment.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -142,8 +142,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AllPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -147,8 +147,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AllUsers.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -111,8 +111,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AppendText.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -153,8 +153,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AsciiMath.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -82,8 +82,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AsciiSVG.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -87,8 +87,8 @@ } } -; + class AsciiSVG_HTML extends HtmlElement { function startTag() Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/AuthorHistory.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -221,8 +221,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/BackLinks.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -176,8 +176,8 @@ } -; + // how many links from this backLink to other pages class _PageList_Column_BackLinks_count extends _PageList_Column { Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/BlogArchives.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -150,8 +150,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/BlogJournal.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -108,8 +108,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Calendar.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -246,8 +246,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CalendarList.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -226,8 +226,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CategoryPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -82,8 +82,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Chart.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -154,8 +154,8 @@ } } -; + class SVG_HTML extends HtmlElement { function startTag() Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Comment.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -60,8 +60,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CreateBib.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -158,8 +158,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CreatePage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -150,8 +150,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CreateToc.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -528,8 +528,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/CurrentTime.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -85,8 +85,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/DeadEndPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -33,8 +33,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Diff.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -202,8 +202,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/DynamicIncludePage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -97,8 +97,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/EditMetaData.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -194,8 +194,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ExternalSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -154,8 +154,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FacebookLike.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -76,8 +76,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FileInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -351,8 +351,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FrameInclude.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -148,8 +148,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FullTextSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -153,8 +153,8 @@ } } -; + /* * List of Links and link to ListLinks */ Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/FuzzyPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -200,8 +200,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GoTo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -88,8 +88,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GoogleMaps.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -157,8 +157,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GooglePlugin.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -126,8 +126,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/GraphViz.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -464,8 +464,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/HelloWorld.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -72,8 +72,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Imdb.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -109,8 +109,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/IncludePage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -212,8 +212,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/IncludePages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -86,8 +86,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/InterWikiSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -64,8 +64,8 @@ } } -; + /** * @desc */ Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/JabberPresence.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -74,8 +74,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LdapSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -205,8 +205,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LikePages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -116,8 +116,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LinkDatabase.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -182,8 +182,8 @@ } } -; + class _PageList_Column_LinkDatabase_links extends _PageList_Column { function _getValue($page, &$revision_handle) Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/LinkSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -165,8 +165,8 @@ } } -; + // FIXME: sortby errors with this column class _PageList_Column_LinkSearch_link extends _PageList_Column Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ListPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -132,8 +132,8 @@ } } -; + // how many back-/forwardlinks for this page class _PageList_Column_ListPages_count extends _PageList_Column { Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ListRelations.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -62,8 +62,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ListSubpages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -113,8 +113,8 @@ } } -; + // how many backlinks for this subpage class _PageList_Column_ListSubpages_count extends _PageList_Column { Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/ModeratedPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -458,8 +458,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/MostPopular.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -102,8 +102,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/NewPagesPerUser.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -136,8 +136,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/NoCache.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -61,8 +61,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/OldStyleTable.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -153,8 +153,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/OrphanedPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -98,8 +98,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageDump.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -319,8 +319,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageGroup.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -203,8 +203,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageHistory.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -353,8 +353,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -71,8 +71,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PageTrail.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -93,8 +93,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PasswordReset.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -195,8 +195,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PhotoAlbum.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -669,8 +669,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PhpHighlight.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -182,8 +182,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PhpWeather.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -197,8 +197,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Ploticus.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -301,8 +301,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PluginManager.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -186,8 +186,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PopUp.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -100,8 +100,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PopularNearby.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -151,8 +151,8 @@ } } -; + function cmp_by_hits($a, $b) { if ($a['hits'] == $b['hits']) return 0; Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/PreferenceApp.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -310,8 +310,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Processing.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -86,8 +86,8 @@ } } -; + class Processing_HTML extends HtmlElement { function startTag() Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RandomPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -113,8 +113,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RateIt.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -450,8 +450,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RecentChanges.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -1474,8 +1474,8 @@ } -; + class OptionsButtonBars extends HtmlElement { Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RedirectTo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -106,8 +106,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/RssFeed.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -129,8 +129,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SearchHighlight.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -110,8 +110,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SemanticRelations.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -143,8 +143,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SemanticSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -435,8 +435,8 @@ } } -; + class _PageList_Column_SemanticSearch_relation extends _PageList_Column { Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -220,8 +220,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SiteMap.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -223,8 +223,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SpellCheck.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -191,8 +191,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SqlResult.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -220,8 +220,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SyncWiki.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -365,8 +365,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/SyntaxHighlighter.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -162,8 +162,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/TeX2png.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -238,8 +238,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Template.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -267,8 +267,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/TitleSearch.php =================================================================== --- trunk/lib/plugin/TitleSearch.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/TitleSearch.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -109,8 +109,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Transclude.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -162,8 +162,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/TranslateText.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -135,8 +135,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UnfoldSubpages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -181,8 +181,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UriResolver.php =================================================================== --- trunk/lib/plugin/UriResolver.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UriResolver.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -65,8 +65,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UserPreferences.php =================================================================== --- trunk/lib/plugin/UserPreferences.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UserPreferences.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -176,8 +176,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/UserRatings.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -233,8 +233,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/Video.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -146,8 +146,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WantedPages.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -143,8 +143,8 @@ } } -; + // which links to the missing page class _PageList_Column_WantedPages_wanted extends _PageList_Column { Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WantedPagesOld.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -215,8 +215,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WatchPage.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -172,8 +172,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WhoIsOnline.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -206,8 +206,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminRemove.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -248,8 +248,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminRename.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -331,8 +331,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -181,8 +181,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiAdminUtils.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -311,8 +311,8 @@ } } -; + require_once 'lib/PageList.php'; class _PageList_Column_email Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiBlog.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -432,8 +432,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiForm.php =================================================================== --- trunk/lib/plugin/WikiForm.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiForm.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -116,8 +116,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiFormRich.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -399,8 +399,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiForum.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -136,8 +136,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/WikiPoll.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -337,8 +337,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/YouTube.php =================================================================== --- trunk/lib/plugin/YouTube.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/YouTube.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -200,8 +200,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_AuthInfo.php =================================================================== --- trunk/lib/plugin/_AuthInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_AuthInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -201,8 +201,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_BackendInfo.php =================================================================== --- trunk/lib/plugin/_BackendInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_BackendInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -201,8 +201,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_GroupInfo.php =================================================================== --- trunk/lib/plugin/_GroupInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_GroupInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -67,4 +67,4 @@ } } -; + Modified: trunk/lib/plugin/_PreferencesInfo.php =================================================================== --- trunk/lib/plugin/_PreferencesInfo.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_PreferencesInfo.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -51,8 +51,8 @@ } } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_Retransform.php =================================================================== --- trunk/lib/plugin/_Retransform.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_Retransform.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -85,8 +85,8 @@ } -; + // Local Variables: // mode: php // tab-width: 8 Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/_WikiTranslation.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -382,8 +382,8 @@ } } -; + class _PageList_Column_customlang extends _PageList_Column { function _PageList_Column_customlang($field, $from_lang, $plugin) Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2012-10-11 07:32:06 UTC (rev 8408) +++ trunk/lib/plugin/text2png.php 2012-10-11 09:24:50 UTC (rev 8409) @@ -231,8 +231,8 @@ } } -; + // 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...> - 2012-10-26 13:41:14
|
Revision: 8421 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8421&view=rev Author: vargenau Date: 2012-10-26 13:41:02 +0000 (Fri, 26 Oct 2012) Log Message: ----------- elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words. Modified Paths: -------------- trunk/lib/plugin/Calendar.php trunk/lib/plugin/RedirectTo.php Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2012-10-26 13:14:46 UTC (rev 8420) +++ trunk/lib/plugin/Calendar.php 2012-10-26 13:41:02 UTC (rev 8421) @@ -150,7 +150,7 @@ if ($mday == $this->_today) { $mday = HTML::strong($mday); $td->setAttr('class', 'cal-today'); - } else if ($dbi->isWikiPage($page_for_date)) { + } elseif ($dbi->isWikiPage($page_for_date)) { $this->_links[] = $page_for_date; $td->setAttr('class', 'cal-day'); } Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-10-26 13:14:46 UTC (rev 8420) +++ trunk/lib/plugin/RedirectTo.php 2012-10-26 13:41:02 UTC (rev 8421) @@ -75,7 +75,7 @@ if (!$thispage->get('locked')) { return $this->disabled(_("Redirect to an external URL is only allowed in locked pages.")); } - } else if ($page) { + } elseif ($page) { $url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename')), 'abs_path'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |