diff --git a/languages/bg.lang b/languages/bg.lang index f4b72de8..e87d51b7 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/ca.lang b/languages/ca.lang index a944bfe4..1eb9fc14 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -504,6 +504,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/cn.lang b/languages/cn.lang index ed2a70b5..f8ea5b13 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/cs.lang b/languages/cs.lang index bd4bf1c2..c7f7e39f 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -520,6 +520,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/da.lang b/languages/da.lang index f9a161fa..ee7ce5f1 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -521,6 +521,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/de.lang b/languages/de.lang index 53670be8..cba489c0 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -517,6 +517,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/en.lang b/languages/en.lang index 38a06c6d..fa24cfea 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -318,6 +318,8 @@ $PALANG['pDkim_field_pkey'] = 'Private Key'; $PALANG['pDkim_field_pub'] = 'Public Key'; $PALANG['pDkim_field_author'] = 'Author'; $PALANG['pDkim_field_dkim_id'] = 'Domain Key'; +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; +$PALANG['pDkim_field_description'] = 'Description'; $PALANG['pDkim_field_selector_desc'] = 'Defines the name of the selector to be used when signing messages'; $PALANG['pDkim_field_domain_desc'] = 'Defines the domain which will use this key for signing'; $PALANG['pDkim_field_pkey_desc'] = 'PEM-formatted private key to be used for signing all messages'; diff --git a/languages/es.lang b/languages/es.lang index 95ecec1a..bc02ee87 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -507,6 +507,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/et.lang b/languages/et.lang index cb9fb2d7..8d53bf51 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -509,6 +509,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/eu.lang b/languages/eu.lang index 7200d757..30fa8f19 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -504,6 +504,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/fi.lang b/languages/fi.lang index a0552520..5b7d982e 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/fo.lang b/languages/fo.lang index 4544302a..cd0c5989 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -510,6 +510,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/fr.lang b/languages/fr.lang index 9de9a3e8..707b96f4 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -509,6 +509,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/gl.lang b/languages/gl.lang index b4bfbfc2..f957fe9d 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/hr.lang b/languages/hr.lang index fd1d62af..1f2a6200 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -504,6 +504,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/hu.lang b/languages/hu.lang index 1e6793d8..acfbd844 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -518,6 +518,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/is.lang b/languages/is.lang index 66abfbf1..1f50484d 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/it.lang b/languages/it.lang index c8bc5045..a3edcf08 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -506,6 +506,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/ja.lang b/languages/ja.lang index 4101d977..6d2b757e 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -516,6 +516,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/lt.lang b/languages/lt.lang index ed6a7959..88e70b3d 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -511,6 +511,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/mk.lang b/languages/mk.lang index 6c3f0528..921e48b5 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -506,6 +506,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/nb.lang b/languages/nb.lang index 86fed9c4..03521636 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -506,6 +506,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/nl.lang b/languages/nl.lang index c7792d0c..e698399f 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -509,6 +509,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/nn.lang b/languages/nn.lang index c82cd8c1..9c704ad3 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/pl.lang b/languages/pl.lang index 5619986b..9c641cd7 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -511,6 +511,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 1d14d89f..48dc222f 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -518,6 +518,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index 2f26bce8..6c4199af 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -518,6 +518,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/ro.lang b/languages/ro.lang index 2b1b78d2..a3900b52 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -517,6 +517,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/ru.lang b/languages/ru.lang index b39b46a4..3993d9fa 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -519,6 +519,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/sk.lang b/languages/sk.lang index 6ab6ac07..29efbbea 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -506,6 +506,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/sl.lang b/languages/sl.lang index 1721a932..0536ddec 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/sv.lang b/languages/sv.lang index 0365a3f3..b4205a8c 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -518,6 +518,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/tr.lang b/languages/tr.lang index cb3cbb01..863ee9c6 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -505,6 +505,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/tw.lang b/languages/tw.lang index 8813d5fc..157f7a2e 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -507,6 +507,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/languages/ua.lang b/languages/ua.lang index 5969038f..eeee156a 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -520,6 +520,8 @@ $PALANG['pUpdate_check_releases'] = 'View releases on GitHub'; # XXX $PALANG['pUpdate_changelog'] = 'Changelog'; # XXX $PALANG['pUpdate_fetch_error'] = 'Neither cURL nor allow_url_fopen is available. Cannot check for updates.'; # XXX $PALANG['pUpdate_network_error'] = 'Could not fetch release information from GitHub. Check that your server can reach api.github.com.'; # XXX +$PALANG['pDkim_field_domain_and_selector'] = 'Domain:Selector'; # XXX +$PALANG['pDkim_field_description'] = 'Description'; # XXX $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/model/DkimHandler.php b/model/DkimHandler.php index 4ee644ae..692bf524 100644 --- a/model/DkimHandler.php +++ b/model/DkimHandler.php @@ -16,6 +16,24 @@ class DkimHandler extends PFAHandler protected function initStruct() { + // Auto-generate RSA keypair as defaults for the create form + $default_private_key = ''; + $default_public_key = ''; + if ($this->new && function_exists('openssl_pkey_new')) { + $key = openssl_pkey_new([ + 'digest_alg' => 'sha512', + 'private_key_bits' => 2048, + 'private_key_type' => OPENSSL_KEYTYPE_RSA, + ]); + if ($key) { + openssl_pkey_export($key, $default_private_key); + $details = openssl_pkey_get_details($key); + if ($details) { + $default_public_key = $details['key']; + } + } + } + $this->struct = array( # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list @@ -23,8 +41,8 @@ class DkimHandler extends PFAHandler 'description' => self::pacol(1, 1, 1, 'text', 'description' , ''), 'selector' => self::pacol(1, 1, 1, 'text', 'pDkim_field_selector', 'pDkim_field_selector_desc'), 'domain_name' => self::pacol(1, 1, 1, 'enum', 'domain' , 'pDkim_field_domain_desc' , '', $this->allowed_domains), - 'private_key' => self::pacol(1, 1, 0, 'txta', 'pDkim_field_pkey' , 'pDkim_field_pkey_desc'), - 'public_key' => self::pacol(1, 1, 0, 'txta', 'pDkim_field_pub' , 'pDkim_field_pub_desc'), + 'private_key' => self::pacol(1, 1, 0, 'txta', 'pDkim_field_pkey' , 'pDkim_field_pkey_desc' , trim($default_private_key)), + 'public_key' => self::pacol(1, 1, 0, 'txta', 'pDkim_field_pub' , 'pDkim_field_pub_desc' , trim($default_public_key)), ); } diff --git a/model/DkimsigningHandler.php b/model/DkimsigningHandler.php index 2d931c7a..ae68509f 100644 --- a/model/DkimsigningHandler.php +++ b/model/DkimsigningHandler.php @@ -9,7 +9,7 @@ class DkimsigningHandler extends PFAHandler { protected string $db_table = 'dkim_signing'; protected string $id_field = 'id'; - protected string $order_by = 'dkim_id, author'; + protected string $order_by = '__dkim_domain_selector, author'; protected function initStruct() { @@ -31,12 +31,35 @@ class DkimsigningHandler extends PFAHandler array_keys($mail_handler->result()) ); + // Build descriptive labels for the DKIM key dropdown: "domain:selector (description) [id]" + $dkim_options = array_map( + fn($v) => "{$v['domain_name']}:{$v['selector']} ({$v['description']}) [{$v['id']}]", + $dkim_handler->result() + ); + + // MySQL uses CONCAT(), SQLite and PostgreSQL use || for string concatenation + $dkim_table = table_by_key('dkim'); + if (db_mysql()) { + $concat_expr = "CONCAT(domain_name, ':', selector)"; + } else { + $concat_expr = "(domain_name || ':' || selector)"; + } + $this->struct = array( - # field name allow display in... type $PALANG label $PALANG description default / options / ... - # editing? form list - 'id' => self::pacol(0, 0, 1, 'num' , 'pFetchmail_field_id' , '' , '', array(), 0, 1), - 'dkim_id' => self::pacol(1, 1, 1, 'enum' , 'pDkim_field_dkim_id' , 'pDkim_field_dkim_id_desc' , '', array_keys($dkim_handler->result)), - 'author' => self::pacol(1, 1, 1, 'enum' , 'pDkim_field_author' , 'pDkim_field_author_desc' , '', $authors), + # field name allow display in... type $PALANG label $PALANG description default / options / ... + # edit? form list + 'id' => self::pacol(0, 0, 1, 'num', 'pFetchmail_field_id', '', '', array(), 0, 1), + 'dkim_id' => self::pacol(1, 1, 1, 'enma', 'pDkim_field_dkim_id', 'pDkim_field_dkim_id_desc', '', $dkim_options), + '__dkim_domain_selector' => self::pacol(0, 0, 1, 'text', 'pDkim_field_domain_and_selector', '', + dont_write_to_db: 1, + extrafrom: 'LEFT JOIN (' + . " SELECT id AS __dkim_id," + . " $concat_expr AS __dkim_domain_selector," + . " description AS __dkim_description" + . " FROM $dkim_table" + . ') AS __dkim ON __dkim_id = dkim_id'), + '__dkim_description' => self::pacol(0, 0, 1, 'text', 'pDkim_field_description', '', dont_write_to_db: 1), + 'author' => self::pacol(1, 1, 1, 'enum', 'pDkim_field_author', 'pDkim_field_author_desc', '', $authors), ); }