#663955. Be explicit about which sorts of URL to generate: '&' for ones in html, and '&' for ones in HTTP headers and between WT_JS_START/WT_JS_END markers. Get rid of "encode_url()" function, which attempted to "magically" fix problems with the wrong URL style.

1 files changed, 15 insertions, 12 deletions

diff --git a/includes/classes/class_gedcomrecord.php b/includes/classes/class_gedcomrecord.php
index 8c4bbba4c8..df529b8d9f 100644
--- a/includes/classes/class_gedcomrecord.php
+++ b/includes/classes/class_gedcomrecord.php
@@ -292,18 +292,22 @@ class GedcomRecord {
 		return !is_null($obj) && $this->xref==$obj->getXref();
 	}
 
-	// Generate a URL that links to this record
-	public function getLinkUrl() {
-		return $this->_getLinkUrl('gedcomrecord.php?pid=');
+	// Generate a URL to this record, suitable for use in HTML
+	public function getHtmlUrl() {
+		return self::_getLinkUrl('gedcomrecord.php?famid=', '&');
+	}
+	// Generate a URL to this record, suitable for use in javascript, HTTP headers, etc.
+	public function getRawUrl() {
+		return self::_getLinkUrl('gedcomrecord.php?famid=', '&');
 	}
 
-	protected function _getLinkUrl($link) {
+	protected function _getLinkUrl($link, $separator) {
 		if ($this->ged_id) {
 			// If the record was created from the database, we know the gedcom
-			$url = $link.$this->getXref().'&ged='.get_gedcom_from_id($this->ged_id);
+			$url=$link.rawurlencode($this->getXref()).$separator.'ged='.rawurlencode(get_gedcom_from_id($this->ged_id));
 		} else {
 			// If the record was created from a text string, assume the current gedcom
-			$url = $link.$this->getXref().'&ged='.WT_GEDCOM;
+			$url=$link.rawurlencode($this->getXref()).$separator.'ged='.rawurlencode(WT_GEDCOM);
 		}
 		if ($this->isRemote()) {
 			list($servid, $aliaid)=explode(':', $this->rfn);
@@ -321,7 +325,7 @@ class GedcomRecord {
 					}
 					$gedcom = $serviceClient->getGedfile();
 					if ($gedcom) {
-						$url .= "&ged={$gedcom}";
+						$url .= $separator.'ged='.rawurlencode($gedcom);
 					}
 				}
 			}
@@ -358,7 +362,7 @@ class GedcomRecord {
 			if ($target) {
 				$target='target="'.$target.'"';
 			}
-			return '<a href="'.encode_url($this->getLinkUrl()).'#content" name="'.preg_replace('/\D/','',$this->getXref()).'" '.$target.'>'.$this->getXref().'</a>';
+			return '<a href="'.$this->getHtmlUrl().'#content" name="'.preg_replace('/\D/','',$this->getXref()).'" '.$target.'>'.$this->getXref().'</a>';
 		} else {
 			return $this->getXref();
 		}
@@ -369,7 +373,7 @@ class GedcomRecord {
 	*
 	*/
 	public function getAbsoluteLinkUrl() {
-		return WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getLinkUrl();
+		return WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getHtmlUrl();
 	}
 
 	/**
@@ -630,7 +634,7 @@ class GedcomRecord {
 			$name=($tag=='li') ? $this->getListName() : $this->getFullName();
 		}
 		$dir=begRTLText($name) ? 'rtl' : 'ltr';
-		$html='<a href="'.$this->getLinkUrl().'"';
+		$html='<a href="'.$this->getHtmlUrl().'"';
 		if ($find) {
 			$html.=' onclick="pasteid(\''.$this->getXref().'\');"';
 		}
@@ -915,7 +919,7 @@ class GedcomRecord {
 			$text=strip_tags($d->Display(false, "{$DATE_FORMAT}", array()));
 		}
 		if ($add_url) {
-			$text='<a name="'.$sort.'" href="'.encode_url($this->getLinkUrl()).'">'.$text.'</a>';
+			$text='<a name="'.$sort.'" href="'.$this->getHtmlUrl().'">'.$text.'</a>';
 		}
 		return $text;
 	}
@@ -937,4 +941,3 @@ class GedcomRecord {
 		return $chan_user;
 	}
 }
-?>