Subversion Repositories oidplus

Compare Revisions

No changes between revisions

Regard whitespace Rev 1431 → Rev 1432

/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.1",
"date": "2023-11-15 00:58:00 +0100",
"author": "Daniel Marschall (ViaThinkSoft)",
"changes": [
"Waterjuice UUID-to-OID and Microsoft UUID-to-OID will not be transmitted to oid-info.com anymore."
]
},
{
"version": "2.0.1",
"date": "2023-11-12 19:21:00 +0100",
"author": "Daniel Marschall (ViaThinkSoft)",
/trunk/dev/release.sh
89,7 → 89,16
# 5. Only if you want to start a new release: Add new entry to the top of changelog.json.php
echo "5. Please edit changelog.json.php (add '-dev' for non-stable versions)"
sleep 2
while true; do
nano "$DIR"/../changelog.json.php
echo '<?php if (!@json_decode(@file_get_contents("'$DIR'/../changelog.json.php"))) exit(1);' | php
if [ $? -eq 0 ]; then
break
else
echo "JSON Syntax error! Please fix it"
sleep 2
fi
done
 
# 6. Run plugins/viathinksoft/adminPages/902_systemfile_check/private/gen_serverside_v3
echo "6. Generate system file check checksum file..."
/trunk/plugins/viathinksoft/adminPages/400_oidinfo_export/OIDplusPageAdminOIDInfoExport.class.php
902,6 → 902,10
if ($ns == 'oid') {
// TODO: Let Object Type plugins decide if they want that their OID representations get published or not (via a Feature OID implementation)
if (strpos($id, '2.25.') === 0) continue; // don't spam the uuid arc with GUID objects
if (strpos($id, '1.2.840.113556.1.8000.2554.') === 0) continue; // don't spam the uuid arc with GUID objects
if (strpos($id, '1.3.6.1.4.1.54392.1.') === 0) continue; // don't spam the uuid arc with GUID objects
if (strpos($id, '1.3.6.1.4.1.54392.2.') === 0) continue; // don't spam the uuid arc with GUID objects
if (strpos($id, '1.3.6.1.4.1.54392.3.') === 0) continue; // don't spam the uuid arc with GUID objects
$out_content .= $oa->createXMLEntry($id, $elements, $params, $comment=$obj->nodeId());
}
}
/trunk/plugins/viathinksoft/adminPages/900_software_update/private/funcs.inc.php
474,14 → 474,14
$outscript .= "}\n";
$outscript .= "if (\$latest_version != '$prev_version') err('This update can only be applied to OIDplus version $prev_version!');\n";
} else if (version_compare($version, "2.0.0.662") >= 0) {
$rev = str_replace('2.0.0.', '', $version);
$prev_rev = str_replace('2.0.0.', '', $prev_version);
$rev = (int)str_replace('2.0.0.', '', $version);
$prev_rev = (int)str_replace('2.0.0.', '', $prev_version);
$outscript .= "if (trim(@file_get_contents('.version.php')) !== '<?php // Revision $prev_rev') {\n";
$outscript .= "\terr('This update can only be applied to OIDplus version 2.0.0.$prev_rev!');\n";
$outscript .= "}\n";
} else {
$rev = str_replace('2.0.0.', '', $version);
$prev_rev = str_replace('2.0.0.', '', $prev_version);
$rev = (int)str_replace('2.0.0.', '', $version);
$prev_rev = (int)str_replace('2.0.0.', '', $prev_version);
$outscript .= "if (trim(@file_get_contents('oidplus_version.txt')) !== 'Revision $prev_rev') {\n";
$outscript .= "\terr('This update can only be applied to OIDplus version 2.0.0.$prev_rev!');\n";
$outscript .= "}\n";
512,7 → 512,7
$outscript .= "if (is_file('.version.php')) warn('Could not delete .version.php! Please delete it manually');\n";
}
} else if (version_compare($version, "2.0.0.661") >= 0) {
$rev = str_replace('2.0.0.', '', $version);
$rev = (int)str_replace('2.0.0.', '', $version);
$outscript .= "file_put_contents('.version.php', \"<?php // Revision $rev\\n\");\n";
$outscript .= "if (trim(@file_get_contents('.version.php')) !== '<?php // Revision $rev') err('Could not write to .version.php!');\n";
if (version_compare($version, "2.0.0.661") == 0) {
520,7 → 520,7
$outscript .= "if (is_file('oidplus_version.txt')) err('Could not delete oidplus_version.txt! Please delete it manually');\n";
}
} else {
$rev = str_replace('2.0.0.', '', $version);
$rev = (int)str_replace('2.0.0.', '', $version);
$outscript .= "file_put_contents('oidplus_version.txt', \"Revision $rev\\n\");\n";
$outscript .= "if (trim(@file_get_contents('oidplus_version.txt')) !== 'Revision $rev') err('Could not write to oidplus_version.txt!');\n";
}
542,7 → 542,12
 
$naked = preg_replace('@<\?php /\* <ViaThinkSoftSignature>(.+)</ViaThinkSoftSignature> \*/ \?>\n@ismU', '', $outscript);
 
if (version_compare($prev_version, "2.0.1") < 0) {
$rev = (int)str_replace('2.0.0.', '', $prev_version);
$hash = hash("sha256", $naked."update_".($rev)."_to_".($rev+1).".txt");
} else {
$hash = hash("sha256", $naked.basename($outfile));
}
 
$pkeyid = openssl_pkey_get_private('file://'.$priv_key);
openssl_sign($hash, $signature, $pkeyid, OPENSSL_ALGO_SHA256);
/trunk/plugins/viathinksoft/adminPages/902_systemfile_check/checksums.json
Cannot display: file marked as a binary type.
svn:mime-type = application/json