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

Add uploads to the recent changes page

This commit is contained in:
Starbeamrainbowlabs 2016-04-03 16:10:37 +01:00
parent 22981547cc
commit 30bfe144fe
5 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/index.php
View File

@ -355,6 +355,7 @@ textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-wei
.deletion, .deletion > .editor { text-decoration: line-through; } .deletion, .deletion > .editor { text-decoration: line-through; }
.newpage::before { content: \"N\"; margin: 0 0.3em 0 -1em; font-weight: bolder; text-decoration: underline dotted; } .newpage::before { content: \"N\"; margin: 0 0.3em 0 -1em; font-weight: bolder; text-decoration: underline dotted; }
.upload::before { content: \"\\1f845\"; margin: 0 0.1em 0 -1.1em; }
footer { padding: 2rem; } footer { padding: 2rem; }
/* #ffdb6d #36962c */"; /* #ffdb6d #36962c */";
@ -1566,7 +1567,7 @@ function render_sidebar($pageindex, $root_pagename = "")
register_module([ register_module([
"name" => "Recent Changes", "name" => "Recent Changes",
"version" => "0.3", "version" => "0.3.2",
"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",
@ -1677,6 +1678,7 @@ function render_recent_change($rchange)
$pageDisplayName = $rchange->page; $pageDisplayName = $rchange->page;
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect)) if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect))
$pageDisplayName = "<em>$pageDisplayName</em>"; $pageDisplayName = "<em>$pageDisplayName</em>";
$pageDisplayLink = "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a>";
$editorDisplayHtml = "<span class='editor'>&#9998; $rchange->user</span>"; $editorDisplayHtml = "<span class='editor'>&#9998; $rchange->user</span>";
$timeDisplayHtml = "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $rchange->timestamp) . "'>" . human_time_since($rchange->timestamp) . "</time>"; $timeDisplayHtml = "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $rchange->timestamp) . "'>" . human_time_since($rchange->timestamp) . "</time>";
@ -1698,12 +1700,18 @@ function render_recent_change($rchange)
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
$result .= "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$title_display'>($size_display)</span>"; $result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$title_display'>($size_display)</span>";
break; break;
case "deletion": case "deletion":
$resultClasses[] = "deletion"; $resultClasses[] = "deletion";
$result .= "$pageDisplayName $editorDisplayHtml $timeDisplayHtml"; $result .= "$pageDisplayName $editorDisplayHtml $timeDisplayHtml";
break;
case "upload":
$resultClasses[] = "upload";
$result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")";
break;
} }
$resultAttributes = " " . (count($resultClasses) > 0 ? "class='" . implode(" ", $resultClasses) . "'" : ""); $resultAttributes = " " . (count($resultClasses) > 0 ? "class='" . implode(" ", $resultClasses) . "'" : "");
@ -2437,6 +2445,17 @@ register_module([
// Save the pageindex // Save the pageindex
file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT)); file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT));
if(module_exists("feature-recent-changes"))
{
add_recent_change([
"type" => "upload",
"timestamp" => time(),
"page" => $new_filename,
"user" => $env->user,
"filesize" => filesize($entry->uploadedfilepath)
]);
}
header("location: ?action=view&page=$new_filename&upload=success"); header("location: ?action=view&page=$new_filename&upload=success");
break; break;

6
module_index.json
View File

@ -37,11 +37,11 @@
}, },
{ {
"name": "Recent Changes", "name": "Recent Changes",
"version": "0.3", "version": "0.3.2",
"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": 1459695505, "lastupdate": 1459695897,
"optional": false "optional": false
}, },
{ {
@ -68,7 +68,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.",
"id": "feature-upload", "id": "feature-upload",
"lastupdate": 1459627881, "lastupdate": 1459695742,
"optional": false "optional": false
}, },
{ {

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

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Recent Changes", "name" => "Recent Changes",
"version" => "0.3", "version" => "0.3.2",
"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",
@ -112,6 +112,7 @@ function render_recent_change($rchange)
$pageDisplayName = $rchange->page; $pageDisplayName = $rchange->page;
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect)) if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect))
$pageDisplayName = "<em>$pageDisplayName</em>"; $pageDisplayName = "<em>$pageDisplayName</em>";
$pageDisplayLink = "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a>";
$editorDisplayHtml = "<span class='editor'>&#9998; $rchange->user</span>"; $editorDisplayHtml = "<span class='editor'>&#9998; $rchange->user</span>";
$timeDisplayHtml = "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $rchange->timestamp) . "'>" . human_time_since($rchange->timestamp) . "</time>"; $timeDisplayHtml = "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $rchange->timestamp) . "'>" . human_time_since($rchange->timestamp) . "</time>";
@ -133,12 +134,18 @@ function render_recent_change($rchange)
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
$result .= "<a href='?page=" . rawurlencode($rchange->page) . "'>$pageDisplayName</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$title_display'>($size_display)</span>"; $result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$title_display'>($size_display)</span>";
break; break;
case "deletion": case "deletion":
$resultClasses[] = "deletion"; $resultClasses[] = "deletion";
$result .= "$pageDisplayName $editorDisplayHtml $timeDisplayHtml"; $result .= "$pageDisplayName $editorDisplayHtml $timeDisplayHtml";
break;
case "upload":
$resultClasses[] = "upload";
$result .= "$pageDisplayLink $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")";
break;
} }
$resultAttributes = " " . (count($resultClasses) > 0 ? "class='" . implode(" ", $resultClasses) . "'" : ""); $resultAttributes = " " . (count($resultClasses) > 0 ? "class='" . implode(" ", $resultClasses) . "'" : "");

11
modules/feature-upload.php
View File

@ -155,6 +155,17 @@ register_module([
// Save the pageindex // Save the pageindex
file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT)); file_put_contents($paths->pageindex, json_encode($pageindex, JSON_PRETTY_PRINT));
if(module_exists("feature-recent-changes"))
{
add_recent_change([
"type" => "upload",
"timestamp" => time(),
"page" => $new_filename,
"user" => $env->user,
"filesize" => filesize($entry->uploadedfilepath)
]);
}
header("location: ?action=view&page=$new_filename&upload=success"); header("location: ?action=view&page=$new_filename&upload=success");
break; break;

1
settings.fragment.php
View File

@ -352,6 +352,7 @@ textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-wei
.deletion, .deletion > .editor { text-decoration: line-through; } .deletion, .deletion > .editor { text-decoration: line-through; }
.newpage::before { content: \"N\"; margin: 0 0.3em 0 -1em; font-weight: bolder; text-decoration: underline dotted; } .newpage::before { content: \"N\"; margin: 0 0.3em 0 -1em; font-weight: bolder; text-decoration: underline dotted; }
.upload::before { content: \"\\1f845\"; margin: 0 0.1em 0 -1.1em; }
footer { padding: 2rem; } footer { padding: 2rem; }
/* #ffdb6d #36962c */"; /* #ffdb6d #36962c */";