oidplusalarmingautosfxaysaliacalllibchecksum-toolscolormanagercryptochatcurrency_converterdecoderdelphiutilsdistributeddpcstudiodpg2fastphpfileformatsfilter_foundryforestgridgameht46f47_simulatorindexer_suiteipe_artfile_utilsjavautilsjumperlightgamelogviewermusikboxmystic_houseoidconverteroidinfo_apioidinfo_new_designpersonal-webbasephp_antispamphp_clientchallengephp_guestbookphp_utilsplumbersprependrecyclebinunitsimple_log_eventsokobanspacemissionstackmanuserdetect2uuid_mac_utilsvgwhoisvnagwebcounterwinbugtrackeryt_downloader

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/includes/classes/OIDplusAuthUtils.class.php @ 1314

  → /trunk/includes/classes/OIDplusAuthUtils.class.php @ 1315

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 1314 → Rev 1315

/trunk/includes/classes/OIDplusAuthUtils.class.php
191,17 → 191,13
public function raLoginEx(string $email, string $origin='') {
$loginfo = '';
$acs = $this->getAuthContentStore();
if (!is_null($acs)) {
// User is already logged in (a session or JWT exists), so we modify their login status
$acs->raLoginEx($email, $loginfo);
$acs->activate();
} else {
if (is_null($acs)) {
// No user is logged in (no JWT exists). We now create a auth content store and activate it (cookies will be set etc.)
$newAuthStore = new OIDplusAuthContentStoreJWT();
$newAuthStore->setValue(OIDplusAuthContentStoreJWT::CLAIM_GENERATOR, OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
$newAuthStore->raLoginEx($email, $loginfo);
$newAuthStore->activate();
$acs = new OIDplusAuthContentStoreJWT();
$acs->setValue(OIDplusAuthContentStoreJWT::CLAIM_GENERATOR, OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
}
$acs->raLoginEx($email, $loginfo);
$acs->activate(); // create or update JWT token
$logmsg = "RA '$email' logged in";
if ($origin != '') $logmsg .= " via $origin";
if ($loginfo != '') $logmsg .= " ($loginfo)";
310,17 → 306,13
public function adminLoginEx(string $origin='') {
$loginfo = '';
$acs = $this->getAuthContentStore();
if (!is_null($acs)) {
// User is already logged in (a session or JWT exists), so we modify their login status
if (is_null($acs)) {
// No user is logged in (no JWT exists). We now create a auth content store and activate it (cookies will be set etc.)
$acs = new OIDplusAuthContentStoreJWT();
$acs->setValue(OIDplusAuthContentStoreJWT::CLAIM_GENERATOR, OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
}
$acs->adminLoginEx($loginfo);
$acs->activate();
} else {
// No user is logged in (no JWT exists). We now create a auth content store and activate it (cookies will be set etc.)
$newAuthStore = new OIDplusAuthContentStoreJWT();
$newAuthStore->setValue(OIDplusAuthContentStoreJWT::CLAIM_GENERATOR, OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
$newAuthStore->adminLoginEx($loginfo);
$newAuthStore->activate();
}
$logmsg = "Admin logged in";
if ($origin != '') $logmsg .= " via $origin";
if ($loginfo != '') $logmsg .= " ($loginfo)";