Removing straightfoward instances of target="_blank"

Bug 1558361

behatnotneeded

Change-Id: Idc139a671137cbde6958fdc8406bc56f8c395f08

htdocs/admin/site/font/specimen.php

@@ -33,7 +33,7 @@ if (!empty($font)) {
     $fonttitle = $fontdata->title;
     if (!empty($fontdata->licence) && !is_null($fontdata->licence)) {
         $fontpath = get_config('wwwroot') . 'skins/fonts/' . $fontdata->name . '/';
-        $fontlicence = '<a href="' . $fontpath . $fontdata->licence . '" target="_blank">' . get_string('fontlicence', 'skin') . '</a>';
+        $fontlicence = '<a href="' . $fontpath . $fontdata->licence . '">' . get_string('fontlicence', 'skin') . '</a>';
     }
     else {
         $fontlicence = get_string('fontlicencenotfound', 'skin');

htdocs/admin/site/license-edit.php

@@ -83,7 +83,7 @@ if (empty($edit)) {
 else {
     $elements['name']['value'] = $edit->name;
     $elements['name']['type'] = 'hidden';
-    $elements['name2']['value'] = '<a href="' . hsc($edit->name) . '" target="_blank">' . hsc($edit->name) . '</a>';
+    $elements['name2']['value'] = '<a href="' . hsc($edit->name) . '">' . hsc($edit->name) . '</a>';
     unset($elements['name2']['ignore']);
     foreach (array('displayname', 'shortname', 'icon') as $f) {
         $elements[$f]['defaultvalue'] = $edit->{$f};

htdocs/artefact/file/blocktype/gallery/lang/en.utf8/blocktype.gallery.php

@@ -42,13 +42,13 @@ $string['previewwidthdesc'] = 'Set the maximum width to which the photos will be
 // Flickr
 $string['flickrsettings'] = 'Flickr settings';
 $string['flickrapikey'] = 'Flickr API key';
-$string['flickrapikeydesc'] = 'To show photo sets from Flickr, you\'ll need a valid Flickr API key. <a href="https://www.flickr.com/services/api/keys/apply/" target="_blank">Apply for your key online</a>.';
+$string['flickrapikeydesc'] = 'To show photo sets from Flickr, you\'ll need a valid Flickr API key. <a href="https://www.flickr.com/services/api/keys/apply/">Apply for your key online</a>.';
 $string['flickrsets'] = 'Flickr sets';
 
 // Photobucket
 $string['pbsettings'] = 'Photobucket settings';
 $string['pbapikey'] = 'Photobucket API key';
-$string['pbapikeydesc'] = 'To show photo albums from Photobucket, you\'ll need a valid API key and API private key.<br>Go to the <a href="http://developer.photobucket.com/" target="_blank">Photobucket developer website</a>, agree to the terms of service, sign up, and get the API keys.';
+$string['pbapikeydesc'] = 'To show photo albums from Photobucket, you\'ll need a valid API key and API private key.<br>Go to the <a href="http://developer.photobucket.com/">Photobucket developer website</a>, agree to the terms of service, sign up, and get the API keys.';
 $string['pbapiprivatekey'] = 'Photobucket API private key';
 $string['photobucketphotosandalbums'] = 'Photobucket user photos and albums';
 

htdocs/artefact/file/blocktype/gallery/lib.php

@@ -215,9 +215,9 @@ class PluginBlocktypeGallery extends MaharaCoreBlocktype {
                                 $thumb = str_replace('/original/', '/thumbnail/', $photo['photo_file_url']);
                             }
                             $title = (!empty($photo['photo_title']) ? $photo['photo_title'] : get_string('Photo', 'blocktype.file/gallery'));
-                            $description =  '<a href="' . $photo['photo_url'] . '" target="_blank">' . $title . '</a>'
+                            $description =  '<a href="' . $photo['photo_url'] . '">' . $title . '</a>'
                                          . '&nbsp;' . get_string('by', 'blocktype.file/gallery') . '&nbsp;'
-                                         . '<a href="' . $photo['owner_url'] . '" target="_blank">' . $photo['owner_name'] . '</a>';
+                                         . '<a href="' . $photo['owner_url'] . '">' . $photo['owner_name'] . '</a>';
 
                             $images[] = array(
                                 'link' => $link,

htdocs/artefact/internal/blocktype/profileinfo/lang/en.utf8/blocktype.profileinfo.php

@@ -20,7 +20,7 @@ $string['introtext'] = 'Introduction text';
 $string['useintroductioninstead'] = 'You can use your introduction profile field instead by enabling that and leaving this field blank';
 $string['dontshowprofileicon'] = "Don't show a profile picture";
 $string['dontshowemail'] = "Don't show email address";
-$string['uploadaprofileicon'] = "You have no profile pictures. <a href=\"%sartefact/file/profileicons.php\" target=\"_blank\">Upload one</a>.";
+$string['uploadaprofileicon'] = "You have no profile pictures. <a href=\"%sartefact/file/profileicons.php\">Upload one</a>.";
 
 $string['dontshowsocialprofiles'] = "Don't show social media accounts";
 $string['showsocialprofiles'] = "Show selected social media accounts";

htdocs/blocktype/externalfeed/lib.php

@@ -521,7 +521,7 @@ class PluginBlocktypeExternalfeed extends MaharaCoreBlocktype {
         if (!empty($image['link'])) {
             $link = sanitize_url($image['link']);
             if ($link) {
-                $result = "<a href=\"{$link}\" target=\"_blank\">{$result}</a>";
+                $result = "<a href=\"{$link}\">{$result}</a>";
             }
         }
 

htdocs/blocktype/googleapps/lang/en.utf8/blocktype.googleapps.php

@@ -15,6 +15,6 @@ defined('INTERNAL') || die();
 $string['title'] = 'Google Apps';
 $string['description'] = 'Embed Google calendar or docs';
 $string['appscodeorurl'] = 'Embed code or URL';
-$string['appscodeorurldesc'] = 'Check the <a target="_blank" href="http://manual.mahara.org/en/15.10/blocks/external.html#google-apps">user manual</a> for instructions on how to embed Google content. <br> Paste the embed code or the URL of the page where Google Apps is publicly viewable.';
+$string['appscodeorurldesc'] = 'Check the <a href="http://manual.mahara.org/en/15.10/blocks/external.html#google-apps">user manual</a> for instructions on how to embed Google content. <br> Paste the embed code or the URL of the page where Google Apps is publicly viewable.';
 $string['height'] = 'Height';
 $string['badurlerror'] = 'Unable to parse embedded code or URL: %s';
\ No newline at end of file

htdocs/lang/en.utf8/help/forms/adduser.leap2afile.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Leap2A files</h3>
-<p>This option gives you the ability to import a <a href="http://wiki.cetis.ac.uk/2009-03/Leap2A_specification#About_this_specification" target="_blank">Leap2A export file</a>, which contains data about a person's portfolio.</p>
-<p>You can read more on the Mahara wiki about <a href="https://wiki.mahara.org/wiki/Developer_Area/Import//Export" target="_blank">Mahara's support for Leap2A</a>.</p>
+<p>This option gives you the ability to import a <a href="http://wiki.cetis.ac.uk/2009-03/Leap2A_specification#About_this_specification">Leap2A export file</a>, which contains data about a person's portfolio.</p>
+<p>You can read more on the Mahara wiki about <a href="https://wiki.mahara.org/wiki/Developer_Area/Import//Export">Mahara's support for Leap2A</a>.</p>

htdocs/lang/en.utf8/help/forms/institution.authplugin.html

@@ -2,7 +2,7 @@
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Authentication plugin</h3>
 <p>Here you can choose how users in this institution will authenticate to the site. Institutions should have at least one method of authentication tied to them.</p>
-<p>The <strong>internal</strong> authentication plugin checks the site database for usernames and passwords. Users have to have an account for this to work, which can be done by allowing registration via the registration form, or using the <a href="add.php" target="_blank">Add user</a> or <a href="uploadcsv.php" target="_blank">Add users by CSV</a> pages.</p>
+<p>The <strong>internal</strong> authentication plugin checks the site database for usernames and passwords. Users have to have an account for this to work, which can be done by allowing registration via the registration form, or using the <a href="add.php">Add user</a> or <a href="uploadcsv.php">Add users by CSV</a> pages.</p>
 <p>The <strong>none</strong> authentication method allows anyone in. Users can pick any username and password. This should only be used for testing!</p>
 <p>The other authentication methods generally authenticate against an external source, such as an LDAP server or remote application. They have their own settings, which you can configure in a pop-up window when you add them. Some methods are disabled because their required PHP extensions are missing or the outgoing connection to the external sources cannot be established. For example, the Persona authentication plugin needs the cURL PHP extension and the HTTPS connection to <em>verifier.login.persona.org</em>.</p>
 <p>One setting they normally share is whether accounts can be automatically created on the site when a user signs in for the first time (as opposed to accounts being created previously by the administrator, which users can then log in to).</p>

htdocs/lang/en.utf8/help/forms/institution.registerallowed.html

@@ -4,4 +4,4 @@
 <p>If this setting is enabled, users will be able to register for the site using the registration form. If it is disabled, the registration form will not be available, but users may be able to create an account through an authentication plugin which has auto-creation of accounts enabled. Make sure you remove such authentication plugins from your institution if you want to fully disable auto-creation for all new accounts.</p>
 <p>If more than one institution has this setting enabled, the user will be able to choose which institution they wish to register for using a drop-down menu.</p>
 <p>If no institutions have this setting enabled, then users will not be able to register using the registration form.</p>
-<p>In general, if you have users set up to join this institution through a mechanism such as LDAP login or SSO from an external application, you should turn this setting off. You should also turn it off if you wish to control the creation of accounts using the <a href="add.php" target="_blank">Add user</a> or <a href="uploadcsv.php" target="_blank">Add users by CSV</a> pages.</p>
+<p>In general, if you have users set up to join this institution through a mechanism such as LDAP login or SSO from an external application, you should turn this setting off. You should also turn it off if you wish to control the creation of accounts using the <a href="add.php">Add user</a> or <a href="uploadcsv.php">Add users by CSV</a> pages.</p>

htdocs/lang/en.utf8/help/pages/skin/import.html

@@ -8,5 +8,5 @@ but can build on top of an existing one.
 </p>
 <p>
 You can find skins that other people have created on the
-<a href="https://wiki.mahara.org/wiki/Page_skins" target="_blank">Mahara wiki</a>.
+<a href="https://wiki.mahara.org/wiki/Page_skins">Mahara wiki</a>.
 </p>

htdocs/lang/en.utf8/skin.php

@@ -165,7 +165,7 @@ When you find an appropriate free font that you are allowed to embed into a web
 <br />TrueType Font, Embedded OpenType Font, Web Open Font Format Font and Scalable Vector Graphic Font.
 </p>
 <p>
-You can use <a href="http://www.fontsquirrel.com/fontface/generator/" target="_blank">FontSquirrel Online Generator</a> for the conversion.
+You can use <a href="http://www.fontsquirrel.com/fontface/generator/">FontSquirrel Online Generator</a> for the conversion.
 </p>';
 $string['nofonts'] = 'There are no fonts.';
 $string['font'] = 'font';
@@ -205,7 +205,7 @@ $string['fonttype'] = 'Font type';
 $string['headingandtext'] = 'Heading and text';
 $string['headingonly'] = 'Heading only';
 
-$string['fontuploadinstructions'] = '<br />To upload the needed font files, you can either upload the ZIP file generated by the <a href="http://www.fontsquirrel.com/fontface/generator/" target="_blank">FontSquirrel Online Generator</a> directly
+$string['fontuploadinstructions'] = '<br />To upload the needed font files, you can either upload the ZIP file generated by the <a href="http://www.fontsquirrel.com/fontface/generator/">FontSquirrel Online Generator</a> directly
 <br />or upload the EOT, SVG, TTF, WOFF, and license files individually.';
 $string['fontfiles'] = 'Font files';
 $string['fontfilemissing'] = 'ZIP file does not contain a \'%s\' font file.';
@@ -268,7 +268,7 @@ $string['gwfontadded'] = 'Google font(s) installed successfully';
 $string['gwfontsnotavailable'] = 'Google fonts are currently not available.';
 
 $string['gwfinstructions'] = '<ol>
-<li>Visit <a href="http://www.google.com/fonts/" target="_blank">Google fonts</a></li>
+<li>Visit <a href="http://www.google.com/fonts/">Google fonts</a></li>
 <li>Select fonts and add them to your collection</li>
 <li>Download fonts in a collection as a ZIP file</li>
 <li>Upload that ZIP file in this form</li>

htdocs/lang/en.utf8/view.php

@@ -193,7 +193,7 @@ $string['cantsubmittogroup'] = 'You cannot submit to this group.';
 $string['cantdeleteview'] = 'You cannot delete this page.';
 $string['deletespecifiedview'] = 'Delete page "%s"';
 $string['deleteviewconfirm1'] = 'Do you really want to delete this page? It cannot be undone.';
-$string['deleteviewconfirmbackup'] = 'Please consider creating a backup of this page by <a href="%sexport/" target="_blank">exporting</a> it.';
+$string['deleteviewconfirmbackup'] = 'Please consider creating a backup of this page by <a href="%sexport/">exporting</a> it.';
 $string['deleteviewconfirmnote1'] = '<strong>Note:</strong> All your files and journal entries that you linked in this page will still be available.<br/>However, any feedback placed on this page will be deleted.';
 $string['deleteviewconfirmnote2'] = 'This page is a part of the collection <a href="%s">"%s"</a>.';
 

htdocs/theme/raw/pieforms/export.php

@@ -11,7 +11,7 @@ return <<<EOF
     {$element['labelhtml']}
     <div class="text-small text-midtone with-label">
         {$element['description']}
-        <a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
+        <a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline">{$strclicktopreview}</a>
     </div>
 </div>
 EOF;

htdocs/theme/raw/plugintype/artefact/blog/templates/blog.tpl

 <div class="blog">
     {if ($editing && $canaddpost)}
-        <a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}" target="_blank">
+        <a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}">
             <span class="icon icon-plus text-success left" role="presentation" aria-hidden="true"></span>
             {str tag='shortcutnewentry' section='artefact.blog'}
         </a>

htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/squarethumbs.tpl

 <div id="thumbnails{$instanceid}" class="panel-body thumbnails js-masonry">
     {foreach from=$images item=image}
         <div {if $image.squaredimensions}style="width:{$image.squaredimensions}px;height:{$image.squaredimensions}px;"{/if} class="thumb">
-            <a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" target="_blank">
+            <a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}">
                 <img src="{$image.source}" alt="{$image.title}" title="{$image.title}" width="{if $image.width}{$image.width}{else}{$width}{/if}" height="{if $image.height}{$image.height}{else}{$width}{/if}" {if $frame}class="frame center-block"{/if}/>
             </a>
             {if $showdescription && $image.title}

htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/supported.tpl

-<a href="https://www.flickr.com/" target="_blank">
+<a href="https://www.flickr.com/">
     <img src="{$THEME->get_image_url('gallery/flickr')}" alt="" width="16" height="16" title="{str tag=flickrsets section=blocktype.file/gallery}">
 </a>
-<a href="http://picasaweb.google.com/" target="_blank">
+<a href="http://picasaweb.google.com/">
     <img src="{$THEME->get_image_url('gallery/picasa')}" alt="" width="16" height="16" title="{str tag=picasaalbums section=blocktype.file/gallery}">
 </a>
-<a href="http://www.panoramio.com/" target="_blank">
+<a href="http://www.panoramio.com/">
     <img src="{$THEME->get_image_url('gallery/panoramio')}" alt="" width="16" height="16" title="{str tag=panoramiouserphotos section=blocktype.file/gallery}">
 </a>
-<a href="http://www.photobucket.com/" target="_blank">
+<a href="http://www.photobucket.com/">
     <img src="{$THEME->get_image_url('gallery/photobucket')}" alt="" width="16" height="16" title="{str tag=photobucketphotosandalbums section=blocktype.file/gallery}">
 </a>
-<a href="http://www.live.com/" target="_blank">
+<a href="http://www.live.com/">
     <img src="{$THEME->get_image_url('gallery/windowslive')}" alt="" width="16" height="16" title="{str tag=windowslivephotoalbums section=blocktype.file/gallery}">
 </a>

htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/thumbnails.tpl

 <div id="thumbnails{$instanceid}" class="panel-body thumbnails js-masonry">
     {foreach from=$images item=image}
         <div style="width: {$width * 1.5}px;" class="thumb">
-        <a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" target="_blank">
+        <a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}">
             <img src="{$image.source}" {if $image.height}height="{$image.height}"{/if} alt="{$image.title}" title="{$image.title}" {if $frame}class="frame center-block"{/if} />
         </a>
         {if $showdescription && $image.title}

htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/windowsliveshow.tpl

 {if $images}
-<center><div width="100" height="115" style="width:100px;height:115px;padding:0;background-color:#fcfcfc;"><center><a href="http://{$images.user}.photos.live.com/play.aspx/{$images.album}?ref=1" target="_blank"><img src="{$WWWROOT}/artefact/file/blocktype/gallery/thumb.png" width="96" height="96" border="0"></a><br />{$images.album}</center></div></center>
+<center><div width="100" height="115" style="width:100px;height:115px;padding:0;background-color:#fcfcfc;"><center><a href="http://{$images.user}.photos.live.com/play.aspx/{$images.album}?ref=1"><img src="{$WWWROOT}/artefact/file/blocktype/gallery/thumb.png" width="96" height="96" border="0"></a><br />{$images.album}</center></div></center>
 {else}
   {str tag=cannotdisplayslideshow section=blocktype.file/gallery}
 {/if}

htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl

@@ -79,7 +79,7 @@
                 {elseif !$publishable}
                     <span class="display-title">{$displaytitle}</span>
                 {else}
-                    <a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" target="_blank" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}" class="file-download-link inner-link">
+                    <a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}" class="file-download-link inner-link">
                         <span class="display-title">{$displaytitle}</span>
                     </a>
                 {/if}