bin/nb-update

diff --git a/bin/nb-update b/bin/nb-update
index faf7a4e5842a44536fb18e150935d09b249432fb..cb8cc473582decbb5baf5c26762187e3809ce441 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -87,6 +87,7 @@ for repo in $(nb_repos); do
   fi
 
   echo
+  nb_host_info repo.$name $([ "$ex" = "0" ] && echo ok || echo "err=$ex" ) 1>/dev/null 2>&1
 
 done
 

diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh
index 60032b4774be3523887f5dd34e3564954c887bb6..ab8c46e6fd96d923da0b896e47b23a30373fc9d4 100644 (file)
--- a/etc/profile.d/nb.sh
+++ b/etc/profile.d/nb.sh
@@ -72,10 +72,10 @@ nb_perl() {
   ruby -r$NB_ROOT/lib/perl/NB -e "$@"
 }
 
-nb_host_info_insert() {
+nb_host_info() {
   local host=$(hostname)
   [ -z "$host" ] && host=$(hostname -f)
   local key="$1"
   local val="$2"
-  curl -sL -u nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT https://nbdom.net/host_info -d "host=$host" -d "key=$key" "val=$val"
+  curl -u nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT https://nbdom.net/host_info -H 'Accept: text/json' -d "host=$host" -d "key=$key" -d "val=$val"
 }

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index e3c0abe940b6cdc4314f26d734af1889ea9e8ad7..c6f453b5806d88483c3f91f26555da78454cb6d5 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -1766,7 +1766,7 @@ Class Table extends nb {
     }
 
                # NB 07.12.17: Add LIMIT 1. If a table as not primary key when want to delete only on record
-    $sql = 'DELETE FROM ' . $this->sql_name() . $where . " LIMIT 1";
+    $sql = 'DELETE FROM ' . $this->sql_name() . $where . ($this->db()->type == 'pgsql' ? '' : ' LIMIT 1');
     $info['sql'] = $sql;
 
     if (self::p('debug')) {

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 0a7498dcbf75e50a0ff1c236b17386ec4bc1b0f6..1da6588fde80b23706fcca08ae82dfa38317a08b 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -377,7 +377,8 @@ class DbQ extends nb {
                                if ($this->perm < self::DELETE) return;
                                if ($this->db->type == 'sqlite' and !is_writeable($this->db->host)) return;
 
-                               $rm = $this->table->base.'/rm/'.$args;
+# NB 11.12.17                          $rm = $this->table->base.'/rm/'.$args;
+                               $rm = $this->table->base.'/rm/';
                                $r['delete'] = ''
                                        .'<form action="'.$rm.'" method="post">'
                                        .'<a class="button rm" href="'.$rm.'" onclick="parentNode.submit();return false;">Delete</a>'