[serendipity-cvs] [s9y/Serendipity] 1977c6: Send and validate a second factor to finish login ...

onli <[email protected]> Wed, 18 Mar 2026 06:50:34 -0700
Newsgroups gmane.comp.serendipity.cvs
Message-ID <s9y/Serendipity/push/refs/heads/feature/bootstrap4EntryClass/[email protected]>
  Branch: refs/heads/feature/bootstrap4EntryClass
  Home:   https://github.com/s9y/Serendipity
  Commit: 1977c61dea520f7985793e73d935608d508db117
      https://github.com/s9y/Serendipity/commit/1977c61dea520f7985793e73d935608d508db117
  Author: onli <[email protected]>
  Date:   2026-03-18 (Wed, 18 Mar 2026)

  Changed paths:
    M docs/NEWS
    M include/functions_config.inc.php
    M include/tpl/config_personal.inc.php
    M lang/UTF-8/serendipity_lang_bg.inc.php
    M lang/UTF-8/serendipity_lang_cn.inc.php
    M lang/UTF-8/serendipity_lang_cs.inc.php
    M lang/UTF-8/serendipity_lang_cz.inc.php
    M lang/UTF-8/serendipity_lang_da.inc.php
    M lang/UTF-8/serendipity_lang_de.inc.php
    M lang/UTF-8/serendipity_lang_en.inc.php
    M lang/UTF-8/serendipity_lang_es.inc.php
    M lang/UTF-8/serendipity_lang_fa.inc.php
    M lang/UTF-8/serendipity_lang_fi.inc.php
    M lang/UTF-8/serendipity_lang_fr.inc.php
    M lang/UTF-8/serendipity_lang_hu.inc.php
    M lang/UTF-8/serendipity_lang_is.inc.php
    M lang/UTF-8/serendipity_lang_it.inc.php
    M lang/UTF-8/serendipity_lang_ja.inc.php
    M lang/UTF-8/serendipity_lang_ko.inc.php
    M lang/UTF-8/serendipity_lang_nl.inc.php
    M lang/UTF-8/serendipity_lang_no.inc.php
    M lang/UTF-8/serendipity_lang_pl.inc.php
    M lang/UTF-8/serendipity_lang_pt.inc.php
    M lang/UTF-8/serendipity_lang_pt_PT.inc.php
    M lang/UTF-8/serendipity_lang_ro.inc.php
    M lang/UTF-8/serendipity_lang_ru.inc.php
    M lang/UTF-8/serendipity_lang_sa.inc.php
    M lang/UTF-8/serendipity_lang_se.inc.php
    M lang/UTF-8/serendipity_lang_sk.inc.php
    M lang/UTF-8/serendipity_lang_ta.inc.php
    M lang/UTF-8/serendipity_lang_tn.inc.php
    M lang/UTF-8/serendipity_lang_tr.inc.php
    M lang/UTF-8/serendipity_lang_tw.inc.php
    M lang/UTF-8/serendipity_lang_zh.inc.php
    M lang/serendipity_lang_bg.inc.php
    M lang/serendipity_lang_cn.inc.php
    M lang/serendipity_lang_cs.inc.php
    M lang/serendipity_lang_cz.inc.php
    M lang/serendipity_lang_da.inc.php
    M lang/serendipity_lang_de.inc.php
    M lang/serendipity_lang_en.inc.php
    M lang/serendipity_lang_es.inc.php
    M lang/serendipity_lang_fa.inc.php
    M lang/serendipity_lang_fi.inc.php
    M lang/serendipity_lang_fr.inc.php
    M lang/serendipity_lang_hu.inc.php
    M lang/serendipity_lang_is.inc.php
    M lang/serendipity_lang_it.inc.php
    M lang/serendipity_lang_ja.inc.php
    M lang/serendipity_lang_ko.inc.php
    M lang/serendipity_lang_nl.inc.php
    M lang/serendipity_lang_no.inc.php
    M lang/serendipity_lang_pl.inc.php
    M lang/serendipity_lang_pt.inc.php
    M lang/serendipity_lang_pt_PT.inc.php
    M lang/serendipity_lang_ro.inc.php
    M lang/serendipity_lang_ru.inc.php
    M lang/serendipity_lang_sa.inc.php
    M lang/serendipity_lang_se.inc.php
    M lang/serendipity_lang_sk.inc.php
    M lang/serendipity_lang_ta.inc.php
    M lang/serendipity_lang_tn.inc.php
    M lang/serendipity_lang_tr.inc.php
    M lang/serendipity_lang_tw.inc.php
    M lang/serendipity_lang_zh.inc.php
    M serendipity_admin.php
    M templates/2k11/admin/index.tpl
    M templates/2k11/admin/personal.inc.tpl

  Log Message:
  -----------
  Send and validate a second factor to finish login (#941)

* Send and validate a second factor to finish logging in

* Do not throw pdo exceptions
Given the different database options, throwing the specific pdo exceptions conplicates the code a lot. On the other hand existing code might already catch those in some places

* Remove leftover ?> in notification

* Nake 2fa configurable

* Revert "Do not throw pdo exceptions"

This reverts commit 4653d5074a62eaa1bb6370cc5005e5867c67e8cc.

* Fix 2fa config option
Store in serendipity_config, so no db modification is needed, and interpret bool properly when false

* Add PLEASE_ENTER_2FA language constant

* Do not show misleading error notification on second factor prompt

* Fix error on db config check when s9y is not installed
The database does nto exist yet at that point and the login check is unnecessary.

* Shorten 2fa code, so it is easier to type

* Add and use language constants for 2fa mail

* German translation for 2fa mail

* be clear about clause resolution

* Consume 2fa code on successful check & solve persistence logic

* document changes


  Commit: f30d2a9e043f00987d4d5ac77de6f8c26772f2be
      https://github.com/s9y/Serendipity/commit/f30d2a9e043f00987d4d5ac77de6f8c26772f2be
  Author: onli <[email protected]>
  Date:   2026-03-18 (Wed, 18 Mar 2026)

  Changed paths:
    M docs/NEWS
    M include/functions_config.inc.php
    M include/tpl/config_personal.inc.php
    M lang/UTF-8/serendipity_lang_bg.inc.php
    M lang/UTF-8/serendipity_lang_cn.inc.php
    M lang/UTF-8/serendipity_lang_cs.inc.php
    M lang/UTF-8/serendipity_lang_cz.inc.php
    M lang/UTF-8/serendipity_lang_da.inc.php
    M lang/UTF-8/serendipity_lang_de.inc.php
    M lang/UTF-8/serendipity_lang_en.inc.php
    M lang/UTF-8/serendipity_lang_es.inc.php
    M lang/UTF-8/serendipity_lang_fa.inc.php
    M lang/UTF-8/serendipity_lang_fi.inc.php
    M lang/UTF-8/serendipity_lang_fr.inc.php
    M lang/UTF-8/serendipity_lang_hu.inc.php
    M lang/UTF-8/serendipity_lang_is.inc.php
    M lang/UTF-8/serendipity_lang_it.inc.php
    M lang/UTF-8/serendipity_lang_ja.inc.php
    M lang/UTF-8/serendipity_lang_ko.inc.php
    M lang/UTF-8/serendipity_lang_nl.inc.php
    M lang/UTF-8/serendipity_lang_no.inc.php
    M lang/UTF-8/serendipity_lang_pl.inc.php
    M lang/UTF-8/serendipity_lang_pt.inc.php
    M lang/UTF-8/serendipity_lang_pt_PT.inc.php
    M lang/UTF-8/serendipity_lang_ro.inc.php
    M lang/UTF-8/serendipity_lang_ru.inc.php
    M lang/UTF-8/serendipity_lang_sa.inc.php
    M lang/UTF-8/serendipity_lang_se.inc.php
    M lang/UTF-8/serendipity_lang_sk.inc.php
    M lang/UTF-8/serendipity_lang_ta.inc.php
    M lang/UTF-8/serendipity_lang_tn.inc.php
    M lang/UTF-8/serendipity_lang_tr.inc.php
    M lang/UTF-8/serendipity_lang_tw.inc.php
    M lang/UTF-8/serendipity_lang_zh.inc.php
    M lang/serendipity_lang_bg.inc.php
    M lang/serendipity_lang_cn.inc.php
    M lang/serendipity_lang_cs.inc.php
    M lang/serendipity_lang_cz.inc.php
    M lang/serendipity_lang_da.inc.php
    M lang/serendipity_lang_de.inc.php
    M lang/serendipity_lang_en.inc.php
    M lang/serendipity_lang_es.inc.php
    M lang/serendipity_lang_fa.inc.php
    M lang/serendipity_lang_fi.inc.php
    M lang/serendipity_lang_fr.inc.php
    M lang/serendipity_lang_hu.inc.php
    M lang/serendipity_lang_is.inc.php
    M lang/serendipity_lang_it.inc.php
    M lang/serendipity_lang_ja.inc.php
    M lang/serendipity_lang_ko.inc.php
    M lang/serendipity_lang_nl.inc.php
    M lang/serendipity_lang_no.inc.php
    M lang/serendipity_lang_pl.inc.php
    M lang/serendipity_lang_pt.inc.php
    M lang/serendipity_lang_pt_PT.inc.php
    M lang/serendipity_lang_ro.inc.php
    M lang/serendipity_lang_ru.inc.php
    M lang/serendipity_lang_sa.inc.php
    M lang/serendipity_lang_se.inc.php
    M lang/serendipity_lang_sk.inc.php
    M lang/serendipity_lang_ta.inc.php
    M lang/serendipity_lang_tn.inc.php
    M lang/serendipity_lang_tr.inc.php
    M lang/serendipity_lang_tw.inc.php
    M lang/serendipity_lang_zh.inc.php
    M serendipity_admin.php
    M templates/2k11/admin/index.tpl
    M templates/2k11/admin/personal.inc.tpl

  Log Message:
  -----------
  Merge branch 'master' into feature/bootstrap4EntryClass


Compare: https://github.com/s9y/Serendipity/compare/45d4199c9ead...f30d2a9e043f

To unsubscribe from these emails, change your notification settings at https://github.com/s9y/Serendipity/settings/notifications