Merge branch 'release/1.7.1'

pluginsGLPI · Dec 18, 2020 · 9e206cc · 9e206cc
2 parents e6b6d52 + ea5028b
commit 9e206cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/inc/inventory.class.php b/inc/inventory.class.php
@@ -321,7 +321,7 @@ function computersByOS($config = []) {
       $sql_entities = " AND c.`entities_id` IN ({$this->where_entities})";
       $sql_states   = self::getStateCondition('c.states_id');
       $oses = ['Windows' => 'Windows',
-               'Linux'   => 'Linux|Ubuntu',
+               'Linux'   => 'Linux|Ubuntu|openSUSE',
                'Solaris' => 'Solaris',
                'AIX'     => 'AIX',
                'BSD'     => 'BSD',
@@ -462,7 +462,7 @@ function reportHbarLinux($config = []) {
       $sql_states2 = self::getStateCondition('c.states_id', true);
 
       $data = [];
-      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%'") as $os) {
+      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%' OR name LIKE '%openSUSE%'") as $os) {
          $iterator = $DB->request(
             'glpi_computers', [
                'SELECT' => [
@@ -516,7 +516,7 @@ function reportHbarLinuxDistro($config = []) {
       $sql_states = self::getStateCondition('glpi_computers.states_id', true);
 
       $data = [];
-      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%'") as $os) {
+      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%' OR name LIKE '%openSUSE%'") as $os) {
          $number = countElementsInTable(
             'glpi_computers', [
                'INNER JOIN' => [

diff --git a/mreporting.xml b/mreporting.xml
@@ -98,6 +98,11 @@ Voir documentation : https://github.com/PluginsGLPI/mreporting/wiki
       <author>Infotel</author>
    </authors>
    <versions>
+      <version>
+         <num>1.7.1</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/mreporting/releases/download/1.7.1/glpi-mreporting-1.7.1.tar.bz2</download_url>
+      </version>
       <version>
          <num>1.7.0</num>
          <compatibility>~9.5.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define ('PLUGIN_MREPORTING_VERSION', '1.7.0');
+define ('PLUGIN_MREPORTING_VERSION', '1.7.1');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_MREPORTING_MIN_GLPI", "9.5");