paste deletion is possible now

diff --git a/data/templates/delete.htm b/data/templates/delete.htm
new file mode 100644 (file)
index 0000000..ff27220
--- /dev/null
+++ b/data/templates/delete.htm
@@ -0,0 +1,30 @@
+{% extends "base.htm" %}
+{% block title %}
+Confirm deletion of repository #{{repo.id}}
+{% endblock %}
+
+{% block content %}
+<h1>Delete paste #{{repo.id}}?</h1>
+<div class="well" style="margin-top: 5ex;">
+ <p>
+  Do you really want to delete the folloing paste #{{repo.id}}?
+ </p>
+ <p>
+  <strong>{{repo.getDescription}}</strong>
+ </p>
+
+ <div class="row-fluid" style="margin-top: 5ex;">
+  <div class="span6">
+   <a class="btn" href="{{repo.getLink('display')}}">Cancel</a>
+  </div>
+  <div class="span6" style="text-align: right">
+   <form method="post" action="{{repo.getLink('delete-confirm')}}" style="margin: 0px">
+    <button class="btn btn-danger" type="submit">
+     <i class="icon-trash icon-white"></i>
+     Permanently delete
+    </button>
+   </form>
+  </div>
+ </div>
+</div>
+{% endblock %}

diff --git a/data/templates/display.htm b/data/templates/display.htm
index ca52775eb4d2aea32164792f315e7566771aecbb..2ba490ed57b5a346bc64b922ac97fb3af9ab214a 100644 (file)
--- a/data/templates/display.htm
+++ b/data/templates/display.htm
@@ -34,6 +34,14 @@
  </div>
 </div>
 {% endfor %}
  </div>
 </div>
 {% endfor %}

+
+<div class="row-fluid" style="margin-top: 5ex">
+ <div class="span12" style="text-align: right;">
+  <a class="btn btn-warning" href="{{repo.getLink('delete')}}">
+   <i class="icon-trash icon-white"></i> Delete
+  </a>
+ </div>
+</div>

 {% endblock %}
 
 {% block sidebar %}
 {% endblock %}
 
 {% block sidebar %}

diff --git a/src/Phorkie/Repository.php b/src/Phorkie/Repository.php
index d9fc2346f587ca01c17294b74fffbf09ac1f33e1..bcaf3e1cd7f2686c5d7e45f144f4e8b6b160a19d 100644 (file)
--- a/src/Phorkie/Repository.php
+++ b/src/Phorkie/Repository.php
@@ -102,6 +102,17 @@ class Repository
         return true;
     }
 
         return true;
     }
 

+    /**
+     * Permanently deletes the paste repository without any way to get
+     * it back.
+     *
+     * @return boolean True if all went well, false if not
+     */
+    public function delete()
+    {
+        return Tools::recursiveDelete($this->repoDir);
+    }
+

     public function getDescription()
     {
         if (!is_readable($this->repoDir . '/.git/description')) {
     public function getDescription()
     {
         if (!is_readable($this->repoDir . '/.git/description')) {


@@ -133,8 +144,12 @@ class Repository
             return '/' . $this->id;
         } else if ($type == 'fork') {
             return '/' . $this->id . '/fork';
             return '/' . $this->id;
         } else if ($type == 'fork') {
             return '/' . $this->id . '/fork';

+        } else if ($type == 'delete') {
+            return '/' . $this->id . '/delete';
+        } else if ($type == 'delete-confirm') {
+            return '/' . $this->id . '/delete/confirm';

         }
         }

-        throw new Exception('Unknown type');
+        throw new Exception('Unknown link type');

     }
 
 }
     }
 
 }

diff --git a/src/Phorkie/Tools.php b/src/Phorkie/Tools.php
new file mode 100644 (file)
index 0000000..8e67fe2
--- /dev/null
+++ b/src/Phorkie/Tools.php
@@ -0,0 +1,26 @@
+<?php
+namespace Phorkie;
+
+
+class Tools
+{
+    public static function recursiveDelete($path)
+    {
+        if (!is_dir($path) || is_link($path)) {
+            return unlink($path);
+        }
+        foreach (scandir($path) as $file) {
+            if ($file == '.' || $file == '..') {
+                continue;
+            }
+            $filepath = $path . DIRECTORY_SEPARATOR . $file;
+            if (!static::recursiveDelete($filepath)) {
+                return false;
+            };
+        }
+        return rmdir($path);
+    }
+
+}
+
+?>
\ No newline at end of file

diff --git a/www/.htaccess b/www/.htaccess
index a05839232bfd0a00879640112f4b72aa0fd7fa86..32701bea2ee95312757041c09f44d58800b1ea3f 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -3,6 +3,8 @@ RewriteBase /
 #RewriteCond %{REQUEST_FILENAME} -f
 
 RewriteRule ^([0-9]+)$ /display.php?id=$1
 #RewriteCond %{REQUEST_FILENAME} -f
 
 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]+)/edit$ /edit.php?id=$1
 RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1
 RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2
 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/delete.php b/www/delete.php
new file mode 100644 (file)
index 0000000..9feaf4e
--- /dev/null
+++ b/www/delete.php
@@ -0,0 +1,23 @@
+<?php
+namespace Phorkie;
+/**
+ * Delete paste or ask for deletion
+ */
+require_once 'www-header.php';
+
+$repo = new Repository();
+$repo->loadFromRequest();
+
+if (isset($_GET['confirm']) && $_GET['confirm'] == 1) {
+    if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+        throw new Exception_Input('Deleting only possible via POST');
+    }
+    $repo->delete();
+    redirect('/');
+}
+
+render(
+    'delete',
+    array('repo' => $repo)
+);
+?>

diff --git a/www/index.php b/www/index.php
index d33604d2643846662f8ef2696c7be74d05874df4..9a03b77c91e0ad223309d43857bbae9828d9a3a2 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -21,4 +21,4 @@ $phork = array(
     '1' => new File(null, null)
 );
 render('index', array('files' => $phork, 'description' => ''));
     '1' => new File(null, null)
 );
 render('index', array('files' => $phork, 'description' => ''));

-?>
\ No newline at end of file
+?>