From 64be0386e8dfac4fd5992b1dddfb218e226e0513 Mon Sep 17 00:00:00 2001
From: Progfou <jean-christophe.andre@auf.org>
Date: Wed, 8 Jul 2015 18:56:10 -0400
Subject: [PATCH 1/1] glpi-plugin-auf : correctifs

---
 glpi-plugin-auf/Makefile                           |    2 +-
 glpi-plugin-auf/debian/changelog                   |    6 ++++++
 glpi-plugin-auf/plugin/report.operatingsystems.php |   10 +++++-----
 glpi-plugin-auf/plugin/setup.php                   |    2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/glpi-plugin-auf/Makefile b/glpi-plugin-auf/Makefile
index f3f0b83..e79a4df 100644
--- a/glpi-plugin-auf/Makefile
+++ b/glpi-plugin-auf/Makefile
@@ -15,4 +15,4 @@ deb:
         echo -e "\n\n==> Lancer \"sudo debi\" pour tester l'installation.\n"
  
 release:
-	debuild -I.git -I*.ex -tc -sa -us -uc && debrelease --dput wheezy-test
+	debuild -I.git -I*.ex -tc -sa -us -uc && debrelease --dput jessie-test
diff --git a/glpi-plugin-auf/debian/changelog b/glpi-plugin-auf/debian/changelog
index cc635ff..cac46a8 100644
--- a/glpi-plugin-auf/debian/changelog
+++ b/glpi-plugin-auf/debian/changelog
@@ -1,3 +1,9 @@
+glpi-plugin-auf (0.84+3.1) unstable; urgency=medium
+
+  * Correctifs.
+
+ -- Progfou <jean-christophe.andre@auf.org>  Wed, 08 Jul 2015 18:46:33 -0400
+
 glpi-plugin-auf (0.84+3) unstable; urgency=medium
 
   * Intégration de Debian 8 et Ubuntu 14.04 dans les rapports.
diff --git a/glpi-plugin-auf/plugin/report.operatingsystems.php b/glpi-plugin-auf/plugin/report.operatingsystems.php
index 5c45201..d2f4927 100644
--- a/glpi-plugin-auf/plugin/report.operatingsystems.php
+++ b/glpi-plugin-auf/plugin/report.operatingsystems.php
@@ -57,7 +57,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(REPLACE(REPLACE(REPLACE(REPLACE(o.name,'™',''),'®',''),'fessional',''),'fessionnel',''),'Microsoft ','')
+                WHEN o.name REGEXP '^Microsoft' THEN REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(o.name,'(R)',''),'™',''),'®',''),'fessional',''),'fessionnel',''),'Microsoft ','')
                 WHEN o.name REGEXP '^Mac ' THEN REPLACE(o.name,'Mac ','')
                 ELSE o.name END) AS oname
           FROM `$table_item` c
@@ -80,16 +80,16 @@ while ($data=$DB->fetch_assoc($result)) {
     $data['oname'] = "<i>(indéterminé)</i>";
   }
   if (($data['oname'] == 'Debian 8') || ($data['oname'] == 'Ubuntu 12.04')) {
-    $oname_plus = '<svg width="5" height="5" style="background-color: #00ff00; margin: 1px;"/>';
+    $oname_plus = svg_bar(Array(1,0,0,0), 5, 5);
     $green_total += $data['count'];
   } elseif (($data['oname'] == 'Debian 7') || ($data['oname'] == 'Ubuntu 14.04')) {
-    $oname_plus = '<svg width="5" height="5" style="background-color: #ffff00; margin: 1px;"/>';
+    $oname_plus = svg_bar(Array(0,1,0,0), 5, 5);
     $yellow_total += $data['count'];
   } elseif ((substr($data['oname'],0,7) == 'Windows') || (substr($data['oname'],strlen($data['oname'])-4,4) == 'OS X')) {
-    $oname_plus = '<svg width="5" height="5" style="background-color: #0000ff; margin: 1px;"/>';
+    $oname_plus = svg_bar(Array(0,0,0,1), 5, 5);
     $blue_total += $data['count'];
   } else {
-    $oname_plus = '<svg width="5" height="5" style="background-color: #ff0000; margin: 1px;"/>';
+    $oname_plus = svg_bar(Array(0,0,1,0), 5, 5);
     $red_total += $data['count'];
   }
   echo "<tr class='tab_bg_2 auf_show_details'>";
diff --git a/glpi-plugin-auf/plugin/setup.php b/glpi-plugin-auf/plugin/setup.php
index 1cd80ed..f991f51 100644
--- a/glpi-plugin-auf/plugin/setup.php
+++ b/glpi-plugin-auf/plugin/setup.php
@@ -45,7 +45,7 @@ function plugin_init_auf() {
 function plugin_version_auf() {
    return array(
       'name'           => 'AUF',
-      'version'        => '0.3.0',
+      'version'        => '0.3.1',
       'author'         => 'Jean Christophe André',
       'license'        => 'GPLv2+',
       'homepage'       => 'http://git.auf.org/?p=auf-serveur.git;a=tree;f=glpi-plugin-auf',
-- 
1.7.10.4