Refactor and enhance code readability across multiple components

- Updated SQL query in `VMs-Backups.php` to include `policy` condition. - Improved formatting and indentation in `StdOut-detail.php`, `StdOut.php`, and `Server-Detail.php`. - Simplified conditional checks and removed redundant spaces for better clarity. - Modified `.idea/sqldialects.xml` file to add new SQL dialect mappings.
2025-06-26 09:44:43 +02:00
parent f1aebef05b
commit b19795f421
5 changed files with 204 additions and 141 deletions
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/X/StdOut.php" dialect="GenericSQL" />
    <file url="file://$PROJECT_DIR$/crossover/GlobalCrossover2.php" dialect="GenericSQL" />
+    <file url="PROJECT" dialect="GenericSQL" />
  </component>
 </project>
--- a/Hyper-V/VMs-Backups.php
+++ b/Hyper-V/VMs-Backups.php
@@ -83,7 +83,7 @@
              <?php
                // NO Backup or Backup with Errors
                $er = 0;
-                $answers = Invoke_infra("SELECT * FROM VMs_Backup where ( Owner like 'DUN-VMH%' or Owner like 'MDK-VMH%' ) and name not like 'WS%' and owner not like '%WKG%' and owner not like '%VMH-WM%' and Exclusion ='' and (LastResult <> 'OK' or lastresult is null) order by lastresult,name");
+                $answers = Invoke_infra("SELECT * FROM VMs_Backup where ( Owner like 'DUN-VMH%' or Owner like 'MDK-VMH%' ) and name not like 'WS%' and owner not like '%WKG%' and owner not like '%VMH-WM%' and Exclusion ='' and (LastResult <> 'OK' or lastresult is null) and policy is not null order by lastresult,name");
                foreach ($answers as $row) {
                  $er++;
                  $date1 = date_create($row['LastKnownGood']); $diff = date_diff($date1, date_create(date("Y-m-d")));
--- a/Inventory/Server-Detail.php
+++ b/Inventory/Server-Detail.php
@@ -95,7 +95,7 @@
          echo "</div></div></body></HTML>";
          exit;
        }
-        if(strpos($Qw[0]['DECOM'],'-') != false || strpos($Qx[0]['Decom'],'-') != false){
+        if(strpos($Qw[0]['DECOM'], '-') || strpos($Qx[0]['Decom'], '-')){
          echo '<h1><span class="badge text-bg-danger font-weight-bold blinking" style="width:100%;">'. strtoupper($server) .' : DECOMMISSIONED !</span></h1>';
          echo '<script src="/js/switch.js"></script>';
          echo "</div></div></body></HTML>";
@@ -124,6 +124,7 @@
                $site = substr($Qx[0]['Owner'],0,3);
              }else{
                echo "&nbsp;<span class='badge rounded-pill bg-success text-light'>Physical</span>";
+                echo "&nbsp;<span class='badge rounded-pill bg-success text-light'>".Invoke_GLPI("select a.name from glpi_computermodels a left join glpi_computers b on a.id = b.computermodels_id where b.name =  '$server'")[0]['name']."</span>";
              }
            }
          ?>
@@ -242,17 +243,17 @@
        <!-- Last boot, last rollup, next rollup -->
        <?php
          if(is_array($Qw)){
-            if(strpos($Qw[0]['zabbix'],'.') != false){
+            if(strpos($Qw[0]['zabbix'], '.')){
              echo "<span class='badge rounded-pill bg-secondary text-light fs-5'>Zabbix : ".$Qw[0]['zabbix']."</span>";
            }else{
              echo "<span class='badge rounded-pill bg-warning text-dark fs-5'>Zabbix : Not Installed</span>";
            }
-            if(strpos($Qw[0]['sentinel'],'.') != false){
+            if(strpos($Qw[0]['sentinel'], '.')){
              echo "&nbsp;<span class='badge rounded-pill bg-secondary text-light fs-5'>SentinelOne : ".$Qw[0]['sentinel']."</span>";
            }else{
              echo "&nbsp;<span class='badge rounded-pill bg-warning text-dark fs-5'>SentinelOne : Not Installed</span>";
            }
-            if(strpos($Qw[0]['zabbix'],'.') != false){
+            if(strpos($Qw[0]['zabbix'], '.')){
              echo "&nbsp;<span class='badge rounded-pill bg-secondary text-light fs-5'>Nessus : ".$Qw[0]['nessus']."</span>";
            }else{
              echo "&nbsp;<span class='badge rounded-pill bg-warning text-dark fs-5'>Nessus : Not Installed</span>";
@@ -260,19 +261,19 @@
          }
          if(is_array($Qx)){
            $a = Invoke_Infra("select * from X_cmdb_Product where HOSTNAME='$server' and Name ='zabbix'");
-            if(is_array($a) && strpos($a[0]['Ver'],'.') != false){
+            if(is_array($a) && strpos($a[0]['Ver'], '.')){
              echo "<span class='badge rounded-pill bg-secondary text-light fs-5'>Zabbix : ".$a[0]['Ver']." - ".$a[0]['State']."</span>";
            }else{
              echo "<span class='badge rounded-pill bg-warning text-dark fs-5'>Zabbix : Not Installed</span>";
            }
            $a = Invoke_Infra("select * from X_cmdb_Product where HOSTNAME='$server' and Name ='s1'");
-            if(is_array($a) && strpos($a[0]['Ver'],'.') != false){
+            if(is_array($a) && strpos($a[0]['Ver'], '.')){
              echo "&nbsp;<span class='badge rounded-pill bg-secondary text-light fs-5'>SentinelOne : ".$a[0]['Ver']." - ".$a[0]['State']."</span>";
            }else{
              echo "&nbsp;<span class='badge rounded-pill bg-warning text-dark fs-5'>SentinelOne : Not Installed</span>";
            }
            $a = Invoke_Infra("select * from X_cmdb_Product where HOSTNAME='$server' and Name ='nessus'");
-            if(is_array($a) && strpos($a[0]['Ver'],'.') != false){
+            if(is_array($a) && strpos($a[0]['Ver'], '.')){
              echo "&nbsp;<span class='badge rounded-pill bg-secondary text-light fs-5'>Nessus : ".$a[0]['Ver']." - ".$a[0]['State']."</span>";
            }else{
              echo "&nbsp;<span class='badge rounded-pill bg-warning text-dark fs-5'>Nessus : Not Installed</span>";
--- a/X/StdOut-detail.php
+++ b/X/StdOut-detail.php
@@ -29,157 +29,217 @@
 </head>

 <body class="bg-light text-dark">
-  <?php include $_SERVER['DOCUMENT_ROOT'] . "/include/all.php"; ?> <!-- Include All -->
-  <?php $script = $_GET['s']; ?>
-  <!-- HTML -->
-  <div class="container-fluid" id="content">
-    <div class="row flex-nowrap">
-      <!-- Left NAVBAR -->
-      <div class="col-auto col-md-2 col-xl-2 px-sm-2 px-0 bg-dark" style="-ms-flex: 0 0 230px;flex: 0 0 230px;">
-        <?php include $_SERVER['DOCUMENT_ROOT'] . "/navbar.html"; ?>
-      </div>
-      <!-- Display -->
-      <div class="col py-3">
-        <!-- Page Title -->
-        <h1><span class="badge text-bg-secondary font-weight-bold" style="width:100%;">Script <b><?php echo $script; ?></b> Details</span></h1>
+<?php include $_SERVER['DOCUMENT_ROOT'] . "/include/all.php"; ?> <!-- Include All -->
+<?php $script = $_GET['s']; ?>
+<!-- HTML -->
+<div class="container-fluid" id="content">
+  <div class="row flex-nowrap">
+    <!-- Left NAVBAR -->
+    <div class="col-auto col-md-2 col-xl-2 px-sm-2 px-0 bg-dark" style="-ms-flex: 0 0 230px;flex: 0 0 230px;">
+      <?php include $_SERVER['DOCUMENT_ROOT'] . "/navbar.html"; ?>
+    </div>
+    <!-- Display -->
+    <div class="col py-3">
+      <!-- Page Title -->
+      <h1><span class="badge text-bg-secondary font-weight-bold"
+                style="width:100%;">Script <b><?php echo $script; ?></b> Details</span></h1>

-        <!-- Main content -->
-        <div class="container-fluid">
-          <!-- MODAL WAIT -->
-          <div class="modal fade bs-example-modal-sm" id="wait" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" style="padding-top: 15%;">
-            <div class="modal-dialog modal-sm">
-              <div class="modal-content">
-                  <div class="modal-header">
-                    <h4 class="modal-title mb-1 text-dark text-uppercase">
-                      <center><i class="bi bi-hourglass-split"></i><br> Work in progress ...</center>
-                    </h4>
-                  </div>
-                  <div class="modal-body">
-                    <div class="progress">
-                        <div class="progress-bar progress-bar-secondary progress-bar-striped progress-bar-animated" style="width: 100%"></div>
-                    </div>
-                  </div>
+      <!-- Main content -->
+      <div class="container-fluid">
+        <!-- MODAL WAIT -->
+        <div class="modal fade bs-example-modal-sm" id="wait" tabindex="-1" role="dialog" aria-hidden="true"
+             data-backdrop="static" style="padding-top: 15%;">
+          <div class="modal-dialog modal-sm">
+            <div class="modal-content">
+              <div class="modal-header">
+                <h4 class="modal-title mb-1 text-dark text-uppercase text-center" style="font-size: 1.2rem;">
+                  <i class="bi bi-hourglass-split"></i><br> Work in progress ...
+                </h4>
+              </div>
+              <div class="modal-body">
+                <div class="progress">
+                  <div class="progress-bar progress-bar-secondary progress-bar-striped progress-bar-animated"
+                       style="width: 100%"></div>
+                </div>
              </div>
            </div>
          </div>
-          <!-- TABLE -->
-          <div>
-            <?php  // DATA 
-              $aix=$linux=$dun=$azt=$other="Checked";
-              $where = " and OS_TYPE IN (";
-              if (isset($_GET['AIX'])) {if ($_GET['AIX'] == 1) {$aix = "Checked"; $where .= "'AIX',";} else {$aix = "Unchecked";}} else {$aix = "Unchecked";}
-              if (isset($_GET['linux'])) {if ($_GET['linux'] == 1) {$linux = "Checked"; $where .= "'LINUX',";} else {$linux = "Unchecked";}} else {$linux = "Unchecked";}
-              $where = rtrim($where,',').")";
-              $site = "";
-              if (isset($_GET['DUN'])) {if ($_GET['DUN'] == 1) {$dun = "Checked"; $site .= " or UPPER(HOSTNAME) like 'DUN%' or UPPER(HOSTNAME) like 'DMV%' or UPPER(HOSTNAME) like 'MDK%' or UPPER(HOSTNAME) like 'APPQPC%'";} else {$dun = "Unchecked";}} else {$dun = "Unchecked";}
-              if (isset($_GET['AZT'])) {if ($_GET['AZT'] == 1) {$azt = "Checked"; $site .=" or UPPER(HOSTNAME) like 'AZT%'";} else {$azt = "Unchecked";}} else {$azt = "Unchecked";}
-              if (isset($_GET['other'])) {if ($_GET['other'] == 1) {$other = "Checked"; $site .=" or UPPER(HOSTNAME) like 'BAD%' or UPPER(HOSTNAME) like 'FLO%' or UPPER(HOSTNAME) like 'MON%'";} else {$other = "Unchecked";}} else {$other = "Unchecked";}
-              $site = " and (".ltrim($site,' or').") ";
-              $where .= $site ;
+        </div>
+        <!-- TABLE -->
+        <div>
+          <?php // DATA
+          $aix = $linux = $dun = $azt = $other = "Checked";
+          $where = " and OS_TYPE IN (";
+          if (isset($_GET['AIX'])) {
+            if ($_GET['AIX'] == 1) {
+              $where .= "'AIX',";
+            } else {
+              $aix = "Unchecked";
+            }
+          } else {
+            $aix = "Unchecked";
+          }
+          if (isset($_GET['linux'])) {
+            if ($_GET['linux'] == 1) {
+              $where .= "'LINUX',";
+            } else {
+              $linux = "Unchecked";
+            }
+          } else {
+            $linux = "Unchecked";
+          }
+          $where = rtrim($where, ',') . ")";
+          $site = "";
+          if (isset($_GET['DUN'])) {
+            if ($_GET['DUN'] == 1) {
+              $site .= " or UPPER(HOSTNAME) like 'DUN%' or UPPER(HOSTNAME) like 'DMV%' or UPPER(HOSTNAME) like 'MDK%' or UPPER(HOSTNAME) like 'APPQPC%'";
+            } else {
+              $dun = "Unchecked";
+            }
+          } else {
+            $dun = "Unchecked";
+          }
+          if (isset($_GET['AZT'])) {
+            if ($_GET['AZT'] == 1) {
+              $site .= " or UPPER(HOSTNAME) like 'AZT%'";
+            } else {
+              $azt = "Unchecked";
+            }
+          } else {
+            $azt = "Unchecked";
+          }
+          if (isset($_GET['other'])) {
+            if ($_GET['other'] == 1) {
+              $site .= " or UPPER(HOSTNAME) like 'BAD%' or UPPER(HOSTNAME) like 'FLO%' or UPPER(HOSTNAME) like 'MON%'";
+            } else {
+              $other = "Unchecked";
+            }
+          } else {
+            $other = "Unchecked";
+          }
+          $site = " and (" . ltrim($site, ' or') . ") ";
+          $where .= $site;

-              $sql = "select hostname, os_type from srvall where decomtime is null and (ucase(filter) not like 'X_%' or filter is null) $where order by hostname";
-              $hosts = Invoke_aixcmdb($sql);
+          $sql = "select hostname, os_type from srvall where decomtime is null and (ucase(filter) not like 'X_%' or filter is null) $where order by hostname";
+          $hosts = Invoke_aixcmdb($sql);

-              $taix=$aixok=$aixko=$tlinux=$linuxok=$linuxko=0;
-              #print_r($hosts);
-            ?>
-            <form class="row">
-              <div class="col border rounded">
-                <b>Filters : </b>
-                <div class="form-check form-check-inline form-switch">
-                  <input class="form-check-input" type="checkbox" role="switch" id="AIX" <?php echo $aix; ?>
-                    name="AIX" value="1">
-                  <label class="form-check-label" for="None">AIX</label>
-                </div>
-                &nbsp;
-                <div class="form-check form-check-inline form-switch">
-                  <input class="form-check-input" type="checkbox" role="switch" id="linux" <?php echo $linux; ?>
-                    name="linux" value="1">
-                  <label class="form-check-label" for="Manu">Linux</label>
-                </div>
-                &nbsp; | &nbsp;
-                <div class="form-check form-check-inline form-switch">
-                  <input class="form-check-input" type="checkbox" role="switch" id="DUN" <?php echo $dun; ?>
-                    name="DUN" value="1">
-                  <label class="form-check-label" for="Done">DMV/DUN/MDK</label>
-                </div>
-                &nbsp;
-                <div class="form-check form-check-inline form-switch">
-                  <input class="form-check-input" type="checkbox" role="switch" id="AZT" <?php echo $azt; ?>
-                    name="AZT" value="1">
-                  <label class="form-check-label" for="Done">Azure</label>
-                </div>
-                &nbsp;
-                <div class="form-check form-check-inline form-switch">
-                  <input class="form-check-input" type="checkbox" role="switch" id="other" <?php echo $other; ?>
-                    name="other" value="1">
-                  <label class="form-check-label" for="Done">Other</label>
-                </div>
-                <input type="hidden" name="s" value="<?php echo $script; ?>">
-                <button type="submit" class="btn btn-success btn-small mb-2 mt-2">Apply</button>
+          $taix = $aixok = $aixko = $tlinux = $linuxok = $linuxko = 0;
+          #print_r($hosts);
+          ?>
+          <form class="row">
+            <div class="col border rounded">
+              <b>Filters : </b>
+              <div class="form-check form-check-inline form-switch">
+                <input class="form-check-input" type="checkbox" role="switch" id="AIX" <?php echo $aix; ?>
+                       name="AIX" value="1">
+                <label class="form-check-label" for="AIX">AIX</label>
              </div>
-            </form>
+              &nbsp;
+              <div class="form-check form-check-inline form-switch">
+                <input class="form-check-input" type="checkbox" role="switch" id="linux" <?php echo $linux; ?>
+                       name="linux" value="1">
+                <label class="form-check-label" for="linux">Linux</label>
+              </div>
+              &nbsp; | &nbsp;
+              <div class="form-check form-check-inline form-switch">
+                <input class="form-check-input" type="checkbox" role="switch" id="DUN" <?php echo $dun; ?>
+                       name="DUN" value="1">
+                <label class="form-check-label" for="DUN">DMV/DUN/MDK</label>
+              </div>
+              &nbsp;
+              <div class="form-check form-check-inline form-switch">
+                <input class="form-check-input" type="checkbox" role="switch" id="AZT" <?php echo $azt; ?>
+                       name="AZT" value="1">
+                <label class="form-check-label" for="AZT">Azure</label>
+              </div>
+              &nbsp;
+              <div class="form-check form-check-inline form-switch">
+                <input class="form-check-input" type="checkbox" role="switch" id="other" <?php echo $other; ?>
+                       name="other" value="1">
+                <label class="form-check-label" for="other">Other</label>
+              </div>
+              <input type="hidden" name="s" value="<?php echo $script; ?>">
+              <button type="submit" class="btn btn-success btn-small mb-2 mt-2">Apply</button>
+            </div>
+          </form>


-            
-            
-            <table class='table table-bordered table-hover table-sm' id='t1' data-height="620" data-toggle="table" data-search="true" data-show-columns="true" data-export-types="['xlsx','csv','json']" data-show-export="true" data-sortable="true" data-sort-name="vm">
+          <table class='table table-bordered table-hover table-sm' id='t1' data-height="620" data-toggle="table"
+                 data-search="true" data-show-columns="true" data-export-types="['xlsx','csv','json']"
+                 data-show-export="true" data-sortable="true" data-sort-name="vm">
            <thead> <!-- Header -->
-              <th data-field='host' data-sortable='true'>Host</th>   
-              <th data-field='OS' data-sortable='true'>OS</th>
-              <th data-field='TimeStamp' data-sortable='true'>TimeStamp</th>
-              <th data-field='RC' data-sortable='true'>RC</th>
-              <th data-field='Result' data-sortable='true'>StdOut</th>
+            <th data-field='host' data-sortable='true'>Host</th>
+            <th data-field='OS' data-sortable='true'>OS</th>
+            <th data-field='TimeStamp' data-sortable='true'>TimeStamp</th>
+            <th data-field='RC' data-sortable='true'>RC</th>
+            <th data-field='Result' data-sortable='true'>StdOut</th>
            </thead>

            <tbody> <!-- Body -->
-              <?php  
-                foreach($hosts as $h){
-                  $host = strtoupper($h['HOSTNAME']);
-                  $os = strtoupper($h['OS_TYPE']);
-                  if(strtoupper($h['OS_TYPE']) == "AIX"){$taix++;}else{$tlinux++;}
-                  $answer = Invoke_infra("SELECT * FROM x_stdout where cmd ='$script' and host ='$host'");
-                  if(is_array($answer)){
-                    $rc = $answer[0]['rc'];
-                    $stdout = $answer[0]['stdout'];
-                    $ts = $answer[0]['ts'];
-                    if(strtoupper($h['OS_TYPE']) == "AIX"){
-                      if($rc == 0 && (string)$rc <> ""){$aixok++;}else{if((string)$rc <> ""){$aixko++;}}
-                    }else{
-                      if($rc == 0 && (string)$rc <> ""){$linuxok++;}else{if((string)$rc <> ""){$linuxko++;}}
-                    }
-                  }else{
-                    $rc=$stdout=$ts="";
-                  }
-                  echo "<tr><td><b>$host</b></td>";
-                  echo "<td>$os</td>";
-                  echo "<td>".$ts."</td>";
-                  if($rc == 0 && (string)$rc <> ""){
-                    echo "<td class='table-success'>".$rc."</td>";
-                  }else{
-                    if((string)$rc <> ""){
-                      echo "<td class='table-danger'>".(string)$rc."</td>";
-                    }else{
-                      echo "<td></td>";
+            <?php
+            foreach ($hosts as $h) {
+              $host = strtoupper($h['HOSTNAME']);
+              $os = strtoupper($h['OS_TYPE']);
+              if (strtoupper($h['OS_TYPE']) == "AIX") {
+                $taix++;
+              } else {
+                $tlinux++;
+              }
+              $answer = Invoke_infra("SELECT * FROM x_stdout where cmd ='$script' and host ='$host'");
+              if (is_array($answer)) {
+                $rc = $answer[0]['rc'];
+                $stdout = $answer[0]['stdout'];
+                $ts = $answer[0]['ts'];
+                if (strtoupper($h['OS_TYPE']) == "AIX") {
+                  if ($rc == 0 && (string)$rc <> "") {
+                    $aixok++;
+                  } else {
+                    if ((string)$rc <> "") {
+                      $aixko++;
+                    }
+                  }
+                } else {
+                  if ($rc == 0 && (string)$rc <> "") {
+                    $linuxok++;
+                  } else {
+                    if ((string)$rc <> "") {
+                      $linuxko++;
                    }
                  }
-                  echo "<td>".$stdout."</td></tr>";
                }
-              ?>
+              } else {
+                $rc = $stdout = $ts = "";
+              }
+              echo "<tr><td><b>$host</b></td>";
+              echo "<td>$os</td>";
+              echo "<td>" . $ts . "</td>";
+              if ($rc == 0 && (string)$rc <> "") {
+                echo "<td class='table-success'>" . $rc . "</td>";
+              } else {
+                if ((string)$rc <> "") {
+                  echo "<td class='table-danger'>" . $rc . "</td>";
+                } else {
+                  echo "<td></td>";
+                }
+              }
+              echo "<td>" . $stdout . "</td></tr>";
+            }
+            ?>
            </tbody>
            <br>
            <?php
-              $aixNO = $taix-$aixok-$aixko; $linuxNO=$tlinux-$linuxok-$linuxko;
+            $aixNO = $taix - $aixok - $aixko;
+            $linuxNO = $tlinux - $linuxok - $linuxko;
            echo "<div class='row'><div class='col text-center h4'><b>$taix AIX : </b>";
-              echo "<span class='badge bg-success'>$aixok</span>&nbsp;<span class='badge bg-danger'>$aixko</span>&nbsp;<span class='badge bg-secondary'>$aixNO</span></div>"; 
+            echo "<span class='badge bg-success'>$aixok</span>&nbsp;<span class='badge bg-danger'>$aixko</span>&nbsp;<span class='badge bg-secondary'>$aixNO</span></div>";
            echo "<div class='col text-center h4'><b>$tlinux Linux : </b>";
-              echo "<span class='badge bg-success'>$linuxok</span>&nbsp;<span class='badge bg-danger'>$linuxko</span>&nbsp;<span class='badge bg-secondary'>$linuxNO</span></div></div> "; ?>
-          </div>
+            echo "<span class='badge bg-success'>$linuxok</span>&nbsp;<span class='badge bg-danger'>$linuxko</span>&nbsp;<span class='badge bg-secondary'>$linuxNO</span></div></div> "; ?>
        </div>
-        <!-- End of main content -->
      </div>
+      <!-- End of main content -->
    </div>
  </div>
+</div>
 </body>
 <script src="/js/switch.js"></script>
 </HTML>
--- a/X/StdOut.php
+++ b/X/StdOut.php
@@ -49,8 +49,8 @@
            <div class="modal-dialog modal-sm">
              <div class="modal-content">
                  <div class="modal-header">
-                    <h4 class="modal-title mb-1 text-dark text-uppercase">
-                      <center><i class="bi bi-hourglass-split"></i><br> Work in progress ...</center>
+                    <h4 class="modal-title mb-1 text-dark text-uppercase text-center" style="font-size: 1.5rem;">
+                      <i class="bi bi-hourglass-split"></i><br> Work in progress ...
                    </h4>
                  </div>
                  <div class="modal-body">