Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a 'returnonly' option to all xhtml link types #1239

Merged
merged 1 commit into from Jul 18, 2015
Merged

Add a 'returnonly' option to all xhtml link types #1239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
87 changes: 60 additions & 27 deletions inc/parser/xhtml.php
View file
Open in desktop
Expand Up @@ -761,27 +761,40 @@ function doublequoteclosing() {
/**
* Render a CamelCase link
*
* @param string $link The link name
* @param string $link The link name
* @param bool $returnonly whether to return html or write to doc attribute
* @see http://en.wikipedia.org/wiki/CamelCase
*/
function camelcaselink($link) {
$this->internallink($link, $link);
function camelcaselink($link, $returnonly = false) {
if($returnonly) {
return $this->internallink($link, $link, null, true);
} else {
$this->internallink($link, $link);
}
}

/**
* Render a page local link
*
* @param string $hash hash link identifier
* @param string $name name for the link
* @param string $hash hash link identifier
* @param string $name name for the link
* @param bool $returnonly whether to return html or write to doc attribute
*/
function locallink($hash, $name = null) {
function locallink($hash, $name = null, $returnonly = false) {
global $ID;
$name = $this->_getLinkTitle($name, $hash, $isImage);
$hash = $this->_headerToLink($hash);
$title = $ID.' ↵';
$this->doc .= '<a href="#'.$hash.'" title="'.$title.'" class="wikilink1">';
$this->doc .= $name;
$this->doc .= '</a>';

$doc = '<a href="#'.$hash.'" title="'.$title.'" class="wikilink1">';
$doc .= $name;
$doc .= '</a>';

if($returnonly) {
return $doc;
} else {
$this->doc .= $doc;
}
}

/**
Expand Down Expand Up @@ -884,10 +897,11 @@ function internallink($id, $name = null, $search = null, $returnonly = false, $l
/**
* Render an external link
*
* @param string $url full URL with scheme
* @param string|array $name name for the link, array for media file
* @param string $url full URL with scheme
* @param string|array $name name for the link, array for media file
* @param bool $returnonly whether to return html or write to doc attribute
*/
function externallink($url, $name = null) {
function externallink($url, $name = null, $returnonly = false) {
global $conf;

$name = $this->_getLinkTitle($name, $url, $isImage);
Expand Down Expand Up @@ -926,20 +940,25 @@ function externallink($url, $name = null) {
if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"';

//output formatted
$this->doc .= $this->_formatLink($link);
if($returnonly) {
return $this->_formatLink($link);
} else {
$this->doc .= $this->_formatLink($link);
}
}

/**
* Render an interwiki link
*
* You may want to use $this->_resolveInterWiki() here
*
* @param string $match original link - probably not much use
* @param string|array $name name for the link, array for media file
* @param string $wikiName indentifier (shortcut) for the remote wiki
* @param string $wikiUri the fragment parsed from the original link
* @param string $match original link - probably not much use
* @param string|array $name name for the link, array for media file
* @param string $wikiName indentifier (shortcut) for the remote wiki
* @param string $wikiUri the fragment parsed from the original link
* @param bool $returnonly whether to return html or write to doc attribute
*/
function interwikilink($match, $name = null, $wikiName, $wikiUri) {
function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly = false) {
global $conf;

$link = array();
Expand Down Expand Up @@ -977,16 +996,21 @@ function interwikilink($match, $name = null, $wikiName, $wikiUri) {
$link['title'] = htmlspecialchars($link['url']);

//output formatted
$this->doc .= $this->_formatLink($link);
if($returnonly) {
return $this->_formatLink($link);
} else {
$this->doc .= $this->_formatLink($link);
}
}

/**
* Link to windows share
*
* @param string $url the link
* @param string|array $name name for the link, array for media file
* @param string $url the link
* @param string|array $name name for the link, array for media file
* @param bool $returnonly whether to return html or write to doc attribute
*/
function windowssharelink($url, $name = null) {
function windowssharelink($url, $name = null, $returnonly = false) {
global $conf;

//simple setup
Expand All @@ -1010,18 +1034,23 @@ function windowssharelink($url, $name = null) {
$link['url'] = $url;

//output formatted
$this->doc .= $this->_formatLink($link);
if($returnonly) {
return $this->_formatLink($link);
} else {
$this->doc .= $this->_formatLink($link);
}
}

/**
* Render a linked E-Mail Address
*
* Honors $conf['mailguard'] setting
*
* @param string $address Email-Address
* @param string|array $name name for the link, array for media file
* @param string $address Email-Address
* @param string|array $name name for the link, array for media file
* @param bool $returnonly whether to return html or write to doc attribute
*/
function emaillink($address, $name = null) {
function emaillink($address, $name = null, $returnonly = false) {
global $conf;
//simple setup
$link = array();
Expand Down Expand Up @@ -1053,7 +1082,11 @@ function emaillink($address, $name = null) {
$link['title'] = $title;

//output formatted
$this->doc .= $this->_formatLink($link);
if($returnonly) {
return $this->_formatLink($link);
} else {
$this->doc .= $this->_formatLink($link);
}
}

/**
Expand Down