www/dbq/etc/apache.conf

diff --git a/lib/php/page.php b/lib/php/page.php
index 24b99e1c09c4c5463ae62453f8f3d43e2e0b7cd9..6c7c10e922d6ea3da4252c58a5dd60582adf182e 100644 (file)
--- 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 ec4d8557a78df0f725f09043d7607964768f1ac7..dab1e89fbe04de33e8ab972ff649346d6b7f6572 100644 (file)
--- 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 (file)
index 0000000..12c7c00
--- /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]