From: <var...@us...> - 2010-12-16 12:52:17
|
Revision: 7780 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7780&view=rev Author: vargenau Date: 2010-12-16 12:52:11 +0000 (Thu, 16 Dec 2010) Log Message: ----------- forcvs --> forsvn Modified Paths: -------------- trunk/lib/plugin/PageDump.php Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2010-12-16 12:48:00 UTC (rev 7779) +++ trunk/lib/plugin/PageDump.php 2010-12-16 12:52:11 UTC (rev 7780) @@ -36,7 +36,7 @@ * * Usage: * Direct URL access: - * http://...phpwiki/PageDump?page=HomePage?format=forcvs + * http://...phpwiki/PageDump?page=HomePage?format=forsvn * http://...phpwiki/index.php?PageDump&page=HomePage * http://...phpwiki/index.php?PageDump&page=HomePage&download=1 * Static: @@ -63,7 +63,7 @@ return array('s' => false, 'page' => '[pagename]', //'encoding' => 'binary', // 'binary', 'quoted-printable' - 'format' => false, // 'normal', 'forcvs', 'backup' + 'format' => false, // 'normal', 'forsvn', 'forcvs', 'backup' // display within WikiPage or give a downloadable // raw pgsrc? 'download' => false); @@ -91,7 +91,7 @@ $mailified = MailifyPage($p, ($format == 'backup') ? 99 : 1); // fixup_headers massages the page dump headers depending on - // the 'format' argument, 'normal'(default) or 'forcvs'. + // the 'format' argument, 'normal'(default) or 'forsvn'. // // Normal: Don't add X-Rcs-Id, add unique Message-Id, don't // strip any fields from Content-Type. @@ -102,8 +102,8 @@ $this->pagename = $page; $this->generateMessageId($mailified); - if ($format == 'forcvs') - $this->fixup_headers_forcvs($mailified); + if (($format == 'forsvn') || ($format == 'forcvs')) + $this->fixup_headers_forsvn($mailified); else // backup or normal $this->fixup_headers($mailified); @@ -142,9 +142,9 @@ // text if it is too long--unless quoted-printable (TODO). $mailified = wordwrap($mailified, 70); - $dlcvs = Button(array(//'page' => $page, + $dlsvn = Button(array(//'page' => $page, 'action' => $this->getName(), - 'format'=> 'forcvs', + 'format'=> 'forsvn', 'download'=> true), _("Download for Subversion"), $page); @@ -166,7 +166,7 @@ if (!$Sep = $WikiTheme->getButtonSeparator()) $Sep = " "; - if ($format == 'forcvs') { + if ($format == 'forsvn') { $desc = _("(formatted for PhpWiki developers as pgsrc template, not for backing up)"); $altpreviewbuttons = HTML( Button(array('action' => $this->getName()), @@ -183,7 +183,7 @@ $desc = _("(formatted for backing up: all revisions)"); // all revisions $altpreviewbuttons = HTML( Button(array('action' => $this->getName(), - 'format'=> 'forcvs'), + 'format'=> 'forsvn'), _("Preview as developer format"), $page), $Sep, @@ -196,7 +196,7 @@ $desc = _("(normal formatting: latest revision only)"); $altpreviewbuttons = HTML( Button(array('action' => $this->getName(), - 'format'=> 'forcvs'), + 'format'=> 'forsvn'), _("Preview as developer format"), $page), $Sep, @@ -222,7 +222,7 @@ HTML::div(array('class' => 'errors'), HTML::strong(_("Warning:")), " ", $warning), - $dl, $Sep, $dlall, $Sep, $dlcvs + $dl, $Sep, $dlall, $Sep, $dlsvn ); } @@ -269,7 +269,7 @@ $mailified = implode("\n", array_values($return)); } - function fixup_headers_forcvs(&$mailified) { + function fixup_headers_forsvn(&$mailified) { $array = explode("\n", $mailified); // Massage headers to prepare for developer checkin to Subversion. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |