fix #5 - manage ampersand in XML

pluginsGLPI · Jul 17, 2015 · c6eb200 · c6eb200
1 parent 7bfbddf
commit c6eb200
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/inc/sccmxml.class.php b/inc/sccmxml.class.php
@@ -43,9 +43,13 @@ class PluginSccmSccmxml {
    var $username;
 
    function PluginSccmSccmxml($data) {
+
+      $plug = new Plugin();
+      $plug->getFromDBbyDir("sccm");
+
       $this->data = $data;
       $this->device_id = $data['MD-SystemName']."_".$data['CSD-MachineID'];
-      $this->agentbuildnumber = "SCCM-v1";
+      $this->agentbuildnumber = "SCCM-v".$plug->fields['version'];
 
 $SXML=<<<XML
 <?xml version='1.0' encoding='UTF-8'?>
@@ -184,7 +188,15 @@ function setSoftwares() {
          $CONTENT->addChild('SOFTWARES');
          $SOFTWARES = $this->sxml->CONTENT[0]->SOFTWARES[$i];
 
-         $SOFTWARES->addChild('NAME'               ,$value['ArPd-DisplayName']);
+         if (preg_match("#&#", $value['ArPd-DisplayName']) ) {
+            $value['ArPd-DisplayName'] = preg_replace("#&#","&amp;", $value['ArPd-DisplayName']);
+         }
+
+         if (preg_match("#&#", $value['ArPd-Publisher']) ) {
+            $value['ArPd-Publisher'] = preg_replace("#&#","&amp;", $value['ArPd-Publisher']);
+         }
+
+         $SOFTWARES->addChild('NAME' ,$value['ArPd-DisplayName']);
 
          if(isset($value['ArPd-Version'])) {
             $SOFTWARES->addChild('VERSION' ,$value['ArPd-Version']);

diff --git a/setup.php b/setup.php
@@ -49,7 +49,7 @@ function plugin_init_sccm() {
 
 function plugin_version_sccm() {
 
-   return array('name'           => __("Interface - SCCM", "sccm"),
+   return array('name'          => __("Interface - SCCM", "sccm"),
                'version'        => '0.85-1.0Beta1',
                'author'         => 'TECLIB\'',
                'license'        => 'GPLv2+',