Installing forms from subdirectories

textpattern · Sep 28, 2017 · 1f3e6be · 1f3e6be
1 parent 8a222de
commit 1f3e6be
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 3 deletions.
diff --git a/...n/setup/forms/article.article_listing.txp → ...n/setup/forms/article/article_listing.txp b/...n/setup/forms/article.article_listing.txp → ...n/setup/forms/article/article_listing.txp
diff --git a/textpattern/setup/forms/article.default.txp → textpattern/setup/forms/article/default.txp b/textpattern/setup/forms/article.default.txp → textpattern/setup/forms/article/default.txp
diff --git a/...rn/setup/forms/article.search_results.txp → ...rn/setup/forms/article/search_results.txp b/...rn/setup/forms/article.search_results.txp → ...rn/setup/forms/article/search_results.txp
diff --git a/...tern/setup/forms/comment.comment_form.txp → ...tern/setup/forms/comment/comment_form.txp b/...tern/setup/forms/comment.comment_form.txp → ...tern/setup/forms/comment/comment_form.txp
diff --git a/textpattern/setup/forms/comment.comments.txp → textpattern/setup/forms/comment/comments.txp b/textpattern/setup/forms/comment.comments.txp → textpattern/setup/forms/comment/comments.txp
diff --git a/.../setup/forms/comment.comments_display.txp → .../setup/forms/comment/comments_display.txp b/.../setup/forms/comment.comments_display.txp → .../setup/forms/comment/comments_display.txp
diff --git a/...rn/setup/forms/comment.popup_comments.txp → ...rn/setup/forms/comment/popup_comments.txp b/...rn/setup/forms/comment.popup_comments.txp → ...rn/setup/forms/comment/popup_comments.txp
diff --git a/textpattern/setup/forms/file.files.txp → textpattern/setup/forms/file/files.txp b/textpattern/setup/forms/file.files.txp → textpattern/setup/forms/file/files.txp
diff --git a/textpattern/setup/forms/link.plainlinks.txp → textpattern/setup/forms/link/plainlinks.txp b/textpattern/setup/forms/link.plainlinks.txp → textpattern/setup/forms/link/plainlinks.txp
diff --git a/textpattern/setup/forms/misc.images.txp → textpattern/setup/forms/misc/images.txp b/textpattern/setup/forms/misc.images.txp → textpattern/setup/forms/misc/images.txp
diff --git a/...pattern/setup/forms/misc.search_input.txp → ...pattern/setup/forms/misc/search_input.txp b/...pattern/setup/forms/misc.search_input.txp → ...pattern/setup/forms/misc/search_input.txp
diff --git 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) {