sbrl-github/Pepperminty-Wiki
sbrl-github
/
Pepperminty-Wiki
mirror of https://github.com/sbrl/Pepperminty-Wiki.git
1
0
Fork 0
Code

Bugfix recent changes atom feed

This commit is contained in:
Starbeamrainbowlabs 2019-01-24 20:47:16 +00:00
parent 96b632ff56
commit 5da517fbe1
Signed by: sbrl
GPG Key ID: 1BE5172E637709C2
3 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
build/index.php
View File

@ -409,7 +409,7 @@ if($settings->sessionprefix == "auto")
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** The version of Pepperminty Wiki currently running. */ /** The version of Pepperminty Wiki currently running. */
$version = "v0.18-dev"; $version = "v0.18-dev";
$commit = "242f197ccf8969c87e18f13d1a525dd01219b03c"; $commit = "96b632ff561fd14baa263f0156a455340796dc41";
/// Environment /// /// Environment ///
/** Holds information about the current request environment. */ /** Holds information about the current request environment. */
$env = new stdClass(); $env = new stdClass();
@ -4027,7 +4027,7 @@ function render_recent_change_atom($recent_changes) {
$xml = new XMLWriter(); $xml = new XMLWriter();
$xml->openMemory(); $xml->openMemory();
$xml->setIndentString("\t"); $xml->setIndent(true); $xml->setIndentString("\t");
$xml->startDocument("1.0", "utf-8"); $xml->startDocument("1.0", "utf-8");
$xml->startElement("feed"); $xml->startElement("feed");
@ -4067,14 +4067,24 @@ function render_recent_change_atom($recent_changes) {
$xml->writeElement("id", full_url()); $xml->writeElement("id", full_url());
$xml->writeElement("icon", $settings->favicon); $xml->writeElement("icon", $settings->favicon);
$xml->writeElement("title", "$settings->sitename - Recent Changes"); $xml->writeElement("title", "$settings->sitename - Recent Changes");
$xml->writeElements("subtitle", "Recent Changes on $settings->sitename"); $xml->writeElement("subtitle", "Recent Changes on $settings->sitename");
foreach($recent_changes as $recent_change) { foreach($recent_changes as $recent_change) {
if(empty($recent_change->type))
$recent_change->type = "edit";
$xml->startElement("entry"); $xml->startElement("entry");
// Change types: revert, edit, deletion, move, upload, comment // Change types: revert, edit, deletion, move, upload, comment
$type = $recent_change->type; $type = $recent_change->type;
$url = "$full_url_stem?page=".rawurlencode($recent_change->page); $url = "$full_url_stem?page=".rawurlencode($recent_change->page);
$content = "<ul>
<li><strong>Change type:</strong> $recent_change->type</li>
<li><strong>User:</strong> $recent_change->user</li>
<li><strong>Page name:</strong> $recent_change->page</li>
<li><strong>Timestamp:</strong> ".date(DateTime::RFC1123, $recent_change->timestamp)."</li>";
switch($type) { switch($type) {
case "revert": case "revert":
case "edit": case "edit":
@ -4085,22 +4095,29 @@ function render_recent_change_atom($recent_changes) {
break; break;
case "deletion": $type = "Deletion of"; break; case "deletion": $type = "Deletion of"; break;
case "move": $type = "Movement of"; break; case "move": $type = "Movement of"; break;
case "upload": $type = "Upload of"; break; case "upload":
$type = "Upload of";
$content .= "\t<li><strong>File size:</strong> ".human_filesize($recent_change->filesize)."</li>\n";
break;
case "comment": case "comment":
$type = "Comment on"; $type = "Comment on";
$url .= "#comment-$comment_id"; $url .= "#comment-$recent_change->comment_id";
break; break;
} }
$xml->writeElement("title", "$type $recent_change->page by $recent_change->user"); $content .= "</ul>";
$xml->startElement("title");
$xml->writeAttribute("type", "text");
$xml->text("$type $recent_change->page by $recent_change->user");
$xml->endElement();
$xml->writeElement("id", $url); $xml->writeElement("id", $url);
$xml->writeElement("updated", date(DateTime::ATOM, $recent_change->timestamp)); $xml->writeElement("updated", date(DateTime::ATOM, $recent_change->timestamp));
$xml->startElement("content"); $xml->startElement("content");
$xml->writeCdata("<ul> $xml->writeAttribute("type", "html");
<li><strong>Page name:</strong> $recent_change->page</li> $xml->text($content);
<li><strong>Timestamp:</strong> ".date(DateTime::RFC1123, $recent_change->timestamp)."</li>
<li><strong>Change type:</strong> $recent_change->type</li>
<li><strong>User:</strong> $recent_change->user</li>
</ul>");
$xml->endElement(); $xml->endElement();
$xml->startElement("link"); $xml->startElement("link");
@ -4118,6 +4135,8 @@ function render_recent_change_atom($recent_changes) {
} }
$xml->endElement(); $xml->endElement();
return $xml->flush();
} }

2
module_index.json
View File

@ -95,7 +95,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds recent changes. Access through the 'recent-changes' action.", "description": "Adds recent changes. Access through the 'recent-changes' action.",
"id": "feature-recent-changes", "id": "feature-recent-changes",
"lastupdate": 1548361795, "lastupdate": 1548362686,
"optional": false "optional": false
}, },
{ {

41
modules/feature-recent-changes.php
View File

@ -341,7 +341,7 @@ function render_recent_change_atom($recent_changes) {
$xml = new XMLWriter(); $xml = new XMLWriter();
$xml->openMemory(); $xml->openMemory();
$xml->setIndentString("\t"); $xml->setIndent(true); $xml->setIndentString("\t");
$xml->startDocument("1.0", "utf-8"); $xml->startDocument("1.0", "utf-8");
$xml->startElement("feed"); $xml->startElement("feed");
@ -381,14 +381,24 @@ function render_recent_change_atom($recent_changes) {
$xml->writeElement("id", full_url()); $xml->writeElement("id", full_url());
$xml->writeElement("icon", $settings->favicon); $xml->writeElement("icon", $settings->favicon);
$xml->writeElement("title", "$settings->sitename - Recent Changes"); $xml->writeElement("title", "$settings->sitename - Recent Changes");
$xml->writeElements("subtitle", "Recent Changes on $settings->sitename"); $xml->writeElement("subtitle", "Recent Changes on $settings->sitename");
foreach($recent_changes as $recent_change) { foreach($recent_changes as $recent_change) {
if(empty($recent_change->type))
$recent_change->type = "edit";
$xml->startElement("entry"); $xml->startElement("entry");
// Change types: revert, edit, deletion, move, upload, comment // Change types: revert, edit, deletion, move, upload, comment
$type = $recent_change->type; $type = $recent_change->type;
$url = "$full_url_stem?page=".rawurlencode($recent_change->page); $url = "$full_url_stem?page=".rawurlencode($recent_change->page);
$content = "<ul>
<li><strong>Change type:</strong> $recent_change->type</li>
<li><strong>User:</strong> $recent_change->user</li>
<li><strong>Page name:</strong> $recent_change->page</li>
<li><strong>Timestamp:</strong> ".date(DateTime::RFC1123, $recent_change->timestamp)."</li>";
switch($type) { switch($type) {
case "revert": case "revert":
case "edit": case "edit":
@ -399,22 +409,29 @@ function render_recent_change_atom($recent_changes) {
break; break;
case "deletion": $type = "Deletion of"; break; case "deletion": $type = "Deletion of"; break;
case "move": $type = "Movement of"; break; case "move": $type = "Movement of"; break;
case "upload": $type = "Upload of"; break; case "upload":
$type = "Upload of";
$content .= "\t<li><strong>File size:</strong> ".human_filesize($recent_change->filesize)."</li>\n";
break;
case "comment": case "comment":
$type = "Comment on"; $type = "Comment on";
$url .= "#comment-$comment_id"; $url .= "#comment-$recent_change->comment_id";
break; break;
} }
$xml->writeElement("title", "$type $recent_change->page by $recent_change->user"); $content .= "</ul>";
$xml->startElement("title");
$xml->writeAttribute("type", "text");
$xml->text("$type $recent_change->page by $recent_change->user");
$xml->endElement();
$xml->writeElement("id", $url); $xml->writeElement("id", $url);
$xml->writeElement("updated", date(DateTime::ATOM, $recent_change->timestamp)); $xml->writeElement("updated", date(DateTime::ATOM, $recent_change->timestamp));
$xml->startElement("content"); $xml->startElement("content");
$xml->writeCdata("<ul> $xml->writeAttribute("type", "html");
<li><strong>Page name:</strong> $recent_change->page</li> $xml->text($content);
<li><strong>Timestamp:</strong> ".date(DateTime::RFC1123, $recent_change->timestamp)."</li>
<li><strong>Change type:</strong> $recent_change->type</li>
<li><strong>User:</strong> $recent_change->user</li>
</ul>");
$xml->endElement(); $xml->endElement();
$xml->startElement("link"); $xml->startElement("link");
@ -432,4 +449,6 @@ function render_recent_change_atom($recent_changes) {
} }
$xml->endElement(); $xml->endElement();
return $xml->flush();
} }