From 1f3e6bee6036687ddc25bd776f6f36502e43bc7e Mon Sep 17 00:00:00 2001 From: makss Date: Fri, 29 Sep 2017 00:09:53 +0300 Subject: [PATCH] Installing forms from subdirectories --- .../article_listing.txp} | 0 .../forms/{article.default.txp => article/default.txp} | 0 .../search_results.txp} | 0 .../comment_form.txp} | 0 .../{comment.comments.txp => comment/comments.txp} | 0 .../comments_display.txp} | 0 .../popup_comments.txp} | 0 .../setup/forms/{file.files.txp => file/files.txp} | 0 .../forms/{link.plainlinks.txp => link/plainlinks.txp} | 0 .../setup/forms/{misc.images.txp => misc/images.txp} | 0 .../{misc.search_input.txp => misc/search_input.txp} | 0 textpattern/setup/txpsql.php | 10 +++++++--- 12 files changed, 7 insertions(+), 3 deletions(-) rename textpattern/setup/forms/{article.article_listing.txp => article/article_listing.txp} (100%) rename textpattern/setup/forms/{article.default.txp => article/default.txp} (100%) rename textpattern/setup/forms/{article.search_results.txp => article/search_results.txp} (100%) rename textpattern/setup/forms/{comment.comment_form.txp => comment/comment_form.txp} (100%) rename textpattern/setup/forms/{comment.comments.txp => comment/comments.txp} (100%) rename textpattern/setup/forms/{comment.comments_display.txp => comment/comments_display.txp} (100%) rename textpattern/setup/forms/{comment.popup_comments.txp => comment/popup_comments.txp} (100%) rename textpattern/setup/forms/{file.files.txp => file/files.txp} (100%) rename textpattern/setup/forms/{link.plainlinks.txp => link/plainlinks.txp} (100%) rename textpattern/setup/forms/{misc.images.txp => misc/images.txp} (100%) rename textpattern/setup/forms/{misc.search_input.txp => misc/search_input.txp} (100%) diff --git a/textpattern/setup/forms/article.article_listing.txp b/textpattern/setup/forms/article/article_listing.txp similarity index 100% rename from textpattern/setup/forms/article.article_listing.txp rename to textpattern/setup/forms/article/article_listing.txp diff --git a/textpattern/setup/forms/article.default.txp b/textpattern/setup/forms/article/default.txp similarity index 100% rename from textpattern/setup/forms/article.default.txp rename to textpattern/setup/forms/article/default.txp diff --git a/textpattern/setup/forms/article.search_results.txp b/textpattern/setup/forms/article/search_results.txp similarity index 100% rename from textpattern/setup/forms/article.search_results.txp rename to textpattern/setup/forms/article/search_results.txp diff --git a/textpattern/setup/forms/comment.comment_form.txp b/textpattern/setup/forms/comment/comment_form.txp similarity index 100% rename from textpattern/setup/forms/comment.comment_form.txp rename to textpattern/setup/forms/comment/comment_form.txp diff --git a/textpattern/setup/forms/comment.comments.txp b/textpattern/setup/forms/comment/comments.txp similarity index 100% rename from textpattern/setup/forms/comment.comments.txp rename to textpattern/setup/forms/comment/comments.txp diff --git a/textpattern/setup/forms/comment.comments_display.txp b/textpattern/setup/forms/comment/comments_display.txp similarity index 100% rename from textpattern/setup/forms/comment.comments_display.txp rename to textpattern/setup/forms/comment/comments_display.txp diff --git a/textpattern/setup/forms/comment.popup_comments.txp b/textpattern/setup/forms/comment/popup_comments.txp similarity index 100% rename from textpattern/setup/forms/comment.popup_comments.txp rename to textpattern/setup/forms/comment/popup_comments.txp diff --git a/textpattern/setup/forms/file.files.txp b/textpattern/setup/forms/file/files.txp similarity index 100% rename from textpattern/setup/forms/file.files.txp rename to textpattern/setup/forms/file/files.txp diff --git a/textpattern/setup/forms/link.plainlinks.txp b/textpattern/setup/forms/link/plainlinks.txp similarity index 100% rename from textpattern/setup/forms/link.plainlinks.txp rename to textpattern/setup/forms/link/plainlinks.txp diff --git a/textpattern/setup/forms/misc.images.txp b/textpattern/setup/forms/misc/images.txp similarity index 100% rename from textpattern/setup/forms/misc.images.txp rename to textpattern/setup/forms/misc/images.txp diff --git a/textpattern/setup/forms/misc.search_input.txp b/textpattern/setup/forms/misc/search_input.txp similarity index 100% rename from textpattern/setup/forms/misc.search_input.txp rename to textpattern/setup/forms/misc/search_input.txp diff --git a/textpattern/setup/txpsql.php b/textpattern/setup/txpsql.php index 57a670e079..4460b3c282 100644 --- a/textpattern/setup/txpsql.php +++ b/textpattern/setup/txpsql.php @@ -87,9 +87,13 @@ safe_query("INSERT INTO `".PFX."txp_css`(name, css) VALUES('".doSlash($key)."', '".doSlash($data)."')"); } -foreach (get_files_content($themedir.'/forms', 'txp') as $key=>$data) { - list($type, $name) = explode('.', $key); - safe_query("INSERT INTO `".PFX."txp_form`(type, name, Form) VALUES('".doSlash($type)."', '".doSlash($name)."', '".doSlash($data)."')"); +if ($files = glob("{$themedir}/forms/*/*\.txp")) { + foreach ($files as $file) { + if (preg_match('%/forms/(\w+)/(\w+)\.txp$%', $file, $mm)) { + $data = @file_get_contents($file); + safe_query("INSERT INTO `".PFX."txp_form`(type, name, Form) VALUES('".doSlash($mm[1])."', '".doSlash($mm[2])."', '".doSlash($data)."')"); + } + } } foreach (get_files_content($themedir.'/pages', 'txp') as $key=>$data) {