From 6f07bf766b2b314b8f1b1b5fccf8ea7ec3f9efaf Mon Sep 17 00:00:00 2001
From: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Date: Sat, 2 Mar 2013 00:27:06 +0000
Subject: [PATCH] MDL-38166 mod_data Add option to open url in a new window

---
 mod/data/field/url/field.class.php           | 14 ++++++++++----
 mod/data/field/url/lang/en/datafield_url.php |  1 +
 mod/data/field/url/mod.html                  | 12 ++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php
index 00a96ee0827..7656e8f3345 100644
--- a/mod/data/field/url/field.class.php
+++ b/mod/data/field/url/field.class.php
@@ -109,11 +109,17 @@ class data_field_url extends data_field_base {
             }
             if ($this->field->param1) {
                 // param1 defines whether we want to autolink the url.
-                if (!empty($text)) {
-                    $str = '<a href="'.$url.'">'.$text.'</a>';
-                } else {
-                    $str = '<a href="'.$url.'">'.$url.'</a>';
+                $attributes = array();
+                if ($this->field->param3) {
+                    // param3 defines whether this URL should open in a new window.
+                    $attributes['target'] = '_blank';
                 }
+
+                if (empty($text)) {
+                    $text = $url;
+                }
+
+                $str = html_writer::link($url, $text, $attributes);
             } else {
                 $str = $url;
             }
diff --git a/mod/data/field/url/lang/en/datafield_url.php b/mod/data/field/url/lang/en/datafield_url.php
index 9fb65df7f0b..65ddcae80af 100644
--- a/mod/data/field/url/lang/en/datafield_url.php
+++ b/mod/data/field/url/lang/en/datafield_url.php
@@ -25,3 +25,4 @@
  */
 
 $string['pluginname'] = 'URL';
+$string['openlinkinnewwindow'] = 'Open link in new window';
diff --git a/mod/data/field/url/mod.html b/mod/data/field/url/mod.html
index f39d376daeb..e33b467c60f 100644
--- a/mod/data/field/url/mod.html
+++ b/mod/data/field/url/mod.html
@@ -7,12 +7,16 @@
         <td class="c0"><label for="description"><?php echo get_string('fielddescription', 'data'); ?></label></td>
         <td class="c1"><input class="fielddescription" type="text" name="description" id="description" value="<?php p($this->field->description);?>" /></td>
     </tr>
-    <tr>
-        <td class="c0"><label for="forcelinkname"><?php echo get_string('forcelinkname', 'data'); ?></label></td>
-        <td class="c1"><input class="forcelinkname" type="text" name="param2" id="forcelinkname" value="<?php p($this->field->param2);?>" /></td>
-    </tr>
     <tr>
         <td class="c0"><label for="param1"><?php echo get_string('autolinkurl', 'data') ?></label></td>
         <td class="c1"><input type="checkbox" name="param1" id="param1" <?php if($this->field->param1) {echo 'checked="checked"';} ?> value="1" /></td>
     </tr>
+    <tr>
+        <td class="c0"><label for="param3"><?php echo get_string('openlinkinnewwindow', 'datafield_url') ?></label></td>
+        <td class="c1"><input type="checkbox" name="param3" id="param3" <?php if($this->field->param3) {echo 'checked="checked"';} ?> value="1" /></td>
+    </tr>
+    <tr>
+        <td class="c0"><label for="forcelinkname"><?php echo get_string('forcelinkname', 'data'); ?></label></td>
+        <td class="c1"><input class="forcelinkname" type="text" name="param2" id="forcelinkname" value="<?php p($this->field->param2);?>" /></td>
+    </tr>
 </table>