Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1349 → Rev 1350

/trunk/includes/classes/OIDplus.class.php
1826,7 → 1826,7
$pubKey = OIDplus::getSystemPublicKey();
if (!verify_private_public_key($privKey, $pubKey)) {
if ($pubKey) {
OIDplus::logger()->log("V2:[WARN]A", "The private/public key-pair is broken. A new key-pair will now be generated for your system. Your System-ID will change.");
OIDplus::logger()->log("V2:[CRIT]A", "The private/public key-pair is broken. A new key-pair will now be generated for your system. Your System-ID will change.");
}
 
$pkey_config = array(
/trunk/includes/classes/OIDplusLogger.class.php
394,7 → 394,12
}
foreach (OIDplusRA::getAllRAs() as $ra) {
if ($obj->userHasWriteRights($ra)) {
if (OIDplus::authUtils()->isRaLoggedIn($ra)) {
try {
$tmp = OIDplus::authUtils()->isRaLoggedIn($ra);
} catch (\Exception $e) {
$tmp = false; // avoid that logging fails if things like JWT signature verification fails
}
if ($tmp) {
if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) {
$logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra->raEmail()));
}
421,7 → 426,12
}
foreach (OIDplusRA::getAllRAs() as $ra) {
if ($obj->userHasParentalWriteRights($ra)) {
if (OIDplus::authUtils()->isRaLoggedIn($ra)) {
try {
$tmp = OIDplus::authUtils()->isRaLoggedIn($ra);
} catch (\Exception $e) {
$tmp = false; // avoid that logging fails if things like JWT signature verification fails
}
if ($tmp) {
if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) {
$logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra->raEmail()));
}
444,7 → 454,12
$severity_online = $severity[0];
$severity_offline = $severity[1];
}
if (OIDplus::authUtils()->isRaLoggedIn($ra_email)) {
try {
$tmp = OIDplus::authUtils()->isRaLoggedIn($ra_email);
} catch (\Exception $e) {
$tmp = false; // avoid that logging fails if things like JWT signature verification fails
}
if ($tmp) {
if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) {
$logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra_email));
}
464,7 → 479,12
$severity_online = $severity[0];
$severity_offline = $severity[1];
}
if (OIDplus::authUtils()->isAdminLoggedIn()) {
try {
$tmp = OIDplus::authUtils()->isAdminLoggedIn();
} catch (\Exception $e) {
$tmp = false; // avoid that logging fails if things like JWT signature verification fails
}
if ($tmp) {
if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) {
$logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, 'admin'));
}
/trunk/includes/classes/OIDplusObject.class.php
95,7 → 95,7
$ids[] = new OIDplusAltId('guid',
gen_uuid_v8(
dechex($sysid_int),
dechex($unix_ts/60/60/24),
dechex((int)round($unix_ts/60/60/24)),
dechex(0),
sha1($ns_oid), // Note: No 14bit collission between 1.3.6.1.4.1.37476.2.5.2.4.8.[0-185]
sha1($obj_name)