From: Reini U. <ru...@us...> - 2007-02-17 22:39:07
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9758 Modified Files: display.php Log Message: format=rss overhaul Index: display.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v retrieving revision 1.70 retrieving revision 1.71 diff -u -2 -b -p -d -r1.70 -r1.71 --- display.php 22 Jan 2007 23:43:06 -0000 1.70 +++ display.php 17 Feb 2007 22:39:05 -0000 1.71 @@ -88,4 +88,5 @@ function actionPage(&$request, $action) } else { $pagelist = null; + include_once('lib/WikiPlugin.php'); // Then the multi-page formats // rss (if not already handled by RecentChanges) @@ -93,5 +94,4 @@ function actionPage(&$request, $action) foreach($transformedContent->_content as $cached_element) { if (is_a($cached_element, "Cached_PluginInvocation")) { - include_once('lib/WikiPlugin.php'); $loader = new WikiPluginLoader; $markup = null; @@ -103,5 +103,5 @@ function actionPage(&$request, $action) } if (!$pagelist or !is_a($pagelist, 'PageList')) { - if (!in_array($format, array("atom","rss","rdf"))) + if (!in_array($format, array("rss91","rss2","rss","atom","rdf"))) trigger_error(sprintf("Format %s requires an actionpage returning a pagelist.", $format) ."\n".("Fall back to single page mode"), E_USER_WARNING); @@ -112,20 +112,17 @@ function actionPage(&$request, $action) include_once("lib/pdf.php"); ConvertAndDisplayPdfPageList($request, $pagelist); - } elseif ($format == 'rss') { - include_once("lib/plugin/RecentChanges.php"); - $rdf = new RssWriter($request, $pagelist); - $rdf->format(); - } elseif ($format == 'rss91') { + } elseif (in_array($format, array("rss91","rss2","rss"))) { + if ($pagename == _("RecentChanges")) { + $template->printExpansion($toks); + } else { include_once("lib/plugin/RecentChanges.php"); - $rdf = new RSS91Writer($request, $pagelist); - $rdf->format(); - } elseif ($format == 'rss2') { - include_once("lib/RssWriter2.php"); - $rdf = new RssWriter2($request, $pagelist); - $rdf->format(); + $plugin = new WikiPlugin_RecentChanges(); + $args = $request->getargs(); + return $plugin->format($plugin->getChanges($request->_dbi, $args), $args); + } } elseif ($format == 'atom') { - include_once("lib/plugin/RssWriter.php"); - $rdf = new AtomWriter($request, $pagelist); - $rdf->format(); + include_once("lib/RssWriter.php"); + $rdf = new AtomFeed($request, $pagelist); + $rdf->__spew(); } elseif ($format == 'rdf') { // all semantic relations and attributes include_once("lib/SemanticWeb.php"); @@ -310,20 +307,17 @@ function displayPage(&$request, $templat include_once("lib/pdf.php"); ConvertAndDisplayPdfPageList($request, $pagelist); - } elseif ($format == 'rss') { - include_once("lib/plugin/RecentChanges.php"); - $rdf = new RssWriter($request, $pagelist); - $rdf->format(); - } elseif ($format == 'rss91') { + } elseif (in_array($format, array("rss91","rss2","rss"))) { + if ($pagename == _("RecentChanges")) + $template->printExpansion($toks); + else { include_once("lib/plugin/RecentChanges.php"); - $rdf = new RSS91Writer($request, $pagelist); - $rdf->format(); - } elseif ($format == 'rss2') { - include_once("lib/RssWriter2.php"); - $rdf = new RssWriter2($request, $pagelist); - $rdf->format(); - } elseif ($format == 'atom') { - include_once("lib/plugin/RssWriter.php"); + $plugin = new WikiPlugin_RecentChanges(); + $args = $request->getargs(); + return $plugin->format($plugin->getChanges($request->_dbi, $args), $args); + } + /*} elseif ($format == 'atom') { + include_once("lib/RssWriter.php"); $rdf = new AtomWriter($request, $pagelist); - $rdf->format(); + $rdf->format();*/ } elseif ($format == 'rdf') { // all semantic relations and attributes include_once("lib/SemanticWeb.php"); @@ -352,4 +346,7 @@ function displayPage(&$request, $templat // $Log$ +// Revision 1.71 2007/02/17 22:39:05 rurban +// format=rss overhaul +// // Revision 1.70 2007/01/22 23:43:06 rurban // Add RecentChanges format=sidebar |