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 @ 1302

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

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 1302 → Rev 1303

/trunk/includes/classes/OIDplusAuthUtils.class.php
208,16 → 208,14
throw new OIDplusException(_L('The administrator has disabled this feature. (Base configuration setting %1).','JWT_ALLOW_LOGIN_USER'));
}
$ttl = OIDplus::baseConfig()->getValue('JWT_TTL_LOGIN_USER', 10*365*24*60*60);
$authSimulation = new OIDplusAuthContentStoreJWT();
$authSimulation->raLoginEx($email, $loginfo);
$authSimulation->setValue('oidplus_generator', OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
$authSimulation->setValue('exp', time()+$ttl); // JWT "exp" attribute
$authSimulation->activate();
$newAuthStore = new OIDplusAuthContentStoreJWT();
$newAuthStore->setValue('oidplus_generator', OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
$newAuthStore->setValue('exp', time()+$ttl); // JWT "exp" attribute
} else {
$authSimulation = new OIDplusAuthContentStoreSession();
$authSimulation->raLoginEx($email, $loginfo);
$authSimulation->activate();
$newAuthStore = new OIDplusAuthContentStoreSession();
}
$newAuthStore->raLoginEx($email, $loginfo);
$newAuthStore->activate();
}
$logmsg = "RA '$email' logged in";
if ($origin != '') $logmsg .= " via $origin";
340,16 → 338,14
throw new OIDplusException(_L('The administrator has disabled this feature. (Base configuration setting %1).','JWT_ALLOW_LOGIN_ADMIN'));
}
$ttl = OIDplus::baseConfig()->getValue('JWT_TTL_LOGIN_ADMIN', 10*365*24*60*60);
$authSimulation = new OIDplusAuthContentStoreJWT();
$authSimulation->adminLoginEx($loginfo);
$authSimulation->setValue('oidplus_generator', OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
$authSimulation->setValue('exp', time()+$ttl); // JWT "exp" attribute
$authSimulation->activate();
$newAuthStore = new OIDplusAuthContentStoreJWT();
$newAuthStore->setValue('oidplus_generator', OIDplusAuthContentStoreJWT::JWT_GENERATOR_LOGIN);
$newAuthStore->setValue('exp', time()+$ttl); // JWT "exp" attribute
} else {
$authSimulation = new OIDplusAuthContentStoreSession();
$authSimulation->adminLoginEx($loginfo);
$authSimulation->activate();
$newAuthStore = new OIDplusAuthContentStoreSession();
}
$newAuthStore->adminLoginEx($loginfo);
$newAuthStore->activate();
}
$logmsg = "Admin logged in";
if ($origin != '') $logmsg .= " via $origin";