Skip to content

Update to Cacti PSR#279

Merged
TheWitness merged 1 commit into
developfrom
cacti_psr
Feb 14, 2026
Merged

Update to Cacti PSR#279
TheWitness merged 1 commit into
developfrom
cacti_psr

Conversation

@TheWitness
Copy link
Copy Markdown
Member

Note, we should be moving Net\DNS2 into a composer requirement. Handle that separately.

Note, we should be moving Net\DNS2 into a composer requirement.  Handle that separately.
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the MacTrack plugin codebase to align more closely with Cacti/PSR-style conventions and modern PHP syntax, including formatting cleanup in bundled Net_DNS2 sources.

Changes:

  • Replaced legacy path/array syntax (e.g., dirname(__FILE__), array(), list()) with modern equivalents (__DIR__, [], array destructuring).
  • Standardized comment style and minor output formatting (echoprint, consistent quoting).
  • Reformatted bundled Net_DNS2 library files to a more PSR-like brace/comment style and tightened some base64 decoding calls.

Reviewed changes

Copilot reviewed 121 out of 138 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
mactrack_import_ouidb.php Modernize path handling and argument parsing syntax
mactrack_convert.php Modernize syntax; adjust output calls; minor formatting
mactrack_ajax_admin.php Comment style/formatting cleanup
mactrack_ajax.php Comment style/formatting cleanup
locales/po/index.php Remove trailing whitespace line
locales/index.php Remove trailing whitespace line
locales/LC_MESSAGES/index.php Remove trailing whitespace line
lib/mactrack_vendors.php Use __DIR__ for vendor includes
lib/mactrack_tplink.php Modernize arrays/comments; minor formatting
lib/mactrack_norbay_ng.php Modernize arrays/comments; minor formatting
lib/mactrack_linux.php Modernize arrays/comments; minor formatting + strict in_array
lib/mactrack_juniper.php Modernize arrays/comments; minor formatting + strict in_array
lib/mactrack_hp_ngi.php Modernize arrays/comments; minor formatting
lib/mactrack_hp_ng.php Modernize arrays/comments; minor formatting
lib/mactrack_hp.php Modernize arrays/comments; minor formatting
lib/mactrack_foundry.php Modernize arrays/comments; minor formatting
lib/mactrack_extreme.php Modernize arrays/comments; minor formatting
lib/mactrack_enterasys.php Modernize arrays/comments; minor formatting
lib/index.php Remove trailing whitespace line
index.php Remove trailing whitespace line
images/index.php Standardize header quoting
Net/DNS2/Resolver.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Question.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Packet/Response.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Packet/Request.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Notifier.php PSR-style braces/whitespace; strict in_array()
Net/DNS2/Lookups.php PSR-style braces/comments; minor formatting
Net/DNS2/Header.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Exception.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Cache/Shm.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Cache/File.php PSR-style braces/whitespace; minor formatting
Net/DNS2/Cache.php PSR-style braces/comments; minor formatting
Net/DNS2/BitMap.php PSR-style braces/whitespace; minor formatting
Net/DNS2/RR/A.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/AAAA.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/AFSDB.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/AMTRELAY.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/ANY.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/APL.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/ATMA.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/AVC.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/CAA.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/CDS.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/CDNSKEY.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/CERT.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/CNAME.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/CSYNC.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/DHCID.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/DLV.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/DNAME.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/DNSKEY.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/DS.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/EID.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/EUI48.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/EUI64.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/HINFO.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/HIP.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/IPSECKEY.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/ISDN.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/KEY.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/KX.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/L32.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/L64.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/LOC.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/LP.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/MX.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NAPTR.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NID.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NIMLOC.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NS.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NSAP.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NSEC.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/NSEC3.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/NSEC3PARAM.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/OPENPGPKEY.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/OPT.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/PTR.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/PX.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/RP.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/RRSIG.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/RT.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/SIG.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/SMIMEA.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/SOA.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/SPF.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/SRV.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/SSHFP.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/TA.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/TALINK.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/TKEY.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/TLSA.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/TXT.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/TYPE65534.php PSR-style braces/comments; strict base64 decoding
Net/DNS2/RR/URI.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/WKS.php PSR-style braces/comments; minor formatting
Net/DNS2/RR/X25.php PSR-style braces/comments; minor formatting
Comments suppressed due to low confidence (1)

Net/DNS2/Notifier.php:1

  • The * # line in the docblock appears to be an accidental artifact and reduces readability/quality of generated docs. Please remove it (or replace it with a meaningful annotation if it was intended).
<?php

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread mactrack_convert.php
Comment thread Net/DNS2/Notifier.php
Comment thread Net/DNS2/Notifier.php
Comment thread Net/DNS2/RR/TYPE65534.php
Comment thread Net/DNS2/RR/HINFO.php
@TheWitness TheWitness merged commit ac8347d into develop Feb 14, 2026
@TheWitness TheWitness deleted the cacti_psr branch February 14, 2026 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants