move to release v0.1.1

Bug fix to v0.1.0

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+
+## [0.1.1] - 2017-09-27
+### Added
+ - None
+
+## Changed
+ - A few bug fixes for uncommon situations
+
+## Removed
+ - None
+
+
 ## [0.1.0] - 2017-09-20
 ### Added
  - The plugin now uses bith mssql and odbc PHP modules making PHP7 compatible 

glpi2mdt.xml

@@ -11,12 +11,12 @@
                <long>
                   <en>This plugin synchronises GLPI and MDT databases in order to manage Windows automatic deployment from GLPI and based on its data. 
 
-Version 0.1.0 is functionnal and running in production in our environmnent. The README and INSTALL files in the distribution package will give you more information as to what is already available and what I plan to deliver next. It works on my specific configuration (MDT 2013 on Server 2012 + MS-SQL 2012, and GLPI 9.1.6 on Linux PHP 5.5). It is developed and tested in this environment only. If you experience problem with a different configuration please report the issue on GitHub (link below). 
+Version 0.1.1 is functionnal and running in production in our environmnent. The README and INSTALL files in the distribution package will give you more information as to what is already available and what I plan to deliver next. It works on my specific configuration (MDT 2013 on Server 2012 + MS-SQL 2012, and GLPI 9.1.6 on Linux PHP 5.5). It is developed and tested in this environment only. If you experience problem with a different configuration please report the issue on GitHub (link below). 
 
 If you're insterested in this plugin, don't hesitate to contact the author and describe your current architecture so he can make sure the plugin design is compatible with most environments</en>
                   <fr>Ce plugin synchronise les bases de données MDT et GLPI afin de gérer le déploiement automatique de Windows depuis GLPI et à partir de ses données.
 
-La version 0.1.0 est opérationnelle et en prodution dans notre environement. Les fichiers README et INSTALL de la distribution vous donneront plus de détails sur ce qui est en place et ce qu'il est prévu d'ajouter en priorité. Le plugin fonctionne dans mon environement spécifique (MDT 2013 sur Server 2012 et MS-SQL 2012, associés à GLPI 9.1.6 sur Linux et PHP 5.5). Il est développé et testé uniquement dans ce contexte. Si vous rencontrez des problèmes avec une configuration différente merci d'ouvrir un ticket avec le lien GitHub ci-dessous.
+La version 0.1.1 est opérationnelle et en prodution dans notre environement. Les fichiers README et INSTALL de la distribution vous donneront plus de détails sur ce qui est en place et ce qu'il est prévu d'ajouter en priorité. Le plugin fonctionne dans mon environement spécifique (MDT 2013 sur Server 2012 et MS-SQL 2012, associés à GLPI 9.1.6 sur Linux et PHP 5.5). Il est développé et testé uniquement dans ce contexte. Si vous rencontrez des problèmes avec une configuration différente merci d'ouvrir un ticket avec le lien GitHub ci-dessous.
 
 Si ce plugin vous intéresse n'hésitez pas à contacter l'auteur avec une description de votre architecture actuelle afin qu'il s'assure que ses choix de design seront compatibles avec la plupart des environements.</fr>
                </long>
@@ -30,7 +30,7 @@ Si ce plugin vous intéresse n'hésitez pas à contacter l'auteur avec une descr
             </authors>
             <versions>
                <version>
-                  <num>0.1.0</num>
+                  <num>0.1.1</num>
                   <compatibility>9.1.x</compatibility>
                   <compatibility>9.2.0</compatibility>
                </version>

inc/crontask.class.php

@@ -363,7 +363,7 @@ function cronUpdateBaseconfigFromMDT($task, $cron=true) {
       // Task sequence groups
       // Mark lines in order to detect deleted ones in the source database
       $DB->query("UPDATE glpi_plugin_glpi2mdt_task_sequence_groups SET is_in_sync=false WHERE is_deleted=false");
-      $DB->query("UPDATE glpi_plugin_glpi2mdt_task_sequence_group_link SET is_in_sync=false WHERE is_deleted=false");
+      $DB->query("UPDATE glpi_plugin_glpi2mdt_task_sequence_group_links SET is_in_sync=false WHERE is_deleted=false");
       $groups = simplexml_load_file($MDT->globalconfig['FileShare'].'/TaskSequenceGroups.xml')
               or die("Cannot load file $MDT->globalconfig['FileShare']/TaskSequenceGroups.xml");
       $nb = 0;

inc/mdt.class.php

@@ -303,7 +303,7 @@ function getMdtIds(Computer $id) {
 
       //$values is a list ready to be used in a "INSERT VALUES" clause
       $values =  substr($values, 0, -2)." ";
-      if ($macs ==  "MacAddress IN ()") {
+      if ($macs ==  "MacAddress IN) ") {
          // When no mac address is defined, don't match on MacAddress in WHERE clause.
          $macs="MacAddress=''";
          $values= "('$name', '$uuid', '$serial', '$assettag', '')";

locales/en_US.po

@@ -36,19 +36,19 @@ msgstr "Incompatible PHP Installation. Requires module"
 msgid "Installed / not configured"
 msgstr "Installed / not configured"
 
-#: inc/crontask.class.php:179 inc/crontask.class.php:216
-#: inc/crontask.class.php:262 inc/crontask.class.php:308
-#: inc/crontask.class.php:349 inc/crontask.class.php:395
+#: inc/crontask.class.php:181 inc/crontask.class.php:218
+#: inc/crontask.class.php:264 inc/crontask.class.php:310
+#: inc/crontask.class.php:351 inc/crontask.class.php:397
 msgid "lines loaded into table"
 msgstr "line(s) loaded into table"
 
-#: inc/crontask.class.php:187 inc/crontask.class.php:271
-#: inc/crontask.class.php:319 inc/crontask.class.php:358
-#: inc/crontask.class.php:406
+#: inc/crontask.class.php:189 inc/crontask.class.php:273
+#: inc/crontask.class.php:321 inc/crontask.class.php:360
+#: inc/crontask.class.php:408
 msgid "lines deleted from table"
 msgstr "line's) deleted from table"
 
-#: inc/crontask.class.php:540
+#: inc/crontask.class.php:542
 msgid "Glpi2mdt Plugin"
 msgstr "Glpi2mdt Plugin"
 
@@ -80,11 +80,11 @@ msgstr "Could not count tables in schema"
 msgid "Database login KO!"
 msgstr "Database login KO!"
 
-#: inc/config.class.php:86 inc/computer.class.php:321
+#: inc/config.class.php:86 inc/computer.class.php:320
 msgid "YES"
 msgstr "Yes"
 
-#: inc/config.class.php:87 inc/computer.class.php:322
+#: inc/config.class.php:87 inc/computer.class.php:321
 msgid "NO"
 msgstr "No"
 
@@ -172,40 +172,40 @@ msgstr "Test connection"
 msgid "Initialise data"
 msgstr "Initialise data"
 
-#: inc/config.class.php:236 inc/computer.class.php:403
+#: inc/config.class.php:236 inc/computer.class.php:402
 #, php-format
 msgid "A new version of plugin glpi2mdt is available: v%s"
 msgstr "A new version of plugin glpi2mdt is available: v%s"
 
-#: inc/computer.class.php:66 inc/computer.class.php:68
+#: inc/computer.class.php:65 inc/computer.class.php:67
 msgid "Auto Install"
 msgstr "Auto Install"
 
-#: inc/computer.class.php:315
+#: inc/computer.class.php:314
 msgid "Automatic installation"
 msgstr "Automatic installation"
 
-#: inc/computer.class.php:319
+#: inc/computer.class.php:318
 msgid "Enable automatic installation"
 msgstr "Enable automatic installation"
 
-#: inc/computer.class.php:323
+#: inc/computer.class.php:322
 msgid "Default"
 msgstr "Default"
 
-#: inc/computer.class.php:332
+#: inc/computer.class.php:331
 msgid "Reset after (empty for permanent):"
 msgstr "Reset after (empty for permanent):"
 
-#: inc/computer.class.php:342
+#: inc/computer.class.php:341
 msgid "Task sequence"
 msgstr "Task sequence"
 
-#: inc/computer.class.php:371
+#: inc/computer.class.php:370
 msgid "Applications"
 msgstr "Applications"
 
-#: inc/computer.class.php:383
+#: inc/computer.class.php:382
 msgid "Roles"
 msgstr "Roles"
 

locales/fr_FR.po

@@ -38,19 +38,19 @@ msgstr "Installation de PHP incompatible. Nécessite le module"
 msgid "Installed / not configured"
 msgstr "Installé / Non configuré"
 
-#: inc/crontask.class.php:179 inc/crontask.class.php:216
-#: inc/crontask.class.php:262 inc/crontask.class.php:308
-#: inc/crontask.class.php:349 inc/crontask.class.php:395
+#: inc/crontask.class.php:181 inc/crontask.class.php:218
+#: inc/crontask.class.php:264 inc/crontask.class.php:310
+#: inc/crontask.class.php:351 inc/crontask.class.php:397
 msgid "lines loaded into table"
 msgstr "ligne(s) chargée(s) dans la table"
 
-#: inc/crontask.class.php:187 inc/crontask.class.php:271
-#: inc/crontask.class.php:319 inc/crontask.class.php:358
-#: inc/crontask.class.php:406
+#: inc/crontask.class.php:189 inc/crontask.class.php:273
+#: inc/crontask.class.php:321 inc/crontask.class.php:360
+#: inc/crontask.class.php:408
 msgid "lines deleted from table"
 msgstr "ligne(s) supprimée(s) de la table"
 
-#: inc/crontask.class.php:540
+#: inc/crontask.class.php:542
 msgid "Glpi2mdt Plugin"
 msgstr "Plugin Glpi2mdt"
 
@@ -82,11 +82,11 @@ msgstr "Impossible de compter les tables du schéma"
 msgid "Database login KO!"
 msgstr "Echec de connexion à la base!"
 
-#: inc/config.class.php:86 inc/computer.class.php:321
+#: inc/config.class.php:86 inc/computer.class.php:320
 msgid "YES"
 msgstr "Oui"
 
-#: inc/config.class.php:87 inc/computer.class.php:322
+#: inc/config.class.php:87 inc/computer.class.php:321
 msgid "NO"
 msgstr "Non"
 
@@ -176,40 +176,40 @@ msgstr "Tester la connexion"
 msgid "Initialise data"
 msgstr "Initialiser les données"
 
-#: inc/config.class.php:236 inc/computer.class.php:403
+#: inc/config.class.php:236 inc/computer.class.php:402
 #, php-format
 msgid "A new version of plugin glpi2mdt is available: v%s"
 msgstr "Une nouvelle version du plugin glpi2mdt est disponible: v%s"
 
-#: inc/computer.class.php:66 inc/computer.class.php:68
+#: inc/computer.class.php:65 inc/computer.class.php:67
 msgid "Auto Install"
 msgstr "Install auto"
 
-#: inc/computer.class.php:315
+#: inc/computer.class.php:314
 msgid "Automatic installation"
 msgstr "Installation automatique"
 
-#: inc/computer.class.php:319
+#: inc/computer.class.php:318
 msgid "Enable automatic installation"
 msgstr "Activer l'installation automatique"
 
-#: inc/computer.class.php:323
+#: inc/computer.class.php:322
 msgid "Default"
 msgstr "Défault"
 
-#: inc/computer.class.php:332
+#: inc/computer.class.php:331
 msgid "Reset after (empty for permanent):"
 msgstr "Annuler après (vide pour jamais)"
 
-#: inc/computer.class.php:342
+#: inc/computer.class.php:341
 msgid "Task sequence"
 msgstr "Séquence de tâches"
 
-#: inc/computer.class.php:371
+#: inc/computer.class.php:370
 msgid "Applications"
 msgstr "Applications"
 
-#: inc/computer.class.php:383
+#: inc/computer.class.php:382
 msgid "Roles"
 msgstr "Rôles"
 

locales/glpi2mdt.pot

@@ -36,19 +36,19 @@ msgstr ""
 msgid "Installed / not configured"
 msgstr ""
 
-#: inc/crontask.class.php:179 inc/crontask.class.php:216
-#: inc/crontask.class.php:262 inc/crontask.class.php:308
-#: inc/crontask.class.php:349 inc/crontask.class.php:395
+#: inc/crontask.class.php:181 inc/crontask.class.php:218
+#: inc/crontask.class.php:264 inc/crontask.class.php:310
+#: inc/crontask.class.php:351 inc/crontask.class.php:397
 msgid "lines loaded into table"
 msgstr ""
 
-#: inc/crontask.class.php:187 inc/crontask.class.php:271
-#: inc/crontask.class.php:319 inc/crontask.class.php:358
-#: inc/crontask.class.php:406
+#: inc/crontask.class.php:189 inc/crontask.class.php:273
+#: inc/crontask.class.php:321 inc/crontask.class.php:360
+#: inc/crontask.class.php:408
 msgid "lines deleted from table"
 msgstr ""
 
-#: inc/crontask.class.php:540
+#: inc/crontask.class.php:542
 msgid "Glpi2mdt Plugin"
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Database login KO!"
 msgstr ""
 
-#: inc/config.class.php:86 inc/computer.class.php:321
+#: inc/config.class.php:86 inc/computer.class.php:320
 msgid "YES"
 msgstr ""
 
-#: inc/config.class.php:87 inc/computer.class.php:322
+#: inc/config.class.php:87 inc/computer.class.php:321
 msgid "NO"
 msgstr ""
 
@@ -172,40 +172,40 @@ msgstr ""
 msgid "Initialise data"
 msgstr ""
 
-#: inc/config.class.php:236 inc/computer.class.php:403
+#: inc/config.class.php:236 inc/computer.class.php:402
 #, php-format
 msgid "A new version of plugin glpi2mdt is available: v%s"
 msgstr ""
 
-#: inc/computer.class.php:66 inc/computer.class.php:68
+#: inc/computer.class.php:65 inc/computer.class.php:67
 msgid "Auto Install"
 msgstr ""
 
-#: inc/computer.class.php:315
+#: inc/computer.class.php:314
 msgid "Automatic installation"
 msgstr ""
 
-#: inc/computer.class.php:319
+#: inc/computer.class.php:318
 msgid "Enable automatic installation"
 msgstr ""
 
-#: inc/computer.class.php:323
+#: inc/computer.class.php:322
 msgid "Default"
 msgstr ""
 
-#: inc/computer.class.php:332
+#: inc/computer.class.php:331
 msgid "Reset after (empty for permanent):"
 msgstr ""
 
-#: inc/computer.class.php:342
+#: inc/computer.class.php:341
 msgid "Task sequence"
 msgstr ""
 
-#: inc/computer.class.php:371
+#: inc/computer.class.php:370
 msgid "Applications"
 msgstr ""
 
-#: inc/computer.class.php:383
+#: inc/computer.class.php:382
 msgid "Roles"
 msgstr ""
 

setup.php

@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define('PLUGIN_GLPI2MDT_VERSION', '0.1.0');
+define('PLUGIN_GLPI2MDT_VERSION', '0.1.1');
 
 /**
  * Init hooks of the plugin.