Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8083] trunk/lib/display.php
|
From: <var...@us...> - 2011-05-20 09:29:46
|
Revision: 8083
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8083&view=rev
Author: vargenau
Date: 2011-05-20 09:29:40 +0000 (Fri, 20 May 2011)
Log Message:
-----------
Fix whitespace
Modified Paths:
--------------
trunk/lib/display.php
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2011-05-20 09:06:15 UTC (rev 8082)
+++ trunk/lib/display.php 2011-05-20 09:29:40 UTC (rev 8083)
@@ -84,13 +84,13 @@
$transformedContent = $actionrev->getTransformedContent();
- /* Optionally tell google (and others) not to take notice of action pages.
- RecentChanges or AllPages might be an exception.
- */
+ /* Optionally tell google (and others) not to take notice of action pages.
+ RecentChanges or AllPages might be an exception.
+ */
$args = array();
if (GOOGLE_LINKS_NOFOLLOW) {
$robots = "noindex,nofollow";
- $args = array('ROBOTS_META' => $robots);
+ $args = array('ROBOTS_META' => $robots);
}
/* Handle other formats: So far we had html only.
@@ -104,79 +104,79 @@
/* At first the single page formats: html, xml */
if ($pagename == _("LinkDatabase")) {
$template = Template('browse', array('CONTENT' => $transformedContent));
- GeneratePage($template, $pagetitle, $revision, $args);
+ GeneratePage($template, $pagetitle, $revision, $args);
} elseif (!$format or $format == 'html' or $format == 'sidebar' or $format == 'contribs') {
- $template = Template('browse', array('CONTENT' => $transformedContent));
- GeneratePage($template, $pagetitle, $revision, $args);
+ $template = Template('browse', array('CONTENT' => $transformedContent));
+ GeneratePage($template, $pagetitle, $revision, $args);
} elseif ($format == 'xml') {
$request->setArg('format','');
- $template = new Template('browse', $request,
+ $template = new Template('browse', $request,
array('revision' => $revision,
'CONTENT' => $transformedContent,
));
- $html = GeneratePageAsXML($template, $pagename, $revision /*,
+ $html = GeneratePageAsXML($template, $pagename, $revision /*,
array('VALID_LINKS' => $args['VALID_LINKS'])*/);
- header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
- echo $html;
+ header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
+ echo $html;
} else {
$pagelist = null;
require_once('lib/WikiPlugin.php');
- // Then the multi-page formats
- // rss (if not already handled by RecentChanges)
- // Need the pagelist from the first plugin
- foreach($transformedContent->_content as $cached_element) {
- if (is_a($cached_element, "Cached_PluginInvocation")) {
- $loader = new WikiPluginLoader;
- $markup = null;
- // return the first found pagelist
- $pagelist = $loader->expandPI($cached_element->_pi, $request,
- $markup, $pagename);
- if (is_a($pagelist, 'PageList'))
- break;
+ // Then the multi-page formats
+ // rss (if not already handled by RecentChanges)
+ // Need the pagelist from the first plugin
+ foreach($transformedContent->_content as $cached_element) {
+ if (is_a($cached_element, "Cached_PluginInvocation")) {
+ $loader = new WikiPluginLoader;
+ $markup = null;
+ // return the first found pagelist
+ $pagelist = $loader->expandPI($cached_element->_pi, $request,
+ $markup, $pagename);
+ if (is_a($pagelist, 'PageList'))
+ break;
+ }
}
- }
if (!$pagelist or !is_a($pagelist, 'PageList')) {
- if (!in_array($format, array("rss91","rss2","rss","atom","rdf")))
- trigger_error(sprintf("Format %s requires an actionpage returning a pagelist.",
+ 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);
- require_once('lib/PageList.php');
- $pagelist = new PageList();
- if ($format == 'pdf')
- $pagelist->addPage($page);
- } else {
+ require_once('lib/PageList.php');
+ $pagelist = new PageList();
+ if ($format == 'pdf')
+ $pagelist->addPage($page);
+ } else {
foreach ($pagelist->_pages as $page) {
$name = $page->getName();
if ($name != $pagename and $page->exists())
$args['VALID_LINKS'][] = $name;
}
- }
- if ($format == 'pdf') {
- require_once("lib/pdf.php");
- array_unshift($args['VALID_LINKS'], $pagename);
- ConvertAndDisplayPdfPageList($request, $pagelist, $args);
- }
- elseif ($format == 'ziphtml') { // need to fix links
- require_once('lib/loadsave.php');
- array_unshift($args['VALID_LINKS'], $pagename);
- $request->setArg('zipname', FilenameForPage($pagename).".zip");
- $request->setArg('pages', $args['VALID_LINKS']);
- $request->setArg('format','');
- MakeWikiZipHtml($request);
- } // time-sorted RDF á la RecentChanges
- elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+ }
+ if ($format == 'pdf') {
+ require_once("lib/pdf.php");
+ array_unshift($args['VALID_LINKS'], $pagename);
+ ConvertAndDisplayPdfPageList($request, $pagelist, $args);
+ }
+ elseif ($format == 'ziphtml') { // need to fix links
+ require_once('lib/loadsave.php');
+ array_unshift($args['VALID_LINKS'], $pagename);
+ $request->setArg('zipname', FilenameForPage($pagename).".zip");
+ $request->setArg('pages', $args['VALID_LINKS']);
+ $request->setArg('format','');
+ MakeWikiZipHtml($request);
+ } // time-sorted RDF à la RecentChanges
+ elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
$args = $request->getArgs();
//$request->setArg('format','');
if ($pagename == _("RecentChanges")) {
$template->printExpansion($args);
- } else {
- require_once("lib/plugin/RecentChanges.php");
- $plugin = new WikiPlugin_RecentChanges();
+ } else {
+ require_once("lib/plugin/RecentChanges.php");
+ $plugin = new WikiPlugin_RecentChanges();
return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
- }
- } elseif ($format == 'json') { // for faster autocompletion on searches
- $req_args =& $request->args;
- unset($req_args['format']);
+ }
+ } elseif ($format == 'json') { // for faster autocompletion on searches
+ $req_args =& $request->args;
+ unset($req_args['format']);
$json = array('count' => count($pagelist->_pages),
'list' => $args['VALID_LINKS'],
'args' => $req_args,
@@ -190,26 +190,26 @@
}
header("Content-Type: application/json");
die($json_enc);
- } elseif ($format == 'rdf') { // all semantic relations and attributes
- require_once("lib/SemanticWeb.php");
- $rdf = new RdfWriter($request, $pagelist);
- $rdf->format();
- } elseif ($format == 'rdfs') {
- require_once("lib/SemanticWeb.php");
- $rdf = new RdfsWriter($request, $pagelist);
- $rdf->format();
- } elseif ($format == 'owl') { // or daml?
- require_once("lib/SemanticWeb.php");
- $rdf = new OwlWriter($request, $pagelist);
- $rdf->format();
- } else {
- if (!in_array($pagename, array(_("LinkDatabase"))))
- trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
+ } elseif ($format == 'rdf') { // all semantic relations and attributes
+ require_once("lib/SemanticWeb.php");
+ $rdf = new RdfWriter($request, $pagelist);
+ $rdf->format();
+ } elseif ($format == 'rdfs') {
+ require_once("lib/SemanticWeb.php");
+ $rdf = new RdfsWriter($request, $pagelist);
+ $rdf->format();
+ } elseif ($format == 'owl') { // or daml?
+ require_once("lib/SemanticWeb.php");
+ $rdf = new OwlWriter($request, $pagelist);
+ $rdf->format();
+ } else {
+ if (!in_array($pagename, array(_("LinkDatabase"))))
+ trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
E_USER_WARNING);
- $template = Template('browse', array('CONTENT' => $transformedContent));
- GeneratePage($template, $pagetitle, $revision, $args);
+ $template = Template('browse', array('CONTENT' => $transformedContent));
+ GeneratePage($template, $pagetitle, $revision, $args);
+ }
}
- }
$request->checkValidators();
flush();
return '';
@@ -227,9 +227,8 @@
NoSuchRevision($request, $page, $version);
/* Tell Google (and others) to ignore old versions of pages */
$robots = "noindex,nofollow";
- $toks['ROBOTS_META'] = $robots;
- }
- else {
+ $toks['ROBOTS_META'] = $robots;
+ } else {
$revision = $page->getCurrentRevision();
}
$format = $request->getArg('format');
@@ -240,17 +239,16 @@
// DOCTYPE html needed to allow unencoded entities like without !CDATA[]
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',"\n";
- if ($page->exists()) {
- header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
- $request->cacheControl();
- $request->setArg('format','');
+ if ($page->exists()) {
+ header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
+ $request->cacheControl();
+ $request->setArg('format','');
$page_content = $revision->getTransformedContent();
$page_content->printXML();
$request->_is_buffering_output = false; // avoid wrong Content-Length with errors
$request->finish();
- }
- else {
- $request->cacheControl();
+ } else {
+ $request->cacheControl();
echo('<div style="display:none;" />');
$request->_is_buffering_output = false; // avoid wrong Content-Length with errors
$request->finish();
@@ -345,18 +343,18 @@
$toks['SEARCH_ENGINE'] = $result['engine'];
$toks['SEARCH_ENGINE_URL'] = $result['engine_url'];
$toks['SEARCH_TERM'] = $result['query'];
- //$toks['HEADER'] = HTML($actionpage->getName(),": ",$pageheader); // h1 with backlink
+ //$toks['HEADER'] = HTML($actionpage->getName(),": ",$pageheader); // h1 with backlink
$actioncontent = new TransformedText($actionrev->getPage(),
$actionrev->getPackedContent(),
$actionrev->getMetaData());
- // prepend the actionpage in front of the hightlighted content
- $toks['CONTENT'] = HTML($actioncontent, $page_content);
+ // prepend the actionpage in front of the hightlighted content
+ $toks['CONTENT'] = HTML($actioncontent, $page_content);
}
+ }
+ } else {
+ $page_content = $revision->getTransformedContent();
}
} else {
- $page_content = $revision->getTransformedContent();
- }
- } else {
$page_content = $revision->getTransformedContent();
}
@@ -390,44 +388,44 @@
/* Only single page versions. rss only if not already handled by RecentChanges.
*/
if (!$format or $format == 'html' or $format == 'sidebar' or $format == 'contribs') {
- $template->printExpansion($toks);
+ $template->printExpansion($toks);
} else {
- // No pagelist here. Single page version only
- require_once("lib/PageList.php");
- $pagelist = new PageList();
- $pagelist->addPage($page);
- if ($format == 'pdf') {
- require_once("lib/pdf.php");
- $request->setArg('format','');
- ConvertAndDisplayPdfPageList($request, $pagelist);
- // time-sorted rdf a la RecentChanges
- } elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
- //$request->setArg('format','');
+ // No pagelist here. Single page version only
+ require_once("lib/PageList.php");
+ $pagelist = new PageList();
+ $pagelist->addPage($page);
+ if ($format == 'pdf') {
+ require_once("lib/pdf.php");
+ $request->setArg('format','');
+ ConvertAndDisplayPdfPageList($request, $pagelist);
+ // time-sorted rdf a la RecentChanges
+ } elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+ //$request->setArg('format','');
if ($pagename == _("RecentChanges"))
$template->printExpansion($toks);
else {
- require_once("lib/plugin/RecentChanges.php");
+ require_once("lib/plugin/RecentChanges.php");
$plugin = new WikiPlugin_RecentChanges();
$args = $request->getArgs();
return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
}
- } elseif ($format == 'rdf') { // all semantic relations and attributes
- require_once("lib/SemanticWeb.php");
- $rdf = new RdfWriter($request, $pagelist);
- $rdf->format();
- } elseif ($format == 'owl') { // or daml?
- require_once("lib/SemanticWeb.php");
- $rdf = new OwlWriter($request, $pagelist);
- $rdf->format();
- } elseif ($format == 'json') { // include page content asynchronously
- $request->setArg('format','');
- if ($page->exists())
+ } elseif ($format == 'rdf') { // all semantic relations and attributes
+ require_once("lib/SemanticWeb.php");
+ $rdf = new RdfWriter($request, $pagelist);
+ $rdf->format();
+ } elseif ($format == 'owl') { // or daml?
+ require_once("lib/SemanticWeb.php");
+ $rdf = new OwlWriter($request, $pagelist);
+ $rdf->format();
+ } elseif ($format == 'json') { // include page content asynchronously
+ $request->setArg('format','');
+ if ($page->exists())
$content = $page_content->asXML();
else
$content = '';
- $req_args = $request->args;
- unset($req_args['format']);
- // no meta-data so far, just the content
+ $req_args = $request->args;
+ unset($req_args['format']);
+ // no meta-data so far, just the content
$json = array('content' => $content,
'args' => $req_args,
'phpwiki-version' => PHPWIKI_VERSION);
@@ -440,13 +438,13 @@
}
header("Content-Type: application/json");
die($json_enc);
- } else {
- if (!in_array($pagename, array(_("LinkDatabase"))))
- trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
+ } else {
+ if (!in_array($pagename, array(_("LinkDatabase"))))
+ trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
E_USER_WARNING);
- $template->printExpansion($toks);
+ $template->printExpansion($toks);
+ }
}
- }
$page->increaseHitCount();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
