summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/authentication.php2
-rw-r--r--includes/classes/class_treenav.php2
-rw-r--r--includes/controllers/family_ctrl.php2
-rw-r--r--includes/controllers/lifespan_ctrl.php1
-rw-r--r--includes/controllers/note_ctrl.php2
-rw-r--r--includes/controllers/repository_ctrl.php2
-rw-r--r--includes/controllers/source_ctrl.php2
-rw-r--r--includes/controllers/timeline_ctrl.php1
-rw-r--r--includes/family_nav.php2
-rw-r--r--includes/functions/functions_print.php16
-rw-r--r--includes/functions/functions_print_facts.php2
11 files changed, 12 insertions, 22 deletions
diff --git a/includes/authentication.php b/includes/authentication.php
index 6601e59a43..de62a0d45e 100644
--- a/includes/authentication.php
+++ b/includes/authentication.php
@@ -347,7 +347,7 @@ function AddToChangeLog($log_message, $ged_id=WT_GED_ID) {
//----------------------------------- addMessage
//-- stores a new message in the database
function addMessage($message) {
- global $TBLPREFIX, $CONTACT_METHOD, $WT_STORE_MESSAGES, $SERVER_URL, $WEBMASTER_EMAIL;
+ global $TBLPREFIX, $WT_STORE_MESSAGES, $SERVER_URL, $WEBMASTER_EMAIL;
global $TEXT_DIRECTION;
global $WEBTREES_EMAIL;
diff --git a/includes/classes/class_treenav.php b/includes/classes/class_treenav.php
index 6aa6d4e915..4cec953dc6 100644
--- a/includes/classes/class_treenav.php
+++ b/includes/classes/class_treenav.php
@@ -149,7 +149,7 @@ class TreeNav {
* @param string $height the height parameter for the outer style
*/
function drawViewport($id='', $width='', $height='') {
- global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $CONTACT_EMAIL, $SERVER_URL;
+ global $WT_IMAGE_DIR, $WT_IMAGES, $GEDCOM, $SERVER_URL;
if (empty($id)) $id = $this->rootPerson->getXref();
$widthS = "";
$heightS = "";
diff --git a/includes/controllers/family_ctrl.php b/includes/controllers/family_ctrl.php
index dc5b99cf3f..7821fb68e4 100644
--- a/includes/controllers/family_ctrl.php
+++ b/includes/controllers/family_ctrl.php
@@ -66,7 +66,7 @@ class FamilyRoot extends BaseController {
}
function init() {
- global $Dbwidth, $bwidth, $pbwidth, $pbheight, $bheight, $GEDCOM, $CONTACT_EMAIL, $show_famlink;
+ global $Dbwidth, $bwidth, $pbwidth, $pbheight, $bheight, $GEDCOM, $show_famlink;
$bwidth = $Dbwidth;
$pbwidth = $bwidth + 12;
$pbheight = $bheight + 14;
diff --git a/includes/controllers/lifespan_ctrl.php b/includes/controllers/lifespan_ctrl.php
index b24126d68a..d9f16b1d6f 100644
--- a/includes/controllers/lifespan_ctrl.php
+++ b/includes/controllers/lifespan_ctrl.php
@@ -568,7 +568,6 @@ class LifespanControllerRoot extends BaseController {
* check the privacy of the incoming people to make sure they can be shown
*/
function checkPrivacy() {
- global $CONTACT_EMAIL;
$printed = false;
for ($i = 0; $i < count($this->people); $i ++) {
if (!$this->people[$i]->canDisplayDetails()) {
diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php
index 66afd4f674..3408fca4a6 100644
--- a/includes/controllers/note_ctrl.php
+++ b/includes/controllers/note_ctrl.php
@@ -64,8 +64,6 @@ class NoteControllerRoot extends BaseController {
* initialize the controller
*/
function init() {
- global $CONTACT_EMAIL;
-
$this->nid = safe_GET_xref('nid');
$noterec = find_other_record($this->nid, WT_GED_ID);
diff --git a/includes/controllers/repository_ctrl.php b/includes/controllers/repository_ctrl.php
index dd43d1ae00..c9147f7ab7 100644
--- a/includes/controllers/repository_ctrl.php
+++ b/includes/controllers/repository_ctrl.php
@@ -63,8 +63,6 @@ class RepositoryControllerRoot extends BaseController {
* initialize the controller
*/
function init() {
- global $CONTACT_EMAIL;
-
$this->rid = safe_GET_xref('rid');
$repositoryrec = find_other_record($this->rid, WT_GED_ID);
diff --git a/includes/controllers/source_ctrl.php b/includes/controllers/source_ctrl.php
index 230b62df79..79fb4c1425 100644
--- a/includes/controllers/source_ctrl.php
+++ b/includes/controllers/source_ctrl.php
@@ -64,8 +64,6 @@ class SourceControllerRoot extends BaseController {
* initialize the controller
*/
function init() {
- global $CONTACT_EMAIL;
-
$this->sid = safe_GET_xref('sid');
$sourcerec = find_source_record($this->sid, WT_GED_ID);
diff --git a/includes/controllers/timeline_ctrl.php b/includes/controllers/timeline_ctrl.php
index 278578b858..668ebf583c 100644
--- a/includes/controllers/timeline_ctrl.php
+++ b/includes/controllers/timeline_ctrl.php
@@ -158,7 +158,6 @@ class TimelineControllerRoot extends BaseController {
* check the privacy of the incoming people to make sure they can be shown
*/
function checkPrivacy() {
- global $CONTACT_EMAIL;
$printed = false;
for($i=0; $i<count($this->people); $i++) {
if (!is_null($this->people[$i])) {
diff --git a/includes/family_nav.php b/includes/family_nav.php
index 2b7caa37d5..1947716062 100644
--- a/includes/family_nav.php
+++ b/includes/family_nav.php
@@ -517,7 +517,7 @@ require_once WT_ROOT.'includes/functions/functions_charts.php';
function print_pedigree_person_nav($pid, $style=1, $show_famlink=true, $count=0, $personcount="1") {
global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $GEDCOM;
global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_ID_NUMBERS, $SHOW_PEDIGREE_PLACES;
- global $CONTACT_EMAIL, $CONTACT_METHOD, $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
+ global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
global $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
global $chart_style, $box_width, $generations, $show_spouse, $show_full;
global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 28e04bb236..3c782aa7ea 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -53,7 +53,7 @@ require_once WT_ROOT.'includes/classes/class_menubar.php';
function print_pedigree_person($pid, $style=1, $show_famlink=true, $count=0, $personcount="1") {
global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $view, $GEDCOM;
global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_ID_NUMBERS, $SHOW_PEDIGREE_PLACES;
- global $CONTACT_EMAIL, $CONTACT_METHOD, $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
+ global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
global $USE_SILHOUETTE, $WT_IMAGE_DIR, $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
global $chart_style, $box_width, $generations, $show_spouse, $show_full;
global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
@@ -434,7 +434,7 @@ function print_header($title, $head="", $use_alternate_styles=true) {
global $HOME_SITE_URL, $HOME_SITE_TEXT, $SERVER_URL;
global $BROWSERTYPE, $SEARCH_SPIDER;
global $view, $cart;
- global $WT_IMAGE_DIR, $GEDCOM, $GEDCOM_TITLE, $CONTACT_EMAIL, $COMMON_NAMES_THRESHOLD, $INDEX_DIRECTORY;
+ global $WT_IMAGE_DIR, $GEDCOM, $GEDCOM_TITLE, $COMMON_NAMES_THRESHOLD, $INDEX_DIRECTORY;
global $QUERY_STRING, $action, $query, $theme_name;
global $FAVICON, $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $toplinks, $THEME_DIR, $print_headerfile;
global $WT_IMAGES, $TEXT_DIRECTION, $ONLOADFUNCTION, $REQUIRE_AUTHENTICATION, $SHOW_SOURCES, $ENABLE_RSS, $RSS_FORMAT;
@@ -488,13 +488,11 @@ function print_header($title, $head="", $use_alternate_styles=true) {
$old_META_DESCRIPTION = $META_DESCRIPTION;
$old_META_PAGE_TOPIC = $META_PAGE_TOPIC;
if (empty($META_AUTHOR) || empty($META_PUBLISHER) || empty($META_COPYRIGHT)) {
- $user_id=get_user_id($CONTACT_EMAIL);
- if ($user_id) {
- $cuserName=getUserFullName($user_id);
- if (empty($META_AUTHOR )) $META_AUTHOR = $cuserName;
- if (empty($META_PUBLISHER)) $META_PUBLISHER = $cuserName;
- if (empty($META_COPYRIGHT)) $META_COPYRIGHT = $cuserName;
- }
+ $user_id=get_gedcom_setting(WT_GED_ID, 'CONTACT_USER_ID');
+ $cuserName=getUserFullName($user_id);
+ if (empty($META_AUTHOR )) $META_AUTHOR = $cuserName;
+ if (empty($META_PUBLISHER)) $META_PUBLISHER = $cuserName;
+ if (empty($META_COPYRIGHT)) $META_COPYRIGHT = $cuserName;
}
if (empty($META_DESCRIPTION)) {
$META_DESCRIPTION = $GEDCOM_TITLE;
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index f59840e3d3..688716bb18 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -78,7 +78,7 @@ function print_fact(&$eventObj, $noedit=false) {
global $WORD_WRAPPED_NOTES;
global $TEXT_DIRECTION;
global $HIDE_GEDCOM_ERRORS, $SHOW_ID_NUMBERS, $SHOW_FACT_ICONS, $SHOW_MEDIA_FILENAME;
- global $CONTACT_EMAIL, $view;
+ global $view;
global $n_chil, $n_gchi, $n_ggch;
global $SEARCH_SPIDER;
generated by cgit v1.3 (git 2.53.0) at 2026-07-07 09:29:25 +0000