r2747 - trigger_snmpportfinder(): employ spotEntity() and getObjectPortsAndLinks()

 - trigger_autoports(): idem
 - objectIsPortless(): sayonara
 - saveUserPassword(): phase out unused function
 - getObjectPortsAndLinks(): remove useless assertion

diff --git a/inc/database.php b/inc/database.php
index 5fd77b3bd11026abb7a74dddff0a82bec4ff97cd..8745fdb7a6bb8180e74230e2b38f5c6d03dcbb43 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -520,13 +520,8 @@ function getPortTypes ()
        return readChapter ('PortType');
 }
 
-function getObjectPortsAndLinks ($object_id = 0)
+function getObjectPortsAndLinks ($object_id)
 {
-       if ($object_id == 0)
-       {
-               showError ('Invalid object_id', __FUNCTION__);
-               return;
-       }
        // prepare decoder
        $ptd = readChapter ('PortType');
        $query = "select id, name, label, l2address, type as type_id, reservation_comment from Port where object_id = ${object_id}";
@@ -545,6 +540,7 @@ function getObjectPortsAndLinks ($object_id = 0)
        }
        unset ($result);
        // now find and decode remote ends for all locally terminated connections
+       // FIXME: can't this data be extracted in one pass with sub-queries?
        foreach (array_keys ($ret) as $tmpkey)
        {
                $portid = $ret[$tmpkey]['id'];
@@ -3133,31 +3129,6 @@ function saveScript ($name, $text)
        );
 }
 
-function saveUserPassword ($user_id, $newp)
-{
-       $newhash = sha1 ($newp);
-       $query = "update UserAccount set user_password_hash = ${newhash} where user_id = ${user_id} limit 1";
-}
-
-function objectIsPortless ($id = 0)
-{
-       if ($id <= 0)
-       {
-               showError ('Invalid argument', __FUNCTION__);
-               return;
-       }
-       if (($result = useSelectBlade ("select count(id) from Port where object_id = ${id}", __FUNCTION__)) == NULL) 
-       {
-               showError ('SQL query failed', __FUNCTION__);
-               return;
-       }
-       $row = $result->fetch (PDO::FETCH_NUM);
-       $count = $row[0];
-       $result->closeCursor();
-       unset ($result);
-       return $count === '0';
-}
-
 function newPortForwarding ($object_id, $localip, $localport, $remoteip, $remoteport, $proto, $description)
 {
        if (NULL === getIPv4AddressNetworkId ($localip))

diff --git a/inc/triggers.php b/inc/triggers.php
index b27d29e317ebb70066c6ffe8625c426294c4c7d8..4afb9b9d7ba7dd020ae05a243ee1dbfba4402975 100644 (file)
--- a/inc/triggers.php
+++ b/inc/triggers.php
@@ -44,13 +44,10 @@ function trigger_livevlans ()
 function trigger_snmpportfinder ()
 {
        assertUIntArg ('object_id', __FUNCTION__);
-       $object_id = $_REQUEST['object_id'];
-       $object = getObjectInfo ($object_id);
+       $object = spotEntity ('object', $object_id);
        if ($object['objtype_id'] != 8)
                return '';
-       if (!objectIsPortless ($_REQUEST['object_id']))
-               return '';
-       return 'attn';
+       return count (getObjectPortsAndLinks ($_REQUEST['object_id'])) ? '' : 'attn';
 }
 
 function trigger_isloadbalancer ()
@@ -85,9 +82,9 @@ function trigger_poolrscount ()
 function trigger_autoports ()
 {
        assertUIntArg ('object_id', __FUNCTION__);
-       if (!objectIsPortless ($_REQUEST['object_id']))
+       if (count (getObjectPortsAndLinks ($_REQUEST['object_id'])))
                return '';
-       $info = getObjectInfo ($_REQUEST['object_id'], FALSE);
+       $info = spotEntity ('object', $_REQUEST['object_id']);
        return count (getAutoPorts ($info['objtype_id'])) ? 'attn' : '';
 }