From 61659ebf8d67126cf80111c4618209670e6b8c83 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 17 Jan 2019 01:17:52 +0100
Subject: [PATCH] www/dbq/etc/apache.conf

---
 lib/php/page.php        |  4 ++--
 www/dbq/dbq.php         | 10 ++++++++--
 www/dbq/etc/apache.conf |  5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 www/dbq/etc/apache.conf

diff --git a/lib/php/page.php b/lib/php/page.php
index 24b99e1c..6c7c10e9 100644
--- a/lib/php/page.php
+++ b/lib/php/page.php
@@ -280,8 +280,8 @@ class Page extends nb {
 
     $this->headers(); 
 
-    if (preg_match('/html$/',self::$content_type)) {
-    #if (self::is('html')) {
+# NB 17.01.19     if (preg_match('/html$/',self::$content_type)) {
+    if (self::is('html')) {
 
       echo $this->doctype(); 
 
diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index ec4d8557..dab1e89f 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -313,7 +313,9 @@ class DbQ extends nb {
 			if ($this->base) $this->page->head[] = '<base href="' . $this->base . '/" />';
 
 			$this->page->begin();
-			echo '<div id="page-body" class="container">';
+			if ($this->is_html) {
+				echo '<div id="page-body" class="container">';
+			}
 
 		} # if (empty($this->_nopage)) {
 
@@ -342,11 +344,15 @@ class DbQ extends nb {
 
 		$this->db->out($rows,$head,$conf);
 
+		if ($this->is_html) {
+			echo '</div>'; # page-body
+		}
+
 		if (empty($this->_nopage)) {
 
 			$bottom = [];
 
-			echo '</div>'; # page-body
+# NB 17.01.19 			echo '</div>'; # page-body
 			$this->page_bottom();
 
 			$this->page->end();
diff --git a/www/dbq/etc/apache.conf b/www/dbq/etc/apache.conf
new file mode 100644
index 00000000..12c7c006
--- /dev/null
+++ b/www/dbq/etc/apache.conf
@@ -0,0 +1,5 @@
+DirectoryIndex index.php
+RewriteEngine  on
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)$ /index.php?$1 [QSA,L]
-- 
2.47.3