edit/page: keep page named after existing directory

Allow either subdir.html or subdir/index.html, preventing edit from creating
conforming duplicates.

Reported-by: Arie van Marion

diff --git a/edit/page.js b/edit/page.js
index 522d63e3c41d5b55f05b987ea5b05c6d7620b2b2..9997e293c7615a3af4c6b29945f56583503a49e5 100644 (file)
--- a/edit/page.js
+++ b/edit/page.js
@@ -2,7 +2,7 @@ CKEDITOR.plugins.add('inlinesave', {
        init: function(editor) {
                editor.addCommand( 'inlinesave', {
                        exec: function (editor) {
-                               var pagename = window.location.pathname.replace(/\/$/, '/index');
+                               var pagename = window.location.pathname;
                                var body = editor.getData();
                                // empty line is equivalent to a paragraph break
                                body = body.replace(/<br \/>\s*<br \/>/g, '<p>');

diff --git a/edit/page/index.php b/edit/page/index.php
index 086c7531c56683381713bf213fafb915127cae2e..48f8942e144e3487dee87ca1f7efabb6a50ca068 100644 (file)
--- a/edit/page/index.php
+++ b/edit/page/index.php
@@ -45,9 +45,12 @@ if (!$_POST)
 if (!$Args)
        abort("geen bestand aangeleverd", '409 input error');
 
-$filename = ltrim($Args, '/').'.html';
+$filename = trim($Args, '/');
 if (preg_match('{^\.}', $filename))
        abort("ongeldige bestandsnaam: $filename", '403 input error');
+if (is_dir($filename) && !file_exists("$filename.html"))
+       $filename .= '/index';
+$filename .= '.html';
 if (file_exists($filename) and !is_writable($filename))
        abort("onwijzigbaar bestand: $filename", '403 input error');