summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Elements/Residence.php26
-rw-r--r--app/Gedcom.php96
-rw-r--r--app/Site.php1
-rw-r--r--resources/views/admin/tags.phtml18
4 files changed, 73 insertions, 68 deletions
diff --git a/app/Elements/Residence.php b/app/Elements/Residence.php
index c5d78b7f9c..8fcc656abf 100644
--- a/app/Elements/Residence.php
+++ b/app/Elements/Residence.php
@@ -25,16 +25,20 @@ namespace Fisharebest\Webtrees\Elements;
class Residence extends EmptyElement
{
protected const SUBTAGS = [
- 'TYPE' => '0:1:?',
- 'DATE' => '0:1',
- 'PLAC' => '0:1',
- 'ADDR' => '0:1',
- 'CAUS' => '0:1:?',
- 'AGNC' => '0:1:?',
- 'RELI' => '0:1:?',
- 'NOTE' => '0:M',
- 'OBJE' => '0:M',
- 'SOUR' => '0:M',
- 'RESN' => '0:1',
+ 'TYPE' => '0:1:?',
+ 'DATE' => '0:1',
+ 'PLAC' => '0:1',
+ 'ADDR' => '0:1',
+ 'EMAIL' => '0:1',
+ 'WWW' => '0:1',
+ 'PHON' => '0:1',
+ 'FAX' => '0:1:?',
+ 'CAUS' => '0:1:?',
+ 'AGNC' => '0:1:?',
+ 'RELI' => '0:1:?',
+ 'NOTE' => '0:M',
+ 'OBJE' => '0:M',
+ 'SOUR' => '0:M',
+ 'RESN' => '0:1',
];
}
diff --git a/app/Gedcom.php b/app/Gedcom.php
index e1b3a8beb4..9b2d00983e 100644
--- a/app/Gedcom.php
+++ b/app/Gedcom.php
@@ -263,63 +263,63 @@ class Gedcom
// These preferences control multiple tag definitions
public const HIDDEN_TAGS = [
// Individual names
- 'NAME_NPFX' => ['INDI:NAME:NPFX', 'INDI:NAME:FONE:NPFX', 'INDI:NAME:ROMN:NPFX'],
- 'NAME_SPFX' => ['INDI:NAME:SPFX', 'INDI:NAME:FONE:SPFX', 'INDI:NAME:ROMN:SPFX'],
- 'NAME_NSFX' => ['INDI:NAME:NSFX', 'INDI:NAME:FONE:NSFX', 'INDI:NAME:ROMN:NSFX'],
- 'NAME_NICK' => ['INDI:NAME:NICK', 'INDI:NAME:FONE:NICK', 'INDI:NAME:ROMN:NICK'],
- 'NAME_FONE' => ['INDI:NAME:FONE'],
- 'NAME_ROMN' => ['INDI:NAME:ROMN'],
- 'NAME_NOTE' => ['INDI:NAME:NOTE'],
- 'NAME_SOUR' => ['INDI:NAME:SOUR'],
+ 'NAME_NPFX' => ['INDI:NAME:NPFX', 'INDI:NAME:FONE:NPFX', 'INDI:NAME:ROMN:NPFX'],
+ 'NAME_SPFX' => ['INDI:NAME:SPFX', 'INDI:NAME:FONE:SPFX', 'INDI:NAME:ROMN:SPFX'],
+ 'NAME_NSFX' => ['INDI:NAME:NSFX', 'INDI:NAME:FONE:NSFX', 'INDI:NAME:ROMN:NSFX'],
+ 'NAME_NICK' => ['INDI:NAME:NICK', 'INDI:NAME:FONE:NICK', 'INDI:NAME:ROMN:NICK'],
+ 'NAME_FONE' => ['INDI:NAME:FONE'],
+ 'NAME_ROMN' => ['INDI:NAME:ROMN'],
+ 'NAME_NOTE' => ['INDI:NAME:NOTE'],
+ 'NAME_SOUR' => ['INDI:NAME:SOUR'],
// Places
- 'PLAC_MAP' => ['PLAC:MAP'],
- 'PLAC_FONE' => ['PLAC:FONE'],
- 'PLAC_ROMN' => ['PLAC:ROMN'],
- 'PLAC_FORM' => ['PLAC:FORM', 'HEAD:PLAC'],
- 'PLAC_NOTE' => ['PLAC:NOTE'],
+ 'PLAC_MAP' => [':PLAC:MAP'],
+ 'PLAC_FONE' => [':PLAC:FONE'],
+ 'PLAC_ROMN' => [':PLAC:ROMN'],
+ 'PLAC_FORM' => [':PLAC:FORM', 'HEAD:PLAC'],
+ 'PLAC_NOTE' => [':PLAC:NOTE'],
// Addresses
- 'ADDR_FAX' => ['FAX'],
- 'ADDR_PHON' => ['PHON'],
- 'ADDR_WWW' => ['WWW'],
+ 'ADDR_EMAIL' => [':EMAIL'],
+ 'ADDR_PHON' => [':PHON'],
+ 'ADDR_WWW' => [':WWW'],
// Source citations
- 'SOUR_EVEN' => [':SOUR:EVEN'],
- 'SOUR_DATE' => [':SOUR:DATA:DATE'],
- 'SOUR_NOTE' => [':SOUR:NOTE'],
- 'SOUR_QUAY' => [':SOUR:QUAY'],
+ 'SOUR_EVEN' => [':SOUR:EVEN'],
+ 'SOUR_DATE' => [':SOUR:DATA:DATE'],
+ 'SOUR_NOTE' => [':SOUR:NOTE'],
+ 'SOUR_QUAY' => [':SOUR:QUAY'],
// Sources
- 'SOUR_DATA' => ['SOUR:DATA:EVEN', 'SOUR:DATA:AGNC', 'SOUR:DATA:NOTE'],
+ 'SOUR_DATA' => ['SOUR:DATA:EVEN', 'SOUR:DATA:AGNC', 'SOUR:DATA:NOTE'],
// Individuals
- 'BIRT_FAMC' => ['INDI:BIRT:FAMC'],
- 'RELI' => ['INDI:RELI'],
- 'BAPM' => ['INDI:BAPM'],
- 'CHR' => ['INDI:CHR', 'INDI:CHRA'],
- 'FCOM' => ['INDI:FCOM', 'INDI:CONF'],
- 'ORDN' => ['INDI:ORDN'],
- 'BARM' => ['INDI:BARM', 'INDI:BASM'],
- 'ALIA' => ['INDI:ALIA'],
- 'ASSO' => ['INDI:ASSO'],
+ 'BIRT_FAMC' => ['INDI:BIRT:FAMC'],
+ 'RELI' => ['INDI:RELI'],
+ 'BAPM' => ['INDI:BAPM'],
+ 'CHR' => ['INDI:CHR', 'INDI:CHRA'],
+ 'FCOM' => ['INDI:FCOM', 'INDI:CONF'],
+ 'ORDN' => ['INDI:ORDN'],
+ 'BARM' => ['INDI:BARM', 'INDI:BASM'],
+ 'ALIA' => ['INDI:ALIA'],
+ 'ASSO' => ['INDI:ASSO'],
// Families
- 'ENGA' => ['FAM:ENGA'],
- 'MARB' => ['FAM:MARB'],
- 'MARC' => ['FAM:MARC'],
- 'MARL' => ['FAM:MARL'],
- 'MARS' => ['FAM:MARS'],
- 'ANUL' => ['FAM:ANUL'],
- 'DIVF' => ['FAM:DIVF'],
- 'FAM_RESI' => ['FAM:RESI'],
- 'FAM_CENS' => ['FAM:CENS'],
+ 'ENGA' => ['FAM:ENGA'],
+ 'MARB' => ['FAM:MARB'],
+ 'MARC' => ['FAM:MARC'],
+ 'MARL' => ['FAM:MARL'],
+ 'MARS' => ['FAM:MARS'],
+ 'ANUL' => ['FAM:ANUL'],
+ 'DIVF' => ['FAM:DIVF'],
+ 'FAM_RESI' => ['FAM:RESI'],
+ 'FAM_CENS' => ['FAM:CENS'],
// LDS church
- 'LDS' => ['INDI:BAPL', 'INDI:CONL', 'INDI:ENDL', 'INDI:SLGC', 'FAM:SLGS', 'HEAD:SUBN'],
+ 'LDS' => ['INDI:BAPL', 'INDI:CONL', 'INDI:ENDL', 'INDI:SLGC', 'FAM:SLGS', 'HEAD:SUBN'],
// Identifiers
- 'AFN' => ['INDI:AFN'],
- 'IDNO' => ['INDI:IDNO'],
- 'SSN' => ['INDI:SSN'],
- 'RFN' => ['RFN'],
- 'REFN' => ['REFN'],
- 'RIN' => ['RIN'],
+ 'AFN' => ['INDI:AFN'],
+ 'IDNO' => ['INDI:IDNO'],
+ 'SSN' => ['INDI:SSN'],
+ 'RFN' => [':RFN'],
+ 'REFN' => [':REFN'],
+ 'RIN' => [':RIN'],
// Submitters
- 'SUBM' => ['INDI:SUBM', 'FAM:SUBM'],
- 'ANCI' => ['INDI:ANCI', 'INDI:DESI'],
+ 'SUBM' => ['INDI:SUBM', 'FAM:SUBM'],
+ 'ANCI' => ['INDI:ANCI', 'INDI:DESI'],
];
// Custom GEDCOM tags that can be created in webtrees.
diff --git a/app/Site.php b/app/Site.php
index 1dc0fc687b..8e21fe03c0 100644
--- a/app/Site.php
+++ b/app/Site.php
@@ -42,6 +42,7 @@ class Site
// Default values for some site preferences.
protected const DEFAULT_PREFERENCES = [
'ALLOW_CHANGE_GEDCOM' => '1',
+ 'HIDE_ADDR_EMAIL' => '1',
'HIDE_ADDR_FAX' => '1',
'HIDE_ADDR_PHON' => '1',
'HIDE_ADDR_WWW' => '1',
diff --git a/resources/views/admin/tags.phtml b/resources/views/admin/tags.phtml
index ea6233f327..3dfc7c4f0e 100644
--- a/resources/views/admin/tags.phtml
+++ b/resources/views/admin/tags.phtml
@@ -277,43 +277,43 @@ use Fisharebest\Webtrees\Site;
<tbody>
<tr>
<td>
- <?= $element_factory->make('INDI:RESI:FAX')->label() ?>
+ <?= $element_factory->make('INDI:RESI:PHON')->label() ?>
</td>
<td>
- <code dir="ltr">FAX</code>
+ <code dir="ltr">PHON</code>
</td>
<td>
- <?= view('components/checkbox-inline', ['name' => 'HIDE_ADDR_FAX', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_ADDR_FAX')]) ?>
+ <?= view('components/checkbox-inline', ['name' => 'HIDE_ADDR_PHON', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_ADDR_PHON')]) ?>
</td>
</tr>
<tr>
<td>
- <?= $element_factory->make('INDI:RESI:PHON')->label() ?>
+ <?= $element_factory->make('INDI:RESI:WWW')->label() ?>
</td>
<td>
- <code dir="ltr">PHON</code>
+ <code dir="ltr">WWW</code>
</td>
<td>
- <?= view('components/checkbox-inline', ['name' => 'HIDE_ADDR_PHON', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_ADDR_PHON')]) ?>
+ <?= view('components/checkbox-inline', ['name' => 'HIDE_ADDR_WWW', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_ADDR_WWW')]) ?>
</td>
</tr>
<tr>
<td>
- <?= $element_factory->make('INDI:RESI:WWW')->label() ?>
+ <?= $element_factory->make('INDI:RESI:EMAIL')->label() ?>
</td>
<td>
- <code dir="ltr">WWW</code>
+ <code dir="ltr">EMAIL</code>
</td>
<td>
- <?= view('components/checkbox-inline', ['name' => 'HIDE_ADDR_WWW', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_ADDR_WWW')]) ?>
+ <?= view('components/checkbox-inline', ['name' => 'HIDE_ADDR_EMAIL', 'label' => I18N::translate('hide'), 'checked' => (bool) Site::getPreference('HIDE_WWW_EMAIL')]) ?>
</td>
</tr>
</tbody>
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:12:31 +0000