First attempt at version 0.1.0

Author: Debug Bill

CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.1.0] - 2017-09-20
+### Added
+ - The plugin now uses bith mssql and odbc PHP modules making PHP7 compatible 
+ - Crontask is added in order to disable automatic install after a specific date
+ - Crontask is added to synchronise base data from MTD to GLPI on a regular basis (applications, roles,....)
+ - Several applications have been added.
+ - A major bug is removed wich was probably preventing most of you from using the plugin (some platform specific configuraiton was hard coded)
+ - TCP port configuration for DB access is now working
+
+## Changed
+ - The coupling mode now has an effect. Strict and Loose coupling are working. Master-Master still doesn't
+
+## Removed
+ - None
+
 
 ## [0.0.1] - 2017-08-25
 ### Added

INSTALL.md

@@ -18,10 +18,10 @@ That's all for now!
 * Go to one of your computers. 
 * It should have at least one unique identifier availalble: Serial (might not be unique), Mac address, GUID.
 * Go to sub-item "auto-install" in the computer page.
-* Set your desired values, mainly "Automatic Install" to YES. Choose the proper task sequence and application (yes just one for now)
+* Set your desired values, mainly "Automatic Install" to YES. Choose the proper task sequence and application(s) and role(s) as you would from MDT's interface
 * Save
 
-The computer is now created into MDT with those settings. Pressing F12 for PXE boot should fire the install.
+The computer is now created or updated in MDT with those settings. Pressing F12 for PXE boot should fire the install.
 
 
 Hope it works for you too!

README.md

@@ -31,25 +31,27 @@ It is developed and tested in this environment only. If you experience problem w
 * MDT must be installed in a MS-SQL database accessible from the GLPI server
 * MDT must be fully operationnal by itself. The plugin will not fix a faulty MDT installation, it is only remote-controlling it.
 * (MSSQL or ODBC) and SimpleXML PHP modules must be installed
-* The "Control" directory in your MDT deployment share contains part of the MDT configuration (the other part is in the MS-SQL database). It needs to be mounted (read-only is OK) somewhere on your GLPI server and accessible to PHP scripts. 
+* The "Control" directory in your MDT deployment share contains part of the MDT configuration (the other part is in the MS-SQL database). It needs to be mounted (read-only is OK) somewhere on your GLPI server and accessible to PHP scripts. Pay specific attention to files ownership and SELinux settings which can prevent proper functionning. 
 * Fusion inventory, though not mandatory is really very very nice to have.
 
-As of version 0.0.1 this plugin is just a little more than a proof of concept. I hope to improve it with time but some feedback on this
+Starting with version 0.1.0 this plugin is now fully functionnal and in use at our premises. I hope to improve it with time but some feedback on this
 version is welcome in order to direct my efforts in the right direction.
 Still, it works for us, in our specific environment!
 
 The plugin is available in French and English, other translators welcome.
 
 
 ## TODOs
-* Manage groups (this is mainly UI interface stuff, the code can already handle it. My main question is how many applications are avalaible on average MDT servers? Our has only 5, but in a previous company we had hundreds. The gui would not be the same....)
-* Handle roles, models, packages in the same way applications are handled (but are you using those features in MDT)?
+* Manage ranks in applications (this is mainly UI interface stuff, the code can already handle it. My main question is "is it really needded? We don't as we don't have dependencies between applications (and no so many applications to install anyway).
+* Handle models, packages in the same way applications are handled (but are you using those features in MDT)? Models are an issue because of a limitatio in Fusion Inventory. It may be aleviated with GLPI 9.2.x. More to come...
 * Automate some actions based on information available in GLPI and not managed by MDT (location, entity....)
 * Be multi-MDT-server, multi-deployment-share, multi-domain aware. Currently the plugin is not domain aware and is connected to only one MDT database. This raises quite a few questions as to how it should work then.
-* Several coupling modes are proposed in the config page.... but only one is really implemented. There too I wonder what user want. For me the "Strict Master-Slave is fine" as I want everything to be done in GLPI.
+* Several coupling modes are proposed in the config page.... The strict and loose coupling are there, master-master is not for the time being. Is ithis mode desirable anyway? For me the "Strict Master-Slave is fine" as I want everything to be done in GLPI. Feedback is welcome.
 * Fix Bugs!!!!! There most probably are many, this is the first release.
 
 
 Please test and send feedback if you (dis)like my work.
 
+For more information, please consult the Wiki on gitHub
+
 

inc/computer.class.php

@@ -152,6 +152,15 @@ function updateMDT($id) {
          $parameters[$line['column_name']] = true;
       }
 
+      // Build password according to rules
+      if ($globalconfig['Complexity'] == 'Trivial') {
+         $adminpasscomposite = $name;
+      } else if ($globalconfig['Complexity'] == 'Unique') {
+         $adminpasscomposite = $globalconfig['LocalAdmin'].'-'.$name;
+      } else { // Default case, Basic
+         $adminpasscomposite = $globalconfig['LocalAdmin'];
+      }
+
       $globalconfig = $this->globalconfig;
 
       // Get data for current computer
@@ -209,9 +218,9 @@ function updateMDT($id) {
          $ids="ID = ''";
       }
       // Check if the computer entries in MDT are the ones expected by GLPI.
-      // If no, delete everything and recreate
+      // If not, delete everything and recreate
       // If yes, depending on coupling mode, delete and recreate or simply update
-      $query = ("SELECT FROM dbo.ComputerIdentity 
+      $query = ("SELECT ID FROM dbo.ComputerIdentity 
                   WHERE (UUID='$uuid') AND Description='$name' AND SerialNumber='$serial' AND $macs");
       $result = $this->query($query);
       $nblinesactual = $this->numrows($result);
@@ -220,7 +229,7 @@ function updateMDT($id) {
          $this->queryOrDie("INSERT INTO dbo.ComputerIdentity (Description, UUID, SerialNumber, AssetTag, MacAddress) VALUES $values");
       }
       // Delete corresponding records in side tables depending on coupling mode
-      if ($nblines <> $nblinesactual OR $mode == 'strict') {
+      if ($nblines <> $nblinesactual OR $globalconfig['Mode'] == 'Strict') {
          $this->queryOrDie("DELETE FROM dbo.Settings WHERE Type='C' and $ids");
          $this->queryOrDie("DELETE FROM dbo.Settings_Applications WHERE Type='C' and $ids");
          $this->queryOrDie("DELETE FROM dbo.Settings_Administrators WHERE Type='C' and $ids");
@@ -232,55 +241,65 @@ function updateMDT($id) {
       $query = "SELECT ID FROM dbo.ComputerIdentity WHERE Description='$name'";
       $result = $this->queryOrDie($query);
       $ids = "(";
-      $values = '';
 
       while ($row = $this->fetch_array($result)) {
          $mdtid = $row['ID'];
-         $ids = $ids.$mdtid.", ";
-         $values = $values."('C', $mdtid, '$name', '$name', '$name', '$adminpasscomposite'), ";
+         $ids = $ids.$row['ID'].", ";
          $arrayid[$row['ID']] = $row['ID'];
+         $values = "('C', $mdtid, '$name', '$name', '$name', '$adminpasscomposite') ";
+         // Check if settings line does exist already. Insert if not, update if yes
+         // (because "on duplicate" does not exist in MS-SQL 
+         $exists = $this->queryOrDie("SELECT ID FROM dbo.Settings WHERE Type='C' AND ID=$mdtid;");
+         if ($this->numrows($exists) == 1) {
+            $query = "UPDATE dbo.Settings SET ComputerName='$name', OSDComputerName='$name', FullName='$name', AdminPassword='$adminpasscomposite'
+                         WHERE Type='C' and ID=$mdtid";
+         } else {
+            $query = "INSERT INTO dbo.Settings (Type, ID, ComputerName, OSDComputerName, FullName, AdminPassword) VALUES $values;";
+         }
+         $this->queryOrDie($query);
       }
       $ids = substr($ids, 0, -2).") ";
-      $values = substr($values, 0, -2);
-
-         // Build password according to rules
-      if ($globalconfig['Complexity'] == 'Trivial') {
-         $adminpasscomposite = $name;
-      } else if ($globalconfig['Complexity'] == 'Unique') {
-         $adminpasscomposite = $globalconfig['LocalAdmin'].'-'.$name;
-      } else { // Default case, Basic
-         $adminpasscomposite = $globalconfig['LocalAdmin'];
-      }
-
-      $query = "INSERT INTO dbo.Settings (Type, ID, ComputerName, OSDComputerName, FullName, AdminPassword) VALUES $values";
-      $this->queryOrDie($query);
 
       // Update settings with additional parameters
       $query = "SELECT `key`, `value` FROM glpi_plugin_glpi2mdt_settings WHERE id=$id AND category='C' AND type='C';";
-      $result = $DB->query($query)
-           or die("Cannot select additional parameters.<br>". $query."<br><br>".$DB->error());
+      $result = $DB->queryOrDie($query, "Cannot select additional parameters.<br>");
       while ($pair = $DB->fetch_array($result)) {
          $key = $pair['key'];
          $value = $pair['value'];
          $query = "UPDATE dbo.Settings SET $key='$value' WHERE ID IN $ids;";
-         if ($parameter[$key]) {
+         // Check if key is a valid field for database "settings"
+         if ($parameters[$key]) {
             $this->queryOrDie("$query");
          }
       }
-
       // Update applications table
       $query = "SELECT `key`, `value` FROM glpi_plugin_glpi2mdt_settings WHERE id=$id AND category='A' AND type='C';";
-      $result = $DB->query($query)
-            or die("Cannot select additional applications.<br>". $query."<br><br>".$DB->error());
-      $query = "DELETE FROM dbo.Settings_Applications WHERE type='C' AND ID='$id'";
-      $this->queryOrDie("$query");
+      $result = $DB->queryOrDie($query, "Cannot select additional applications.");
       while ($pair = $DB->fetch_array($result)) {
          $key = $pair['key'];
          $value = $pair['value'];
          foreach ($arrayid as $mdtid) {
-            $query = "INSERT INTO dbo.Settings_Applications (Type, ID, Sequence, Applications)
-                   VALUES ('C', '$mdtid', $value, '$key');";
-            $this->queryOrDie("$query");
+            // GLPI2MDT does not manage ranks, so keep the existing one if any
+            $ranks = $this->queryOrDie("SELECT Sequence FROM dbo.Settings_Applications WHERE ID=$mdtid AND type='C' AND Applications='$key';");
+            if ($this->numrows($ranks) == 0) {
+               $this->queryOrDie("INSERT INTO dbo.Settings_Applications (Type, ID, Sequence, Applications)
+                      VALUES ('C', '$mdtid', $value, '$key');");
+            }
+         }
+      }
+      // Update Roles table
+      $query = "SELECT `key`, `value` FROM glpi_plugin_glpi2mdt_settings WHERE id=$id AND category='R' AND type='C';";
+      $result = $DB->queryOrDie($query, "Cannot select additional roles.");
+      while ($pair = $DB->fetch_array($result)) {
+         $key = $pair['key'];
+         $value = $pair['value'];
+         foreach ($arrayid as $mdtid) {
+            // GLPI2MDT does not manage ranks, so keep the existing one if any
+            $ranks = $this->queryOrDie("SELECT Sequence FROM dbo.Settings_Roles WHERE ID=$mdtid AND type='C' AND Role='$key';");
+            if ($this->numrows($ranks) == 0) {
+               $this->queryOrDie("INSERT INTO dbo.Settings_Roles (Type, ID, Sequence, Role)
+                      VALUES ('C', '$mdtid', $value, '$key');");
+            }
          }
       }
    }
@@ -408,18 +427,6 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtempl
       }
       return true;
    }
-   /**
-   * This function is called by GLPI when an update is made to a computer
-   *
-   * @param  GLPI object ID, here a computer
-   * @param  Expire: will only reset "OSInstall flag set to true and coupling mode is not "strict master slave"
-   * @return string type for the cron list page
-   */
-   function update_item(computer $item) {
-      Session::addMessageAfterRedirect("Glpi2mdt after update hook", true);
-      print_f($item);
-      die("Here we are");
-   }
 }
 
 

inc/mdt.class.php

@@ -94,7 +94,7 @@ function __construct() {
 
          // Conection to MSSQL using native MSSQL PHP module available until PHP 5.6
       } else if (extension_loaded('mssql')) {
-         $DBModule = 'mssql';
+         $this->DBModule = 'mssql';
          $DBLink = mssql_connect($DBServer.":".$DBPort, $DBLogin, $DBPassword);
          if ($DBLink) {
             mssql_select_db($DBSchema, $MDT);
@@ -148,11 +148,11 @@ function showTestConnection() {
          $nb = reset($this->fetch_array($result));
          if ($nb > 0) {
             echo "<font color='green'>";
-            echo __(" Schema ", 'glpi2mdt').$dbschema.__(" contains ", 'glpi2mdt').$nb.__(" tables ", 'glpi2mdt');
+            echo __("Schema", 'glpi2mdt')." ".$dbschema." ".__("contains", 'glpi2mdt')." ".$nb." ".__("tables", 'glpi2mdt').".";
             echo "</font><br>";
          } else {
             echo "<h1><font color='red'>";
-            echo __("Could not count tables in schema ", 'glpi2mdt').$this->DBSchema;
+            echo __("Could not count tables in schema", 'glpi2mdt')." ".$this->DBSchema;
             echo "</font></h1><br>";
          }
       } else {

locales/en_US.mo

@@ -18,67 +18,67 @@ msgstr ""
 "Language: en_US\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: inc/mdt.class.php:138
+#: inc/mdt.class.php:137
 msgid "Testing connection using PHP module"
 msgstr ""
 
-#: inc/mdt.class.php:142
+#: inc/mdt.class.php:141
 msgid "Database login OK!"
 msgstr "Database login OK!"
 
-#: inc/mdt.class.php:152
-msgid " Schema "
+#: inc/mdt.class.php:151 inc/config.class.php:140
+msgid "Schema"
 msgstr "Schema"
 
-#: inc/mdt.class.php:152
-msgid " contains "
-msgstr " contains "
+#: inc/mdt.class.php:151
+msgid "contains"
+msgstr ""
 
-#: inc/mdt.class.php:152
-msgid " tables "
-msgstr " tables "
+#: inc/mdt.class.php:151
+msgid "tables"
+msgstr ""
 
-#: inc/mdt.class.php:156
-msgid "Could not count tables in schema "
-msgstr "Could not count tables in schema "
+#: inc/mdt.class.php:155
+msgid "Could not count tables in schema"
+msgstr ""
 
-#: inc/mdt.class.php:162
+#: inc/mdt.class.php:160
 msgid "Database login KO!"
 msgstr "Database login KO!"
 
-#: inc/computer.class.php:58 inc/computer.class.php:61
+#: inc/computer.class.php:58 inc/computer.class.php:60
 msgid "Auto Install"
 msgstr "Auto Install"
 
-#: inc/computer.class.php:317
+#: inc/computer.class.php:340
 msgid "Automatic installation"
 msgstr "Automatic installation"
 
-#: inc/computer.class.php:321
+#: inc/computer.class.php:344
 msgid "Enable automatic installation"
 msgstr "Enable automatic installation"
 
-#: inc/computer.class.php:323 inc/config.class.php:86
+#: inc/computer.class.php:346 inc/config.class.php:86
 msgid "YES"
 msgstr "Yes"
 
-#: inc/computer.class.php:324 inc/config.class.php:87
+#: inc/computer.class.php:347 inc/config.class.php:87
 msgid "NO"
 msgstr "No"
 
-#: inc/computer.class.php:333
+#: inc/computer.class.php:356
 msgid "Reset after (empty for permanent):"
 msgstr "Reset after (empty for permanent):"
 
-#: inc/computer.class.php:343
+#: inc/computer.class.php:366
 msgid "Task sequence"
 msgstr "Task sequence"
 
-#: inc/computer.class.php:372
+#: inc/computer.class.php:395
 msgid "Applications"
 msgstr "Applications"
 
-#: inc/computer.class.php:384
+#: inc/computer.class.php:407
 msgid "Roles"
 msgstr "Roles"
 
@@ -118,10 +118,6 @@ msgstr "Login"
 msgid "Password"
 msgstr "Password"
 
-#: inc/config.class.php:140
-msgid "Schema"
-msgstr "Schema"
-
 #: inc/config.class.php:148
 msgid "Local path to deployment share control directory"
 msgstr "Local path to deployment share control directory"
@@ -194,14 +190,14 @@ msgstr "Features"
 msgid "Setup"
 msgstr "Setup"
 
-#: setup.php:102
+#: setup.php:101
 msgid "Incompatible PHP Installation. Requires module mssql or module odbc"
 msgstr "Incompatible PHP Installation. Requires module mssql or module odbc"
 
-#: setup.php:107
+#: setup.php:106
 msgid "Incompatible PHP Installation. Requires module"
 msgstr "Incompatible PHP Installation. Requires module"
 
-#: setup.php:126
+#: setup.php:125
 msgid "Installed / not configured"
 msgstr "Installed / not configured"