Bed

diff --git a/etc/profile.d/dbq.sh b/etc/profile.d/dbq.sh
index 0463ea2495817135201bfba8e45798ef96bb6cc5..21d483e9c8a28aa37316b40115f5a454f7e336e2 100644 (file)
--- a/etc/profile.d/dbq.sh
+++ b/etc/profile.d/dbq.sh
@@ -1,4 +1,4 @@
-[ -z "$DBQ_HOST" ] && DBQ_HOST='db.nbdom.net'
+which dbq > /dev/null || return 0
 
 dbq2sqlite() {
   dbq f=txt a=db.dump db.type=sqlite $@

diff --git a/etc/profile.d/envs b/etc/profile.d/envs
index 654a26b2cf24eeb1a3b2d565b97f47cb48ff53b7..61402b382a4288030d1beebd776fd6574f0984eb 100644 (file)
--- a/etc/profile.d/envs
+++ b/etc/profile.d/envs
@@ -4,6 +4,12 @@
 #
 #################################################################################
 
+#
+# APP
+#
+[ -z "$CLOUD_DIR" ] && [ -e ~nico/Dropbox ] && CLOUD_DIR=~nico/Dropbox
+[ -z "$DBQ_HOST" ] && DBQ_HOST='db.nbdom.net'
+
 #
 # BASE
 #
@@ -12,13 +18,9 @@
 [ -z "$UID" ] && UID=`id -u`
 [ -z "$USER" ] && USER=`whoami`
 [ -z "$OSTYPE" ] && OSTYPE=`uname|tr [:upper:] [:lower:]`
-# NB 25.08.16 [ -z "PWD" ] && PWD=`pwd`
-
-# NB 10.12.16 [ -z "$CLOUD_DIR" ] && [ -e ~nico/ownCloud ] && CLOUD_DIR=~nico/ownCloud
-[ -z "$CLOUD_DIR" ] && [ -e ~nico/Dropbox ] && CLOUD_DIR=~nico/Dropbox
 
 # > env_add_path
-#We don't want to destroyed variables if function does not exists !
+# We don't want to destroyed variables if function does not exists !
 if true || env_add_path 1>/dev/null; then
 
 #

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index c901af6bcabecd0dff62e146bcae6323bdfc8b7c..65d829a149115b63a746b18102c132e0cb1898b0 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -581,6 +581,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
     // Then content type
     if (empty($content_type)) $content_type = Mime::fromExt($format==self::CLI_FORMAT ? 'txt' : $format);
+    if (empty($content_type)) $content_type = 'text/plain';
     if ($content_type) $this->page->content_type($content_type);
 
   }