diff options
| author | friendica <info@friendica.com> | 2012-09-09 21:26:36 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-09-09 21:26:36 -0700 |
| commit | e4f3e96b657e4ce33c06701653eaba9574152c9a (patch) | |
| tree | c0cabbe859ded25737e39d4e74bcc83a63647fa3 /include | |
| parent | 3ebb4a3dc7a369e7a716ab93d02b44b20522080f (diff) | |
| download | volse-hubzilla-e4f3e96b657e4ce33c06701653eaba9574152c9a.tar.gz volse-hubzilla-e4f3e96b657e4ce33c06701653eaba9574152c9a.tar.bz2 volse-hubzilla-e4f3e96b657e4ce33c06701653eaba9574152c9a.zip | |
remove targeted windows
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 6 | ||||
| -rw-r--r-- | include/text.php | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 8ee6a4ee0..e204e1cb4 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -171,7 +171,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Perform URL Search - $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text); + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" >$2</a>', $Text); if ($tryoembed) $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text); @@ -181,8 +181,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { if ($tryoembed) $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text); - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="external-link">$1</a>', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" >$1</a>', $Text); + $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" >$2</a>', $Text); //$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text); // Perform MAIL Search diff --git a/include/text.php b/include/text.php index c57d8a50a..eba0f5859 100644 --- a/include/text.php +++ b/include/text.php @@ -596,7 +596,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($textmode) { return '<div class="contact-block-textdiv' . $class . '"><a class="contact-block-link' . $class . $sparkle . (($click) ? ' fakelink' : '') . '" ' - . (($redir) ? ' target="redir" ' : '') + . (($redir) ? ' ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" >'. $contact['name'] . '</a></div>' . "\r\n"; @@ -604,7 +604,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { else { return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle . (($click) ? ' fakelink' : '') . '" ' - . (($redir) ? ' target="redir" ' : '') + . (($redir) ? ' ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="' . $contact['micro'] . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" /></a></div>' . "\r\n"; @@ -648,7 +648,7 @@ function valid_email($x){ if(! function_exists('linkify')) { function linkify($s) { - $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="external-link">$1</a>', $s); + $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" >$1</a>', $s); $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); return($s); }} @@ -940,7 +940,7 @@ function prepare_body($item,$attach = false) { else $the_url = $mtch[1]; - $s .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>'; + $s .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" >' . $icon . '</a>'; } } } |