* Mon May 12 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme

- Adding SM2 panel [SME: 13004] - Upgrade to phpsysinfo 3.4.4 - Add code to delete inline styles and add css to make it look better. - version saved / built uses the static version, which means no drops downs and choices.
2025-05-14 16:14:01 +01:00
parent 80b1da5fa5
commit c8ce77259d
952 changed files with 51341 additions and 28699 deletions
--- a/root/opt/phpsysinfo/plugins/smart/js/smart.js
+++ b/root/opt/phpsysinfo/plugins/smart/js/smart.js
@@ -33,20 +33,35 @@ var smart_show = false, smart_table;
 * fill the plugin block with table structure
 */
 function smart_buildTable(xml) {
-    var html = "";
+    var html = "", hostname = "";
+    var smartid;
+    var attribute_name;

-    html += "<table id=\"Plugin_SMARTTable\" style=\"border-spacing:0;\">\n";
-    html += "  <thead>\n";
-    html += "    <tr>\n";
-    html += "      <th class=\"right\">" + genlang(3, false, "SMART") + "</th>\n";
+    hostname = $("Plugins Plugin_SMART", xml).attr('Hostname');
+    if (hostname !== undefined) {
+        $('span[class=Hostname_SMART]').html(hostname);
+    }
+
+    html += "<div style=\"overflow-x:auto;\">\n";
+    html += "  <table id=\"Plugin_SMARTTable\" style=\"border-collapse:collapse;\">\n";
+    html += "    <thead>\n";
+    html += "      <tr>\n";
+    html += "        <th class=\"right\">" + genlang(2, "SMART") + "</th>\n";
    $("Plugins Plugin_SMART columns column", xml).each(function smart_table_header() {
-        html += "      <th class=\"right\">" + genlang(100 + parseInt($(this).attr("id"), 10), false, "SMART") + "</th>\n";
+        attribute_name = $(this).attr("attribute_name");
+        if (typeof attribute_name === 'string')
+            attribute_name = attribute_name.replace(/_/g, " ").replace(/;/g, "<br>");
+        else
+            attribute_name = "Attribute " + $(this).attr("id");
+
+        html += "        <th class=\"right\">" + attribute_name + "</th>\n";
    });
-    html += "    </tr>\n";
-    html += "  </thead>\n";
-    html += "  <tbody>\n";
-    html += "  </tbody>\n";
-    html += "</table>\n";
+    html += "      </tr>\n";
+    html += "    </thead>\n";
+    html += "    <tbody>\n";
+    html += "    </tbody>\n";
+    html += "  </table>\n";
+    html += "</div>\n";

    $("#Plugin_SMART").append(html);

@@ -67,33 +82,36 @@ function smart_buildTable(xml) {
 * @param {jQuery} xml plugin-XML
 */
 function smart_populate(xml) {
-    var name = "", columns = [];
+    var name = "", event = "", columns = [];
    smart_table.fnClearTable();

    // Get datas that the user want to be displayed
    $("Plugins Plugin_SMART columns column", xml).each(function smart_find_columns() {
        columns[parseInt($(this).attr("id"), 10)] = $(this).attr("name");
+        smart_show = true;
    });

    // Now we add selected datas in the table
    $("Plugins Plugin_SMART disks disk", xml).each(function smart_fill_table() {
        var values = [], display = [], i;
-        name = $(this).attr("name");
+        name = $(this).attr("name").replace(/\)/g, ")<wbr>");
        $(this).find("attribute").each(function smart_fill_data() {
            if (columns[parseInt($(this).attr("id"), 10)] && columns[parseInt($(this).attr("id"), 10)] !== "") {
                values[parseInt($(this).attr("id"), 10)] = $(this).attr(columns[parseInt($(this).attr("id"), 10)]);
            }
        });

-        display.push("<span style=\"display:none;\">" + name + "</span>" + name);
+        event = $(this).attr("event");
+        if (event !== undefined)
+            display.push("<span style=\"display:none;\">" + name + "</span><table style=\"width:0;float:right;*float:right;border-spacing:0;\"><tbody><tr><td style=\"padding:0;\">" + name +" </td><td style=\"padding:0;\"><img style=\"vertical-align:middle;width:16px;\" src=\"./gfx/attention.gif\" alt=\"!\" title=\""+event+"\"/></td></tr></tbody></table>");
+        else
+            display.push("<span style=\"display:none;\">" + name + "</span>" + name);

        // On "columns" so we get the right order
        // fixed for Firefox (fix wrong order)
-//      for (i in columns) {
        $("Plugins Plugin_SMART columns column", xml).each(function smart_find_columns() {
            i  = parseInt($(this).attr("id"), 10);
            if (typeof(values[i])==='undefined') {
-//                values[i] = "";
                display.push("<span style=\"display:none;\"></span>");
            }
            else if (i === 194) {
@@ -102,38 +120,16 @@ function smart_populate(xml) {
            else {
                display.push("<span style=\"display:none;\">" + values[i] + "</span>" + values[i]);
            }
-//          }
        });
        smart_table.fnAddData(display);
    });
-    smart_show = true;
-}
-
-/**
- * load the xml via ajax
- */
-function smart_initTable() {
-    $.ajax({
-        url: "xml.php?plugin=SMART",
-        dataType: "xml",
-        error: function smart_error() {
-        $.jGrowl("Error loading XML document for Plugin SMART");
-    },
-    success: function smart_initBlock(xml) {
-        smart_buildTable(xml);
-        smart_populate(xml);
-        if (smart_show) {
-            plugin_translate("SMART");
-            $("#Plugin_SMART").show();
-        }
-    }
-    });
 }

 /**
 * load the xml via ajax
 */
 function smart_request() {
+    $("#Reload_SMARTTable").attr("title", "reload");
    $.ajax({
        url: "xml.php?plugin=SMART",
        dataType: "xml",
@@ -142,6 +138,9 @@ function smart_request() {
        },
        success: function smart_buildBlock(xml) {
            populateErrors(xml);
+            if ((smart_table === undefined) || (typeof(smart_table) !== "object")) {
+                smart_buildTable(xml);
+            }
            smart_populate(xml);
            if (smart_show) {
                plugin_translate("SMART");
@@ -152,15 +151,13 @@ function smart_request() {
 }

 $(document).ready(function smart_buildpage() {
-    var html = "";
-
    $("#footer").before(buildBlock("SMART", 1, true));
-    $("#Plugin_SMART").css("width", "915px");
+    $("#Plugin_SMART").addClass("fullsize");

-    smart_initTable();
+    smart_request();

    $("#Reload_SMARTTable").click(function smart_reload(id) {
        smart_request();
-        $("#Reload_SMARTTable").attr("title",datetime());
+        $(this).attr("title", datetime());
    });
 });
--- a/root/opt/phpsysinfo/plugins/smart/js/smart_bootstrap.js
+++ b/root/opt/phpsysinfo/plugins/smart/js/smart_bootstrap.js
@@ -1,76 +1,58 @@
 function renderPlugin_smart(data) {

-    if ((data['Plugins']['Plugin_SMART'] !== undefined) && (data['Plugins']['Plugin_SMART']["columns"] !== undefined) && (items(data['Plugins']['Plugin_SMART']["columns"]["column"]).length > 0)
-            && (data['Plugins']['Plugin_SMART']["disks"] !== undefined) && (items(data['Plugins']['Plugin_SMART']["disks"]["disk"]).length > 0)) {
-        var smartitems = items(data['Plugins']['Plugin_SMART']["columns"]["column"]);
-        var smartnames = {
-            1:"Raw Read Error Rate",
-            2:"Throughput Performance",
-            3:"Spin Up Time",
-            4:"Start Stop Count",
-            5:"Reallocated Sector Ct",
-            7:"Seek Error Rate",
-            8:"Seek Time Performance",
-            9:"Power On Hours",
-            10:"Spin Retry Count",
-            11:"Calibration Retry Count",
-            12:"Power Cycle Count",
-            190:"Airflow Temperature",
-            191:"G-sense Error Rate",
-            192:"Power-Off Retract Count",
-            193:"Load Cycle Count",
-            194:"Temperature",
-            195:"Hardware ECC Recovered",
-            196:"Reallocated Event Count",
-            197:"Current Pending Sector",
-            198:"Offline Uncorr.",
-            199:"UDMA CRC Error Count",
-            200:"Multi Zone Error Rate",
-            201:"Soft Read Error Rate",
-            202:"Data Address Mark Errors",
-            223:"Load Retry Count",
-            225:"Load Cycle Count"};
-        
+    if ((data.Plugins.Plugin_SMART !== undefined) && (data.Plugins.Plugin_SMART.columns !== undefined) && (items(data.Plugins.Plugin_SMART.columns.column).length > 0) && (data.Plugins.Plugin_SMART.disks !== undefined) && (items(data.Plugins.Plugin_SMART.disks.disk).length > 0)) {
+        var smartitems = items(data.Plugins.Plugin_SMART.columns.column);
        var html = '';
+        var i,j;
+        var smartid;
+        var attribute_name;

        html+="<thead>";
        html+="<tr>";
-        html+="<th id=\"smart_name\" class=\"rightCell\">Name</th>";
+        html+="<th id=\"smart_name\" class=\"rightCell\">"+genlang(2, 'smart')+"</th>"; // Name
        for (i = 0; i < smartitems.length ; i++) {
-            smartid = smartitems[i]["@attributes"]["id"];
-            if (smartnames[smartid] !== undefined) {
-                html+="<th class=\"sorttable_numeric rightCell\">"+ smartnames[smartid] + "</th>";
-            } else {
-                html+="<th class=\"sorttable_numeric rightCell\">"+ smartid + "</th>";
-            }
+            attribute_name = smartitems[i]["@attributes"].attribute_name;
+            if (typeof attribute_name === 'string')
+                attribute_name = attribute_name.replace(/_/g, " ").replace(/;/g, "<br>");
+            else
+                attribute_name = "Attribute " + smartitems[i]["@attributes"].id;
+
+            html+="<th class=\"sorttable_numeric rightCell\">"+ attribute_name + "</th>";
        }
        html+="</tr>";
        html+="</thead>";

-        var diskitems = items(data['Plugins']['Plugin_SMART']["disks"]["disk"]);
+        var diskitems = items(data.Plugins.Plugin_SMART.disks.disk);
        html += '<tbody>';
        for (i = 0; i < diskitems.length; i++) {
            html += '<tr>';
-            html += '<th class="rightCell">'+ diskitems[i]["@attributes"]["name"] + '</th>';
-            attribitems = items(diskitems[i]["attribute"]);
+            if (diskitems[i]["@attributes"].event !== undefined)
+                html += '<th class="rightCell"><table class="borderless table-hover table-nopadding" style="float:right;"><tbody><tr><td>'+ diskitems[i]["@attributes"].name + ' </td><td><img style="vertical-align:middle;width:20px;" src="./gfx/attention.gif" alt="!" title="' + diskitems[i]["@attributes"].event + '"/></td></tr></tbody></table></th>';
+            else
+                html += '<th class="rightCell">'+ diskitems[i]["@attributes"].name + '</th>';
+            var attribitems = items(diskitems[i].attribute);
            var valarray = [];
            for (j = 0;j < attribitems.length; j++) {
-                valarray[attribitems[j]["@attributes"]["id"]] = attribitems[j]["@attributes"]["raw_value"];
+                valarray[attribitems[j]["@attributes"].id] = attribitems[j]["@attributes"];
            }
            for (j = 0; j < smartitems.length; j++) {
-                var smartid = smartitems[j]["@attributes"]["id"];
-                var itemvalue = valarray[smartid];
-                if ((itemvalue !== undefined) && (itemvalue !== '' )) {
-                    if (smartid === "194") {
-                        html += '<td class="rightCell">' + formatTemp(itemvalue, data["Options"]["@attributes"]["tempFormat"]) + '</td>';
+                smartid = smartitems[j]["@attributes"].id;
+                if ((smartid !== undefined) && (valarray[smartid] !== undefined)) {
+                    var itemvalue = valarray[smartid][smartitems[j]["@attributes"].name];
+                    if ((itemvalue !== undefined) && (itemvalue !== '' )) {
+                        if (smartid === "194") {
+                            html += '<td class="rightCell">' + formatTemp(itemvalue, data.Options["@attributes"].tempFormat) + '</td>';
+                        } else {
+                            html += '<td class="rightCell">' + itemvalue + '</td>';
+                        }
                    } else {
-                        html += '<td class="rightCell">' + itemvalue + '</td>';
+                        html += '<td></td>';
                    }
                } else {
                    html += '<td></td>';
                }
            }
-            html += '</tr>'; 
+            html += '</tr>';
        }
        html += '</tbody>';
        $('#smart').empty().append(html);