From 882ce78e4fc3361288dbc3c453412556aa529c7d Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 16 Sep 2012 23:22:55 +0200 Subject: [PATCH 1/1] Implement request #12: DOAP documents for all pastes --- ChangeLog | 4 ++++ data/templates/display.htm | 4 ++++ data/templates/doap.htm | 17 +++++++++++++++++ src/phorkie/Repository.php | 2 ++ www/.htaccess | 1 + www/doap.php | 21 +++++++++++++++++++++ 6 files changed, 49 insertions(+) create mode 100644 data/templates/doap.htm create mode 100644 www/doap.php diff --git a/ChangeLog b/ChangeLog index 7e45b7d..afefa9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-09-16 Christian Weiske + + * Implement request #12: DOAP documents for all pastes + 2012-09-08 Christian Weiske * Fix bug #11: do not index edit, delete and tool pages diff --git a/data/templates/display.htm b/data/templates/display.htm index 6d84c46..5bcb016 100644 --- a/data/templates/display.htm +++ b/data/templates/display.htm @@ -3,6 +3,10 @@ {{repo.getTitle}} {% endblock %} +{% block meta %} + +{% endblock %} + {% block content %} {% include 'display-head.htm' %} diff --git a/data/templates/doap.htm b/data/templates/doap.htm new file mode 100644 index 0000000..5302dd4 --- /dev/null +++ b/data/templates/doap.htm @@ -0,0 +1,17 @@ + + + + {{repo.getTitle}} + + {{date}} + {% if repo.getCloneURL(true) %} + + + + + + + {%endif %} + + diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php index 448982b..46b2f65 100644 --- a/src/phorkie/Repository.php +++ b/src/phorkie/Repository.php @@ -228,6 +228,8 @@ class Repository return '/' . $this->id; } else if ($type == 'fork') { return '/' . $this->id . '/fork'; + } else if ($type == 'doap') { + return '/' . $this->id . '/doap'; } else if ($type == 'delete') { return '/' . $this->id . '/delete'; } else if ($type == 'delete-confirm') { diff --git a/www/.htaccess b/www/.htaccess index a8f2eed..c379b23 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -5,6 +5,7 @@ RewriteBase / RewriteRule ^([0-9]+)$ /display.php?id=$1 RewriteRule ^([0-9]+)/delete$ /delete.php?id=$1 RewriteRule ^([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1 +RewriteRule ^([0-9]+)/doap$ /doap.php?id=$1 RewriteRule ^([0-9]+)/edit$ /edit.php?id=$1 RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1 RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2 diff --git a/www/doap.php b/www/doap.php new file mode 100644 index 0000000..db00df4 --- /dev/null +++ b/www/doap.php @@ -0,0 +1,21 @@ +loadFromRequest(); + +header('Content-Type: application/rdf+xml'); +render( + 'doap', + array( + 'repo' => $repo, + 'date' => date('Y-m-d', end($repo->getHistory())->committerTime), + 'link' => Tools::fullUrl($repo->getLink('display')) + ) +); +?> -- 2.30.2