glpi-plugin-auf : peaufinage cosmétique…

diff --git a/glpi-plugin-auf/debian/changelog b/glpi-plugin-auf/debian/changelog
index 19a4696..c885845 100644 (file)
--- a/glpi-plugin-auf/debian/changelog
+++ b/glpi-plugin-auf/debian/changelog
@@ -1,3 +1,9 @@
+glpi-plugin-auf (0.84+2.1) precise; urgency=low
+
+  * Peaufinage cosmétique…
+
+ -- Progfou <jean-christophe.andre@auf.org>  Fri, 04 Apr 2014 17:44:51 -0400
+
 glpi-plugin-auf (0.84+2) unstable; urgency=low
 
   * Ajout d'un rapport sur le parc matériel.

diff --git a/glpi-plugin-auf/plugin/report.computers.php b/glpi-plugin-auf/plugin/report.computers.php
index d37511a..10834bb 100644 (file)
--- a/glpi-plugin-auf/plugin/report.computers.php
+++ b/glpi-plugin-auf/plugin/report.computers.php
@@ -24,7 +24,7 @@ $table_item = getTableForItemType($itemtype);
 
 function svg_circle($color, $size=4) {
   $r = (int)$size; $cx = $r+1; $cy = $r+1;
-  $svg = '<svg width="'.(2+2*$r).'" height="'.(2+2*$r).'" style="margin: 1px;">';
+  $svg = '<svg width="'.(2+2*$r).'" height="'.(2+2*$r).'" style="margin: 1px; vertical-align: middle;">';
   $svg .= "<circle cx='$cx' cy='$cy' r='$r' stroke='black' stroke-width='0' fill='$color' />";
   $svg .= '</svg>';
   return $svg;
@@ -34,7 +34,7 @@ function svg_pie_chart($values, $size=16) {
   $colors = Array("#ffa0a0", "#a0ffa0", "#ffffa0", "#a0a0ff"); $color_idx = 0;
   $total = 0.0; foreach ($values as $v) { $total += $v; }
   $r = (int)$size; $cx = $r+1; $cy = $r+1; $rad = 2*pi()/$total; $old_a = 0;
-  $svg = '<svg width="'.(2+2*$r).'" height="'.(2+2*$r).'" style="margin: 1px;">';
+  $svg = '<svg width="'.(2+2*$r).'" height="'.(2+2*$r).'" style="margin: 2px; vertical-align: middle;">';
   foreach ($values as $a) {
     $x1 = $cx + $r * cos(-$old_a * $rad);
     $y1 = $cy + $r * sin(-$old_a * $rad);

diff --git a/glpi-plugin-auf/plugin/report.operatingsystems.php b/glpi-plugin-auf/plugin/report.operatingsystems.php
index 87bcdc2..52502c6 100644 (file)
--- a/glpi-plugin-auf/plugin/report.operatingsystems.php
+++ b/glpi-plugin-auf/plugin/report.operatingsystems.php
@@ -54,7 +54,7 @@ while ($region_data = $DB->fetch_assoc($region_result)) {
 $query = "SELECT COUNT(c.id) AS count, e.name AS ename,
           (CASE WHEN o.name REGEXP '^Debian ' THEN SUBSTRING_INDEX(REPLACE(o.name,' GNU/Linux',''),'.',1)
                 WHEN o.name REGEXP '^Ubuntu ' THEN SUBSTRING_INDEX(REPLACE(o.name,' LTS',''),'.',2)
-                WHEN o.name REGEXP '^Microsoft ' THEN REPLACE(o.name,'Microsoft ','')
+                WHEN o.name REGEXP '^Microsoft' THEN REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(o.name,'™',''),'®',''),'fessional',''),'fessionnel',''),'Microsoft ','')
                 WHEN o.name REGEXP '^Mac ' THEN REPLACE(o.name,'Mac ','')
                 ELSE o.name END) AS oname
           FROM `$table_item` c