ui

diff --git a/bin/dbq b/bin/dbq
index 6267b5ba14cf7eec274547f8909c89fdb8119f34..ec3b38f1d83ba6034a7b7d86c0c055b31b99fa75 100755 (executable)
--- a/bin/dbq
+++ b/bin/dbq
@@ -29,13 +29,11 @@ my ($NAME) = $0 =~ m,([^/]+)$,;
 my $UC_NAME = uc($NAME);
 my %PARAM = (
   'format' => $ENV{$UC_NAME.'_FORMAT'} ? $ENV{$UC_NAME.'_FORMAT'} : 'human',
-# NB 09.04.16   'action' => $ENV{$UC_NAME.'_PARAM'} ? $ENV{$UC_NAME.'_PARAM'} : 'rows',
-# NB 13.04.16   'db' => $ENV{$UC_NAME.'_DB'} ? $ENV{$UC_NAME.'_DB'} : '',
   'txt_errors' => $ENV{$UC_NAME.'_TXT_ERRORS'} ? $ENV{$UC_NAME.'_TXT_ERRORS'} : '1',
   'rows_head_char' => "\r",
 );
 
-$PARAM{'format'} = 'csv' unless -t  STDOUT;
+$PARAM{'format'} = 'csv' unless -t STDOUT;
 %PARAM = map {$_=>$PARAM{$_}} grep {$PARAM{$_} ne ''} keys %PARAM;
 if ($ENV{$UC_NAME.'_PARAMS'}) {
   for (split(' ',$ENV{$UC_NAME.'_PARAMS'})) {
@@ -218,7 +216,8 @@ if (-e $url) {
 #
 #################################################################################
 
-warn "$NAME: Command: ",join(" ",map{/\s+/ ? '"'.$_.'"' : $_} @cmd),"\n" if $VERBOSE;
+warn "$NAME: Command: ",join(" ",map{/\s+/ ? '"'.$_.'"' : $_} grep {!/^rows_head_char=/} @cmd),"\n" if $VERBOSE;
+#use Data::Dumper; warn(Dumper(\@cmd));
 $_ = system(@cmd);
 my $ex = ($? == 0 and $_ == 0) ? 0 : 1;
 close STDOUT;

diff --git a/etc/dbq/ui.php b/etc/dbq/ui.php
index 3ab53142e8b16874d302ec2b6cffe727c6431ae7..a3976310afbaaedf651c3e64bf059589425dd080 100644 (file)
--- a/etc/dbq/ui.php
+++ b/etc/dbq/ui.php
@@ -1,4 +1,6 @@
 <?php
+$GLOBALS['web'] = Db::p('extras')==='0' ? true : false;
+
 $DBQ['_ui'] = array(
   'title' => 'Semantico UI',
   'type' => 'sqlite',
@@ -103,7 +105,7 @@ $DBQ['_ui'] = array(
         }
 
         $r['keyevent'] = $Db->row("SELECT count(*) FROM fact WHERE fact.idnode=".$Db->quote($r['id']));
-        $r['graph'] = '<a target="_blank" href="/graphite/?Hosts='.$r['id'].'"><img alt="" src="/images/graphite.png" /></a>';
+        if($GLOBALS['web']) $r['graph'] = '<a target="_blank" href="/graphite/?Hosts='.$r['id'].'"><img alt="" src="/images/graphite.png" /></a>';
         #debug($facts);
       },
       /*
@@ -128,13 +130,13 @@ $DBQ['_ui'] = array(
 
     'view_backup' => array(
       'row_parse_post'=> function(&$r) {
-        $r['Detail'] = '<a target="_blank" class="view_backup" href="?table=backup&idnode='.$r['idnode'].'">View</a>';
+        if($GLOBALS['web']) $r['Detail'] = '<a target="_blank" class="view_backup" href="?table=backup&idnode='.$r['idnode'].'">View</a>';
       },
     ),
 
     'view_pingdom_per_month' => array(
       'row_parse_post'=> function(&$r) {
-        $r['Checks'] = '<a target="_blank" class="pingdom_check_report" href="?table=pingdom_check_policy&idpingdom_policy='.$r['idpingdom_policy'].'">'.$r['Checks'].'</a>';
+        if($GLOBALS['web']) $r['Checks'] = '<a target="_blank" class="pingdom_check_report" href="?table=pingdom_check_policy&idpingdom_policy='.$r['idpingdom_policy'].'">'.$r['Checks'].'</a>';
       },
       'extras' => array(
         'Checks' => '(SELECT count(*) FROM pingdom_check_policy pcp WHERE pcp.idpingdom_policy=view_pingdom_per_month.idpingdom_policy)',
@@ -143,7 +145,7 @@ $DBQ['_ui'] = array(
 
     'pingdom_check' => array(
       'row_parse_post'=> function(&$r) {
-        $r['View'] = '<a target="_blank" class="pingdom_check_report" href="https://my.pingdom.com/reports/uptime#check='.$r['id'].'"><img alt="" src="/images/graphite.png" /></a>';
+        if($GLOBALS['web']) $r['View'] = '<a target="_blank" class="pingdom_check_report" href="https://my.pingdom.com/reports/uptime#check='.$r['id'].'"><img alt="" src="/images/graphite.png" /></a>';
       },
 
     ),