summaryrefslogtreecommitdiff
path: root/modules_v3
diff options
context:
space:
mode:
Diffstat (limited to 'modules_v3')
-rw-r--r--modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php8
-rw-r--r--modules_v3/GEDFact_assistant/census/census-edit.php29
2 files changed, 21 insertions, 16 deletions
diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 5ffe17d5ee..d1b1cd3d65 100644
--- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -23,6 +23,8 @@ namespace Fisharebest\Webtrees;
*/
global $WT_TREE;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
+
$more_links = Filter::get('more_links');
$exist_links = Filter::get('exist_links');
$gid = Filter::get('gid', WT_REGEX_XREF);
@@ -167,9 +169,9 @@ if ($action == 'choose' && $paramok) {
echo '</td><td style="padding-bottom: 2px; vertical-align: middle;">';
echo '&nbsp;';
echo '<img style="border-style:none;" src="', Theme::theme()->parameter('image-add'), '" alt="', I18N::translate('Add'), ' " title="', I18N::translate('Add'), '" align="middle" name="addLink" value="" onclick="blankwin(); return false;">';
- echo ' ', print_findindi_link('gid');
- echo ' ', print_findfamily_link('gid');
- echo ' ', print_findsource_link('gid');
+ echo ' ', FunctionsPrint::printFindIndividualLink('gid');
+ echo ' ', FunctionsPrint::printFindFamilyLink('gid');
+ echo ' ', FunctionsPrint::printFindSourceLink('gid');
echo '</td></tr></table>';
echo "<sub>" . I18N::translate('Enter or search for the ID of the individual, family, or source to which this media item should be linked.') . "</sub>";
echo '<br><br>';
diff --git a/modules_v3/GEDFact_assistant/census/census-edit.php b/modules_v3/GEDFact_assistant/census/census-edit.php
index 1670658780..215fb2244d 100644
--- a/modules_v3/GEDFact_assistant/census/census-edit.php
+++ b/modules_v3/GEDFact_assistant/census/census-edit.php
@@ -16,6 +16,9 @@ namespace Fisharebest\Webtrees;
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
use Fisharebest\Webtrees\Controller\SimpleController;
+use Fisharebest\Webtrees\Functions\Functions;
+use Fisharebest\Webtrees\Functions\FunctionsDate;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
/** @global SimpleController $controller */
global $controller;
@@ -40,11 +43,11 @@ echo '<h3>', $controller->getPageTitle(), '&nbsp;&nbsp;';
// When more languages are added to the wiki, we can expand or redesign this
switch (WT_LOCALE) {
case 'fr':
- echo wiki_help_link('/fr/Module_Assistant_Recensement');
+ echo FunctionsPrint::wikiHelpLink('/fr/Module_Assistant_Recensement');
break;
case 'en':
default:
- echo wiki_help_link('/en/Census_Assistant_module');
+ echo FunctionsPrint::wikiHelpLink('/en/Census_Assistant_module');
break;
}
echo '</h3>';
@@ -67,7 +70,7 @@ if (!($person->isDead())) {
$bdate = $person->getBirthDate();
$age = Date::getAgeGedcom($bdate);
if ($age != "") {
- $summary .= "<span class=\"label\">" . I18N::translate('Age') . ":</span><span class=\"field\"> " . get_age_at_event($age, true) . "</span>";
+ $summary .= "<span class=\"label\">" . I18N::translate('Age') . ":</span><span class=\"field\"> " . FunctionsDate::getAgeAtEvent($age, true) . "</span>";
}
}
$summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
@@ -1158,7 +1161,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
<div class="optionbox">
<textarea wrap="off" name="NOTE" id="NOTE"></textarea><br>
<center>
- <?php echo print_specialchar_link('NOTE'); ?>
+ <?php echo FunctionsPrint::printSpecialCharacterLink('NOTE'); ?>
</center>
</div>
</div>
@@ -1266,7 +1269,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $gparent);
+ $label = Functions::getCloseRelationshipName($person, $gparent);
$menu = new Menu($label);
print_pedigree_person_nav_cens($gparent->getXref(), $label, $censdate);
$submenu = new Menu($parentlinks);
@@ -1345,7 +1348,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $gparent);
+ $label = Functions::getCloseRelationshipName($person, $gparent);
$menu = new Menu($label);
print_pedigree_person_nav_cens($gparent->getXref(), $label, $censyear);
$submenu = new Menu($parentlinks);
@@ -1430,7 +1433,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $child);
+ $label = Functions::getCloseRelationshipName($person, $child);
$menu = new Menu($label);
print_pedigree_person_nav_cens($child->getXref(), $label, $censyear);
$submenu = new Menu($spouselinks);
@@ -1526,7 +1529,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $gparent);
+ $label = Functions::getCloseRelationshipName($person, $gparent);
$menu = new Menu($label);
print_pedigree_person_nav_cens($gparent->getXref(), $label, $censyear);
$submenu = new Menu($parentlinks);
@@ -1613,7 +1616,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
}
}
- $label = get_close_relationship_name($person, $gparent);
+ $label = Functions::getCloseRelationshipName($person, $gparent);
$menu = new Menu($label);
print_pedigree_person_nav_cens($gparent->getXref(), $label, $censyear);
$submenu = new Menu($parentlinks);
@@ -1693,7 +1696,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $child);
+ $label = Functions::getCloseRelationshipName($person, $child);
$menu = new Menu($label);
print_pedigree_person_nav_cens($child->getXref(), $label, $censyear);
$submenu = new Menu($spouselinks);
@@ -1802,7 +1805,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $gparent);
+ $label = Functions::getCloseRelationshipName($person, $gparent);
$menu = new Menu($label);
print_pedigree_person_nav_cens($gparent->getXref(), $label, $censyear);
$submenu = new Menu($parentlinks);
@@ -1892,7 +1895,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $gparent);
+ $label = Functions::getCloseRelationshipName($person, $gparent);
$menu = new Menu($label);
print_pedigree_person_nav_cens($gparent->getXref(), $label, $censyear);
$submenu = new Menu($parentlinks);
@@ -1988,7 +1991,7 @@ $summary .= $person->formatFirstMajorFact(WT_EVENTS_DEAT, 2);
$fulmn = strip_tags($n['full']);
}
}
- $label = get_close_relationship_name($person, $child);
+ $label = Functions::getCloseRelationshipName($person, $child);
$menu = new Menu($label);
print_pedigree_person_nav_cens($child->getXref(), $label, $censyear);
$submenu = new Menu($spouselinks);
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:20:34 +0000