| /trunk/changelog.json.php |
|---|
| 3,6 → 3,14 |
| "dummy": "<?php die(base64_decode('IgogICAgfQpdCg==')); /* for security reasons, do not show the current version @phpstan-ignore-line */ ?>" |
| }, |
| { |
| "version": "2.0.1.9", |
| "date": "2023-12-03 18:45:00 +0100", |
| "author": "Daniel Marschall (ViaThinkSoft)", |
| "changes": [ |
| "Updated definition to \"VTS F2\" AID (added padding for odd number of nibbles)" |
| ] |
| }, |
| { |
| "version": "2.0.1.8", |
| "date": "2023-12-02 22:49:00 +0100", |
| "author": "Daniel Marschall (ViaThinkSoft)", |
| /trunk/dev/release.sh |
|---|
| 22,6 → 22,8 |
| # Please make sure to do all these steps before committing ANYTHING: |
| # TODO: should we ask the user to do a "svn update"? |
| DIR=$( dirname "$0" ) |
| # 0. Search for SPONGE (Marker invented by Terry A Davis) |
| /trunk/plugins/viathinksoft/adminPages/902_systemfile_check/checksums.json |
|---|
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/json |
| /trunk/plugins/viathinksoft/objectTypes/aid/OIDplusAid.class.php |
|---|
| 406,8 → 406,10 |
| if (str_starts_with($aid,'D276000186F2')) { |
| $size_nibble = substr($aid,strlen('D276000186F2'),1); |
| if ($size_nibble != '') { |
| $mac = substr($aid, strlen('D276000186F2X'), hexdec($size_nibble) + 1); |
| if (strlen($aid) <= strlen('D276000186F2X') + hexdec($size_nibble) + 1) { |
| $mac = substr($aid, strlen('D276000186F2'.$size_nibble), hexdec($size_nibble) + 1); |
| $test_aid = 'D276000186F2'.$size_nibble.$mac; |
| if (strlen($test_aid)%2 == 1) $test_aid .= 'F'; // padding |
| if ($aid == $test_aid) { |
| $mac_type = mac_type(str_pad($mac, 12, '0', STR_PAD_RIGHT)); |
| $ids[] = new OIDplusAltId('mac', $mac, $mac_type); |
| } |
| /trunk/plugins/viathinksoft/objectTypes/mac/OIDplusMac.class.php |
|---|
| 378,7 → 378,8 |
| // (VTS F2) MAC address (EUI/ELI/...) to AID (PIX allowed) |
| $size_nibble = strlen($this->number)-1; |
| if (($size_nibble >= 0) && ($size_nibble <= 0xF)) { |
| $aid = 'D276000186F2'.dechex($size_nibble).$this->number; |
| $aid = 'D276000186F2'.strtoupper(dechex($size_nibble)).$this->number; |
| if ((strlen($aid)%2) == 1) $aid .= 'F'; |
| $aid_is_ok = aid_canonize($aid); |
| if ($aid_is_ok) $ids[] = new OIDplusAltId('aid', $aid, _L('Application Identifier (ISO/IEC 7816)'), ' ('._L('Optional PIX allowed, without prefix').')', 'https://hosted.oidplus.com/viathinksoft/?goto=aid%3AD276000186F2'); |
| } |
| /trunk/plugins/viathinksoft/publicPages/000_objects/OIDplusPagePublicObjects.class.php |
|---|
| 645,6 → 645,9 |
| } |
| } |
| // TODO: Forbid shared ancestors, e.g. if root obejct "2.999" exists, then you shall not create a root object "2.999.1" |
| // Please note that it should be allowed where there is an orphan in between, e.g. it is OK if "2.999" is owned by us (as root), and "2.999.1.2.3" is also a root (because an ownership was transferred back to us) |
| // Determine absolute OID name |
| // Note: At addString() and parse(), the syntax of the ID will be checked |
| if (oidplus_is_true($params['id_fully_qualified'] ?? false)) { |