Hi
This patch does 3 things to software_register_details.php:
[list=1] it shows more details, the 2 fields software publisher and software_url.
it fixes a calculation bug, where the sum of licenses can be wrong if you have both positive and -1 licenses registered. (you might do that to keep a record of your purchased license numbers).
it replaces the IP address column in the bottom with the version, because i find that more useful.
[code] dkopen-audit:/var/www/open-audit# svn diff software_register_details.php Index: software_register_details.php =================================================================== --- software_register_details.php (revision 1245) +++ software_register_details.php (working copy) @@ -10,7 +10,7 @@ if (isset($_GET['id'])){$id = $_GET['id'];}else{header("Location: software_register.php");} -$sql = "SELECT software_reg_id, software_title, count(software.software_name) AS number_used, software_comments FROM "; +$sql = "SELECT software_reg_id, software_title, count(software.software_name) AS number_used, software_comments, software_publisher, software_url, software_comment FROM "; $sql .= "software_register, software, system WHERE "; $sql .= "software_title = software_name AND "; $sql .= "software_uuid = system_uuid AND "; @@ -23,7 +23,9 @@ echo "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n"; echo "<tr><td class=\"contenthead\" colspan=\"2\">Software License Register Details for: </td></tr>\n"; - echo "<tr><td>" . $myrow["software_title"] . "</td></tr>\n"; + echo "<tr><td width=\"2%\">Title:</td><td width=\"98%\" align=\"left\">" . $myrow["software_title"] . "</td></tr>\n"; + echo "<tr><td width=\"2%\">Publisher:</td><td width=\"98%\" align=\"left\"><a href=\"" . $myrow["software_url"] . "\" class=\"content\">" . $myrow["software_publisher"] . "</a></td></tr>\n"; + echo "<tr><td width=\"2%\">Comment:</td><td width=\"98%\" align=\"left\">" . $myrow["software_comment"] . "</td></tr>\n"; echo "<tr><td class=\"contenthead\"><br />Usage Details.</td></tr>\n"; echo "<tr bgcolor=\"" . $bgcolor . "\">\n"; echo "<td width=\"25%\"><b>Package Name </b></td>\n"; @@ -33,7 +35,10 @@ echo "</tr>"; do { - $sql2 = "SELECT sum(license_purchase_number) as number_purchased FROM "; + $sql2 = "SELECT IF(min(license_purchase_number)=-1,"; + $sql2 .= "min(license_purchase_number),"; + $sql2 .= "sum(license_purchase_number))"; + $sql2 .= "as number_purchased FROM "; $sql2 .= "software_licenses, software_register WHERE "; $sql2 .= "license_software_id = software_reg_id AND "; $sql2 .= "software_title = '" . $myrow['software_title'] . "'"; @@ -56,11 +61,13 @@ echo "<td>" . $myrow["software_title"] . " </td>\n"; echo "<td align=\"center\">" . $number_purchased . "</td>\n"; echo "<td align=\"center\">" . $number_used . "</td>\n"; - if ($number_purchased == -1) { - echo "<td align=\"center\"></td>"; - } else { - echo "<td align=\"center\">" . $font . $number_audit . "</font></td>"; - } + + if ($number_purchased == -1) { + echo "<td align=\"center\"></td>"; + } else { + echo "<td align=\"center\">" . $font . $number_audit . "</font></td>"; + } + // echo "<td align=\"center\">" . $font . $number_audit . "</font></td>\n"; echo "</tr>\n"; echo "</table>\n"; @@ -112,7 +119,7 @@ } else {} $bgcolor = "#F1F1F1"; -$sql = "select sys.system_uuid, sys.system_os_name, sys.system_description, sys.net_ip_address, sys.system_name, sw.software_name from "; +$sql = "select sys.system_uuid, sys.system_os_name, sys.system_description, sys.system_name, sw.software_name, sw.software_version from "; $sql .= "software sw, system sys where "; $sql .= "sw.software_name = '" . addslashes($name) . "' AND "; $sql .= "sw.software_uuid = sys.system_uuid AND "; @@ -123,10 +130,10 @@ if ($myrow = mysql_fetch_array($result)){ echo "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\" class=\"content\">\n"; echo "<tr><td class=\"contenthead\" colspan=\"3\"><br />Systems with \"" . $name . "\" installed.</td></tr>\n"; - echo "<tr><td> <b>IP Address</b></td><td> <b>Name</b></td><td> <b>Description</b></td></tr>\n"; + echo "<tr><td> <b>Version</b></td><td> <b>Name</b></td><td> <b>Description</b></td></tr>\n"; do { echo "<tr bgcolor=\"" . $bgcolor . "\">\n"; - echo " <td width=\"33%\"> " . $myrow["net_ip_address"] . " </td>\n"; + echo " <td width=\"33%\"> " . $myrow["software_version"] . " </td>\n"; echo " <td width=\"33%\"> <a href=\"system.php?pc=" . $myrow["system_uuid"] . "&view=summary\" class=\"content\">" . $myrow["system_name"] . "</a> </td>\n"; echo " <td width=\"33%\"> " . $myrow["system_description"] . "</td>\n"; echo "</tr>\n"; [/code] Made against revision 1245
|