Merge pull request #1531 from splitbrain/noopener

add rel=noopener to links opening in new window
dokuwiki · Apr 18, 2016 · 3faf777 · 3faf777
2 parents 8f70999 + bc3d225
commit 3faf777
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
@@ -938,10 +938,12 @@ function externallink($url, $name = null, $returnonly = false) {
         $link['more']   = '';
         $link['class']  = $class;
         $link['url']    = $url;
+        $link['rel']    = '';
 
         $link['name']  = $name;
         $link['title'] = $this->_xmlEntities($url);
-        if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"';
+        if($conf['relnofollow']) $link['rel'] .= ' nofollow';
+        if($conf['target']['extern']) $link['rel'] .= ' noopener';
 
         //output formatted
         if($returnonly) {
@@ -971,6 +973,7 @@ function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly =
         $link['suf']    = '';
         $link['more']   = '';
         $link['name']   = $this->_getLinkTitle($name, $wikiUri, $isImage);
+        $link['rel']    = '';
 
         //get interwiki URL
         $exists = null;
@@ -992,9 +995,10 @@ function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly =
                 $link['class'] .= ' wikilink1';
             } else {
                 $link['class'] .= ' wikilink2';
-                $link['rel'] = 'nofollow';
+                $link['rel'] .= ' nofollow';
             }
         }
+        if($conf['target']['interwiki']) $link['rel'] .= ' noopener';
 
         $link['url']   = $url;
         $link['title'] = htmlspecialchars($link['url']);
@@ -1448,7 +1452,7 @@ function _formatLink($link) {
         if(!empty($link['target'])) $ret .= ' target="'.$link['target'].'"';
         if(!empty($link['title'])) $ret .= ' title="'.$link['title'].'"';
         if(!empty($link['style'])) $ret .= ' style="'.$link['style'].'"';
-        if(!empty($link['rel'])) $ret .= ' rel="'.$link['rel'].'"';
+        if(!empty($link['rel'])) $ret .= ' rel="'.trim($link['rel']).'"';
         if(!empty($link['more'])) $ret .= ' '.$link['more'];
         $ret .= '>';
         $ret .= $link['name'];
@@ -1682,6 +1686,7 @@ function _getMediaLinkConf($src, $title, $align, $width, $height, $cache, $rende
         $link['suf']    = '';
         $link['more']   = '';
         $link['target'] = $conf['target']['media'];
+        if($conf['target']['media']) $link['rel'] = 'noopener';
         $link['title']  = $this->_xmlEntities($src);
         $link['name']   = $this->_media($src, $title, $align, $width, $height, $cache, $render);