diff options
| -rw-r--r-- | includes/controllers/timeline_ctrl.php | 9 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | manageservers.php | 2 | ||||
| -rw-r--r-- | modules/GEDFact_assistant/_CENS/census_3_search_add.php | 22 | ||||
| -rw-r--r-- | modules/GEDFact_assistant/_MEDIA/media_3_search_add.php | 26 | ||||
| -rw-r--r-- | modules/clippings/module.php | 14 | ||||
| -rw-r--r-- | modules/googlemap/pedigree_map.php | 6 | ||||
| -rw-r--r-- | search_engine.php | 4 | ||||
| -rw-r--r-- | statistics.php | 8 |
9 files changed, 44 insertions, 49 deletions
diff --git a/includes/controllers/timeline_ctrl.php b/includes/controllers/timeline_ctrl.php index 5ef448040d..3820f84403 100644 --- a/includes/controllers/timeline_ctrl.php +++ b/includes/controllers/timeline_ctrl.php @@ -55,16 +55,11 @@ class TimelineController extends BaseController { * Initialization function */ function init() { - global $GEDCOM_ID_PREFIX; - $this->baseyear = date("Y"); //-- new pid $newpid=safe_GET_xref('newpid'); if ($newpid) { $indirec = find_person_record($newpid, WT_GED_ID); - if (empty($indirec) && $GEDCOM_ID_PREFIX) { - if (stristr($newpid, $GEDCOM_ID_PREFIX)===false) $newpid = $GEDCOM_ID_PREFIX.$newpid; - } } if (safe_GET('clear', '1')=='1') { @@ -167,7 +162,7 @@ class TimelineController extends BaseController { } function print_time_fact($event) { - global $basexoffset, $baseyoffset, $factcount, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_PEDIGREE_PLACES, $placements, $familyfacts, $GEDCOM; + global $basexoffset, $baseyoffset, $factcount, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_PEDIGREE_PLACES, $placements, $familyfacts; /* @var $event Event */ $factrec = $event->getGedComRecord(); @@ -291,7 +286,7 @@ class TimelineController extends BaseController { else { $ct = preg_match("/2 _WTFS @(.*)@/", $factrec, $match); if ($ct>0) { - echo " <a href=\"family.php?famid={$match[1]}&ged=".rawurlencode($GEDCOM)."\">"; + echo " <a href=\"family.php?famid={$match[1]}&ged=".WT_GEDURL."\">"; if ($event->getParentObject()->canDisplayName()) echo $event->getParentObject()->getFullName(); else echo i18n::translate('Private'); echo "</a>"; @@ -172,7 +172,7 @@ if ($ctype=='user' && !in_array('user_welcome', $blocks['main']) && !in_array('u } if (WT_USER_IS_ADMIN && $ctype=='gedcom' && !in_array('gedcom_block', $blocks['main']) && !in_array('gedcom_block', $blocks['side'])) { echo '<div align="center">'; - echo "<a href=\"javascript:;\" onclick=\"window.open('index_edit.php?name=".rawurlencode($GEDCOM)."&ctype=gedcom', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1');\">".i18n::translate('Customize this GEDCOM Home Page').'</a>'; + echo "<a href=\"javascript:;\" onclick=\"window.open('index_edit.php?name=".WT_GEDURL."&ctype=gedcom', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1');\">".i18n::translate('Customize this GEDCOM Home Page').'</a>'; echo '</div>'; } diff --git a/manageservers.php b/manageservers.php index e62e1e89aa..38a60ce896 100644 --- a/manageservers.php +++ b/manageservers.php @@ -325,7 +325,7 @@ echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return t <button id="buttonShow_<?php echo $sid; ?>" type="button" onclick="showSite('<?php echo $sid; ?>');"><?php echo i18n::translate('Show Details'); ?></button> - <button type="button" onclick="window.open('source.php?sid=<?php echo $sid; ?>&ged=<?php echo rawurlencode($GEDCOM); ?>')"><?php echo i18n::translate('View Connections'); ?></button> + <button type="button" onclick="window.open('source.php?sid=<?php echo $sid; ?>&ged=<?php echo WT_GEDURL; ?>')"><?php echo i18n::translate('View Connections'); ?></button> <?php echo PrintReady($serverTitle); ?> <div id="siteDetails_<?php echo $sid; ?>" style="display:none"> diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php index aaafc093b0..ff27b01a99 100644 --- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php +++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php @@ -75,7 +75,7 @@ if (!defined('WT_WEBTREES')) { <?php //-- Add Family Members to Census ------------------------------------------- - global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $GEDCOM; + global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION; ?> <tr> @@ -180,7 +180,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value" style="text-decoration:none;" > <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -314,7 +314,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -464,7 +464,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -633,7 +633,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -780,7 +780,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -917,7 +917,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -1077,7 +1077,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -1224,7 +1224,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -1364,7 +1364,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addnewnote_assisted&noteid=newnote&pid=".$child->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -1469,7 +1469,7 @@ require_once 'includes/functions/functions_charts.php'; */ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $currpid, $censyear) { - global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $SCRIPT_NAME, $GEDCOM; + global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $SCRIPT_NAME; global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES; global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY; global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER; diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php index 892e9b213c..17fb82bf43 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php +++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php @@ -78,7 +78,7 @@ if (!defined('WT_WEBTREES')) { <?php //-- Add Family Members to Census ------------------------------------------- - global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $GEDCOM, $censyear, $censdate; + global $WT_IMAGES, $spouselinks, $parentlinks, $DeathYr, $BirthYr, $TEXT_DIRECTION, $censyear, $censdate; // echo "CENS = " . $censyear; ?> <tr> @@ -149,7 +149,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value" > <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -230,7 +230,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -334,7 +334,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -448,7 +448,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -539,7 +539,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -633,7 +633,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value" > <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -732,7 +732,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value" > <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["husb"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -828,7 +828,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$people["wife"]->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -926,7 +926,7 @@ if (!defined('WT_WEBTREES')) { <td align="left" class="facts_value"> <font size=1> <?php - echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom=".rawurlencode($GEDCOM)."\">"; + echo "<a href=\"edit_interface.php?action=addmedia_links&noteid=newnote&pid=".$child->getXref()."&gedcom=".WT_GEDURL."\">"; echo $headImg2; echo "</a>"; ?> @@ -1007,7 +1007,7 @@ require_once WT_ROOT.'includes/functions/functions_charts.php'; * @param int $count on some charts it is important to keep a count of how many boxes were printed */ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $currpid, $censyear) { - global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $GEDCOM; + global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS; global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES; global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY; global $WT_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER; @@ -1239,7 +1239,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surname']; } - $parentlinks .= "<a href=\"individual.php?pid={$tmp}&tab={$tabno}&gedcom=".rawurlencode($GEDCOM)."\">"; + $parentlinks .= "<a href=\"individual.php?pid={$tmp}&tab={$tabno}&gedcom=".WT_GEDURL."\">"; $parentlinks .= PrintReady($husb->getFullName()); $parentlinks .= "</a>"; } else { @@ -1277,7 +1277,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $parentlinks .= "<a href=\"individual.php?pid={$tmp}&tab={$tabno}&gedcom=".rawurlencode($GEDCOM)."\">"; + $parentlinks .= "<a href=\"individual.php?pid={$tmp}&tab={$tabno}&gedcom=".WT_GEDURL."\">"; $parentlinks .= PrintReady($wife->getFullName()); $parentlinks .= "</a>"; } else { diff --git a/modules/clippings/module.php b/modules/clippings/module.php index 23f3a9f2e8..1ddc451e70 100644 --- a/modules/clippings/module.php +++ b/modules/clippings/module.php @@ -67,14 +67,14 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module // Implement WT_Module_Menu public function getMenu() { - global $TEXT_DIRECTION, $WT_IMAGES, $GEDCOM, $SEARCH_SPIDER, $controller; + global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER, $controller; if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; if ($SEARCH_SPIDER) { return new Menu("", "", ""); } //-- main clippings menu item - $menu = new Menu($this->getTitle(), 'module.php?mod=clippings&mod_action=index&ged='.rawurlencode($GEDCOM), "down"); + $menu = new Menu($this->getTitle(), 'module.php?mod=clippings&mod_action=index&ged='.WT_GEDURL, "down"); $menu->addIcon('clippings'); $menu->addClass("menuitem$ff", "menuitem_hover$ff", "submenu$ff", "icon_large_clippings"); if (isset($controller->indi) && $controller->indi->canDisplayDetails()) { @@ -123,7 +123,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module // Impelement WT_Module_Sidebar public function getSidebarContent() { - global $WT_IMAGES, $cart, $GEDCOM; + global $WT_IMAGES, $cart; $out = ''; @@ -160,7 +160,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module // Impelement WT_Module_Sidebar public function getSidebarAjaxContent() { - global $GEDCOM, $cart; + global $cart; $controller = new ClippingsController(); $this->controller = $controller; $add = safe_GET_xref('add',''); @@ -178,7 +178,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module $clipping = array (); $clipping['type'] = strtolower($record->getType()); $clipping['id'] = $add; - $clipping['gedcom'] = $GEDCOM; + $clipping['gedcom'] = WT_GEDCOM; $ret = $controller->add_clipping($clipping); if (isset($_SESSION["cart"])) $_SESSION["cart"]=$cart; if ($ret) return $this->askAddOptions($record); @@ -289,7 +289,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module } public function getCartList() { - global $WT_IMAGES, $cart, $GEDCOM; + global $WT_IMAGES, $cart; $out ='<ul>'; $ct = count($cart); @@ -300,7 +300,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module $tag = strtoupper(substr($clipping['type'], 0, 4)); // source => SOUR //print_r($clipping); //-- don't show clippings from other gedcoms - if ($clipping['gedcom']==$GEDCOM) { + if ($clipping['gedcom']==WT_GEDCOM) { $icon=''; if ($tag=='INDI') $icon = "indis"; if ($tag=='FAM' ) $icon = "sfamily"; diff --git a/modules/googlemap/pedigree_map.php b/modules/googlemap/pedigree_map.php index 73010b96be..f673a2a6dd 100644 --- a/modules/googlemap/pedigree_map.php +++ b/modules/googlemap/pedigree_map.php @@ -42,7 +42,7 @@ if (!defined('WT_WEBTREES')) { require WT_ROOT.'includes/controllers/pedigree_ctrl.php'; require WT_ROOT.'modules/googlemap/defaultconfig.php'; -global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES, $GEDCOM; +global $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $ENABLE_AUTOCOMPLETE, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $WT_IMAGES; // Default is show for both of these. $hideflags = safe_GET('hideflags'); @@ -104,7 +104,7 @@ echo PrintReady($controller->getPersonName())."</h2>"; //--> </script> </td><td width="50px"> </td><td> - <form name="people" method="get" action="module.php?ged=<?php echo rawurlencode($GEDCOM); ?>&mod=googlemap&mod_action=pedigree_map"> + <form name="people" method="get" action="module.php?ged=<?php echo WT_GEDURL; ?>&mod=googlemap&mod_action=pedigree_map"> <input type="hidden" name="mod" value="googlemap" /> <input type="hidden" name="mod_action" value="pedigree_map" /> <table class="pedigree_table <?php echo $TEXT_DIRECTION; ?>" width="555"> @@ -662,7 +662,7 @@ for ($i=0; $i<($controller->treesize); $i++) { echo "var point = new GLatLng(" . $lat[$i] . "," . $lon[$i]. ");\n"; echo "var marker = createMarker(point, \"" . addslashes($name). "\",\n\t\"<div>".$dataleft.$datamid.$dataright."</div>\", \""; echo "<div class='iwstyle'>"; - echo "<a href='module.php?ged=".rawurlencode($GEDCOM)."&mod=googlemap&mod_action=pedigree_map&rootid={$pid}&PEDIGREE_GENERATIONS={$PEDIGREE_GENERATIONS}"; + echo "<a href='module.php?ged=".WT_GEDURL."&mod=googlemap&mod_action=pedigree_map&rootid={$pid}&PEDIGREE_GENERATIONS={$PEDIGREE_GENERATIONS}"; if ($hideflags) echo "&hideflags=1"; if ($hidelines) echo "&hidelines=1"; if ($clustersize != 5) echo "&clustersize=". $clustersize; // ignoring the default of 5 diff --git a/search_engine.php b/search_engine.php index 1f7689126f..d519e527a1 100644 --- a/search_engine.php +++ b/search_engine.php @@ -64,9 +64,9 @@ if (get_site_setting('ALLOW_CHANGE_GEDCOM') && count($all_gedcoms)>1) { } } else { $title=i18n::translate('Home page'); - echo '<a href="index.php?ged=', rawurlencode($GEDCOM), '"><b>', $title, '</b></a><br />'; + echo '<a href="index.php?ged=', WT_GEDURL, '"><b>', $title, '</b></a><br />'; $title=i18n::translate('Individuals'); - echo '<a href="indilist.php?ged=', rawurlencode($GEDCOM), '"><b>', $title, '</b></a><br />'; + echo '<a href="indilist.php?ged=', WT_GEDURL, '"><b>', $title, '</b></a><br />'; } echo '</body></html>'; diff --git a/statistics.php b/statistics.php index 18872ac787..3242ccf1a7 100644 --- a/statistics.php +++ b/statistics.php @@ -781,19 +781,19 @@ if (isset($content) && $content==1) { <div id="tabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all"> <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> <li class="ui-state-default ui-corner-top"> - <a name="pagetab0" title="<?php echo i18n::translate('Individuals'); ?>" href="statistics.php?ged=<?php echo rawurlencode($GEDCOM); ?>&content=1&tab=0"><span> + <a name="pagetab0" title="<?php echo i18n::translate('Individuals'); ?>" href="statistics.php?ged=<?php echo WT_GEDURL; ?>&content=1&tab=0"><span> <?php echo i18n::translate('Individuals'); ?></span></a> </li> <li class="ui-state-default ui-corner-top"> - <a name="pagetab1" title="<?php echo i18n::translate('Families'); ?>" href="statistics.php?ged=<?php echo rawurlencode($GEDCOM); ?>&content=1&tab=1"><span> + <a name="pagetab1" title="<?php echo i18n::translate('Families'); ?>" href="statistics.php?ged=<?php echo WT_GEDURL; ?>&content=1&tab=1"><span> <?php echo i18n::translate('Families'); ?></span></a> </li> <li class="ui-state-default ui-corner-top"> - <a name="pagetab2" title="<?php echo i18n::translate('Others'); ?>" href="statistics.php?ged=<?php echo rawurlencode($GEDCOM); ?>&content=1&tab=2"><span> + <a name="pagetab2" title="<?php echo i18n::translate('Others'); ?>" href="statistics.php?ged=<?php echo WT_GEDURL; ?>&content=1&tab=2"><span> <?php echo i18n::translate('Others'); ?></span></a> </li> <li class="ui-state-default ui-corner-top"> - <a name="pagetab3" title="<?php echo i18n::translate('Own charts'); ?>" href="statistics.php?ged=<?php echo rawurlencode($GEDCOM); ?>&content=1&tab=3"><span> + <a name="pagetab3" title="<?php echo i18n::translate('Own charts'); ?>" href="statistics.php?ged=<?php echo WT_GEDURL; ?>&content=1&tab=3"><span> <?php echo i18n::translate('Own charts'); ?></span></a> </li> </ul> |