MDL-19803 Upgraded calls to link_to_popup_window()

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 94a5cbd3b8e3b4ce7010ebd41ad82160481b8b54..367bce7cb547b2cc1f94dc2e670540dc068a3e60 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -716,7 +716,7 @@ class assignment_base {
      * @param $submission object The submission whose data is to be updated on the main page
      */
     function update_main_listing($submission) {
-        global $SESSION, $CFG;
+        global $SESSION, $CFG, $OUTPUT;
 
         $output = '';
 
@@ -762,8 +762,17 @@ class assignment_base {
         if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['status'])) {
             $output.= 'opener.document.getElementById("up'.$submission->userid.'").className="s1";';
             $buttontext = get_string('update');
-            $button = link_to_popup_window ('/mod/assignment/submissions.php?id='.$this->cm->id.'&userid='.$submission->userid.'&mode=single'.'&offset='.(optional_param('offset', '', PARAM_INT)-1),
-                      'grade'.$submission->userid, $buttontext, 450, 700, $buttontext, 'none', true, 'button'.$submission->userid);
+            $url = new moodle_url('/mod/assignment/submissions.php', array(
+                    'id' => $this->cm->id,
+                    'userid' => $submission->userid,
+                    'mode' => 'single', 
+                    'offset' => (optional_param('offset', '', PARAM_INT)-1)));
+                        
+            $link = html_link::make($url, $buttontext);
+            $link->add_action(new popup_action('click', $link->url, 'grade'.$submission->userid, array('height' => 450, 'width' => 700)));
+            $link->title = $buttontext;
+            $button = $OUTPUT->link($link);                    
+            
             $output.= 'opener.document.getElementById("up'.$submission->userid.'").innerHTML="'.addslashes_js($button).'";';
         }
 
@@ -1343,9 +1352,12 @@ class assignment_base {
 
                 ///No more buttons, we use popups ;-).
                 $popup_url = '/mod/assignment/submissions.php?id='.$this->cm->id
-                           . '&userid='.$auser->id.'&mode=single'.'&offset='.$offset++;
-                $button = link_to_popup_window ($popup_url, 'grade'.$auser->id, $buttontext, 600, 780,
-                                                $buttontext, 'none', true, 'button'.$auser->id);
+                           . '&userid='.$auser->id.'&mode=single'.'&offset='.$offset++;
+
+                $link = html_link::make($popup_url, $buttontext);
+                $link->add_action(new popup_action('click', $link->url, 'grade'.$auser->id, array('height' => 600, 'width' => 700)));
+                $link->title = $buttontext;
+                $button = $OUTPUT->link($link);                    
 
                 $status  = '<div id="up'.$auser->id.'" class="s'.$auser->status.'">'.$button.'</div>';
 

diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index 9391683ede11d97e350adc59a261297ac9e7f0fa..eb69f3f0d15c24096b9a5e22281aa11d675cca46 100644 (file)
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -186,11 +186,15 @@ class assignment_online extends assignment_base {
         if (!$submission = $this->get_submission($userid)) {
             return '';
         }
+        
+        $link = html_link::make("/mod/assignment/type/online/file.php?id=$this->cm->id&userid=$submission->userid", shorten_text(trim(strip_tags(format_text($submission->data1,$submission->data2))), 15));
+        $link->add_action(new popup_action('click', $link->url, 'file'.$userid, array('height' => 450, 'width' => 580)));
+        $link->title = get_string('submission', 'assignment');
+        $popup = $OUTPUT->link($link);                    
+        
         $output = '<div class="files">'.
                   '<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="html" />'.
-                  link_to_popup_window ('/mod/assignment/type/online/file.php?id='.$this->cm->id.'&amp;userid='.
-                  $submission->userid, 'file'.$userid, shorten_text(trim(strip_tags(format_text($submission->data1,$submission->data2))), 15), 450, 580,
-                  get_string('submission', 'assignment'), 'none', true).
+                  $popup .
                   '</div>';
                   return $output;
     }
@@ -201,12 +205,15 @@ class assignment_online extends assignment_base {
         if (!$submission = $this->get_submission($userid)) {
             return '';
         }
+        
+        $link = html_link::make("/mod/assignment/type/online/file.php?id=$this->cm->id&userid=$submission->userid", shorten_text(trim(strip_tags(format_text($submission->data1,$submission->data2))), 15));
+        $link->add_action(new popup_action('click', $link->url, 'file'.$userid, array('height' => 450, 'width' => 580)));
+        $link->title = get_string('submission', 'assignment');
+        $popup = $OUTPUT->link($link);                    
 
         $output = '<div class="files">'.
                   '<img align="middle" src="'.$OUTPUT->old_icon_url('f/html') . '" height="16" width="16" alt="html" />'.
-                  link_to_popup_window ('/mod/assignment/type/online/file.php?id='.$this->cm->id.'&amp;userid='.
-                  $submission->userid, 'file'.$userid, shorten_text(trim(strip_tags(format_text($submission->data1,$submission->data2))), 15), 450, 580,
-                  get_string('submission', 'assignment'), 'none', true).
+                  $popup .
                   '</div>';
 
         ///Stolen code from file.php

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index b5550f2a44a6543c5214b233b74f6f94665ae943..cae9935781ec427d196da601de101d982ebd04e8 100644 (file)
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -272,8 +272,11 @@ class assignment_upload extends assignment_base {
         }
 
         if ($this->notes_allowed() and !empty($submission->data1)) {
-            $output .= link_to_popup_window ('/mod/assignment/type/upload/notes.php?id='.$this->cm->id.'&userid='.$userid,
-                                            'notes'.$userid, get_string('notes', 'assignment'), 500, 780, get_string('notes', 'assignment'), 'none', true, 'notesbutton'.$userid);
+            $link = html_link::make("/mod/assignment/type/upload/notes.php?id=$this->cm->id&userid=$userid", get_string('notes', 'assignment'));
+            $link->add_action(new popup_action('click', $link->url, 'notes', array('height' => 500, 'width' => 780)));
+            $link->title = get_string('notes', 'assignment');
+            $output .= $OUTPUT->link($link);                    
+            
             $output .= ' ';
         }