fix: review changes

Author: tolemac

front/config.form.php

@@ -51,9 +51,9 @@
    Html::redirect(PluginSccmConfig::searchUrl());
 } else if (isset($_POST["add"])) {
    if ($PluginSccmConfig->add($_POST)) {
-       if ($_SESSION['glpibackcreated']) {
-           Html::redirect($track->getLinkURL());
-       }
+      if ($_SESSION['glpibackcreated']) {
+          Html::redirect($track->getLinkURL());
+      }
    }
    Html::back();
 } else if (isset($_POST["purge"])) {

front/test.php

@@ -94,7 +94,7 @@
 function viewList() {
    global $PluginSccmSccm;
 
-   $PluginSccmSccm->getDevices();
+   $PluginSccmSccm->getDevices("");
 
    echo "<table class='tab_glpi'>";
    foreach ($PluginSccmSccm->devices as $device_values) {
@@ -106,7 +106,7 @@ function viewList() {
 function nbPcToInject() {
    global $PluginSccmSccm;
 
-   $PluginSccmSccm->getDevices();
+   $PluginSccmSccm->getDevices("");
 
    echo count($PluginSccmSccm->devices);
 }
@@ -117,7 +117,7 @@ function testViewHtml($limit, $where) {
    $PluginSccmSccm->getDevices($where);
 
    foreach ($PluginSccmSccm->devices as $device_values) {
-      $PluginSccmSccmxml = new PluginSccmSccmxml($device_values);
+      $PluginSccmSccmxml = new PluginSccmSccmxml($PluginSccmSccm, $device_values);
 
       $PluginSccmSccmxml->setAccessLog();
       $PluginSccmSccmxml->setAccountInfos();
@@ -128,7 +128,7 @@ function testViewHtml($limit, $where) {
       $PluginSccmSccmxml->setSoftwares();
       $PluginSccmSccmxml->setUsers();
       $PluginSccmSccmxml->setNetworks();
-      $PluginSccmSccmxml->setDrives();
+      $PluginSccmSccmxml->setStorages();
 
       $SXML = $PluginSccmSccmxml->sxml;
 
@@ -144,7 +144,7 @@ function testAdd($where) {
    $REP_XML = GLPI_PLUGIN_DOC_DIR.'/sccm/xml/';
 
    foreach ($PluginSccmSccm->devices as $device_values) {
-      $PluginSccmSccmxml = new PluginSccmSccmxml($device_values);
+      $PluginSccmSccmxml = new PluginSccmSccmxml($PluginSccmSccm, $device_values);
 
       $PluginSccmSccmxml->setAccessLog();
       $PluginSccmSccmxml->setAccountInfos();
@@ -155,7 +155,7 @@ function testAdd($where) {
       $PluginSccmSccmxml->setSoftwares();
       $PluginSccmSccmxml->setUsers();
       $PluginSccmSccmxml->setNetworks();
-      $PluginSccmSccmxml->setDrives();
+      $PluginSccmSccmxml->setStorages();
 
       $SXML = $PluginSccmSccmxml->sxml;
 

inc/config.class.php

@@ -190,7 +190,7 @@ static function install(Migration $migration) {
 
          $query = "CREATE TABLE `". $table."`(
                      `id` int {$default_key_sign} NOT NULL AUTO_INCREMENT,
-                     `sccm_config_name` VARCHAR(255) NULL,                     
+                     `sccm_config_name` VARCHAR(255) NULL,
                      `sccmdb_host` VARCHAR(255) NULL,
                      `sccmdb_dbname` VARCHAR(255) NULL,
                      `sccmdb_user` VARCHAR(255) NULL,
@@ -227,7 +227,7 @@ static function install(Migration $migration) {
          {
             Toolbox::logInFile('sccm', "Changing to Auto increment ... \n", true);
             $migration->changeField("glpi_plugin_sccm_configs", "id", "id", "autoincrement");
-            $migration->migrationOneTable('glpi_plugin_sccm_configs');            
+            $migration->migrationOneTable('glpi_plugin_sccm_configs');
          }
          if (!$DB->fieldExists($table, 'sccm_config_name')) {
             $migration->addField("glpi_plugin_sccm_configs", "sccm_config_name", "VARCHAR(255)");
@@ -286,8 +286,8 @@ static function install(Migration $migration) {
                         ]
                         )
                      );
-               }   
-            }            
+               }
+            }
             $migration->addField("glpi_plugin_sccm_configs", "is_password_sodium_encrypted", "tinyint NOT NULL default '1'");
             $migration->migrationOneTable('glpi_plugin_sccm_configs');
          }
@@ -335,8 +335,7 @@ static function install(Migration $migration) {
 
    static function uninstall() {
       global $DB;
-
-      Toolbox::logInFile('sccm', "Uninstalling ...\n", true);
+      
       if ($DB->tableExists('glpi_plugin_sccm_configs')) {
 
          $query = "DROP TABLE `glpi_plugin_sccm_configs`";
@@ -345,32 +344,11 @@ static function uninstall() {
       return true;
    }
 
-   static function configUrl() {      
+   static function searchUrl() {
       global $CFG_GLPI;
       return $CFG_GLPI['url_base'] . "/plugins/sccm/front/config.php";;
    }
 
-   static function searchUrl() {      
-      global $CFG_GLPI;
-      return $CFG_GLPI['url_base'] . "/plugins/sccm/front/config.php";;
-   }
-
-   static function showConfigList() {
-      global $DB;
-
-      $configUrl = self::configUrl();
-
-      echo "<p>SCCM Configuration list: </p>";
-      echo "<ul>";
-
-      $configs = $DB->query("select * from glpi_plugin_sccm_configs");
-      while ($data = $configs->fetch_assoc()) {
-         echo "   <li> <a href='" . $configUrl . "?id=" . $data['id'] . "'>".$data['sccm_config_name']."</a>";
-      }
-      echo "   <li> <a href='" . $configUrl . "?id=-1'>Add new ...</a>";
-      echo "</ul>";
-   }
-
    function defineTabs($options = []) {
 
       $ong = [];
@@ -479,7 +457,7 @@ function showForm($ID, $options = []) {
    }
 
    static function canPurge() {
-      return true;
+      return Session::haveRight('config', UPDATE);
    }
 
 }

inc/sccmdb.class.php

@@ -38,13 +38,11 @@ class PluginSccmSccmdb {
    var $dbconn;
 
    function testConfiguration($id) {
-      if ($this->connect($id)) {
-         Toolbox::logInFile('sccm', "Success connecting to new configuration ".$_POST['sccm_config_name']." ...\n", true);
-         Session::addMessageAfterRedirect("Connexion réussie !.", false, INFO, false);
+      if ($this->connect($id)) {         
+         Session::addMessageAfterRedirect(__("Connection successfull!", 'sccm'), false, INFO, false);
          $this->disconnect();
-      } else {
-         Toolbox::logInFile('sccm', "Error connecting to new configuration ".$_POST['sccm_config_name']." ...\n", true);
-         Session::addMessageAfterRedirect("Connexion incorrecte.", false, ERROR, false);   
+      } else {         
+         Session::addMessageAfterRedirect(__("Connection failed!", 'sccm'), false, ERROR, false);
       }   
    }