From: Nicolas Boisselier <nicolas.boisselier@semantico.com>
Date: Mon, 17 Oct 2016 09:24:51 +0000 (+0100)
Subject: new line in human format
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=aa4e3d22e9005c3cc525e88170c3c2f4e919ab62;p=nb.git

new line in human format
---

diff --git a/etc/dbq/ui.php b/etc/dbq/ui.php
index a3976310..0415e41f 100644
--- a/etc/dbq/ui.php
+++ b/etc/dbq/ui.php
@@ -95,7 +95,7 @@ $DBQ['_ui'] = array(
           ."SELECT 'idvmware',idvmware FROM vms WHERE vms.idnode=".$Db->quote($r['id'])
           ." UNION SELECT 'env',value FROM fact WHERE name = 'environment' AND idnode=".$Db->quote($r['id'])
           ." UNION SELECT 'aws_ec2',id FROM aws_ec2 WHERE aws_ec2.idnode=".$Db->quote($r['id'])
-          ." UNION SELECT 'last_backup',CONCAT('<a href=\"#\" onclick=\"alert(''Directories:\\n\\n ',replace(dirs,' ','\\n'),''');return false\">',max(date),'</a>') as v FROM backup WHERE idnode=".$Db->quote($r['id'])." GROUP BY dirs"
+          .($GLOBALS['web'] ? " UNION SELECT 'last_backup',CONCAT('<a href=\"#\" onclick=\"alert(''Directories:\\n\\n ',replace(dirs,' ','\\n'),''');return false\">',max(date),'</a>') as v FROM backup WHERE idnode=".$Db->quote($r['id'])." GROUP BY dirs" : "")
           ." UNION SELECT 'last_run',substr(value,1,10) FROM fact WHERE name = 'last_run' AND idnode=".$Db->quote($r['id'])." AND value < ".$Db->quote(date('Y-m-d', strtotime('-3 days')))
           ." UNION SELECT 'rack',CONCAT(idrack,'/',position) FROM rack_node WHERE idnode=".$Db->quote($r['id'])." OR idnode IN (SELECT idvmware FROM vms WHERE vms.idnode=rack_node.idnode)"
           ." UNION SELECT 'switch' as n, CONCAT(id,':',port) as v FROM switch_port WHERE switch_port.idnode=".$Db->quote($r['id'])." AND switch_port.port NOT LIKE 'ch%'"
diff --git a/lib/php/out.php b/lib/php/out.php
index de4d9895..ff1a806d 100644
--- a/lib/php/out.php
+++ b/lib/php/out.php
@@ -550,6 +550,9 @@ function out_human(&$o,&$row) {
     $o['_human']['len'] = [];
   }
 
+  foreach ($row as $k=>$v) {
+    $row[$k] = trim(str_replace("\n",' ',$v));
+  }
   $line = out::row_csv($o,$row);
 
   # Search max length string
@@ -569,7 +572,9 @@ function out_human(&$o,&$row) {
     echo "\n";
     out::bye("Option tmpfile is missing, wrong uage of this funtion!");
   }
+
   fwrite($o['tmpfile'],$line."\n");
+
 }
 
 function out_human_end(&$o) {